wisp-agents 0.20.0 → 0.21.0

package/server/services/ship.js

@@ -5,9 +5,11 @@
 // result is pushed to the PR when it's done.
 
 import fs from 'node:fs';
-import { worktreeStatus, prView, ship, baseMerged, conflictsWithBase } from '../git.js';
+import path from 'node:path';
+import { worktreeStatus, prView, ship, merge, baseMerged, conflictsWithBase } from '../git.js';
 import { blocksToMarkdown } from '../render.js';
 import { summarize } from '../runner.js';
+import { bad } from '../util.js';
 
 const PR_POLL_MS = 60_000;
 const PR_FAST_POLL_MS = 10_000; // while GitHub is still working something out: checks running, mergeability unknown, a push just landed
@@ -29,15 +31,28 @@ export const conflictPrompt = (s) => {
   ].join('\n');
 };
 
+// The repos a task ships: its own worktree, then those of its other folders (also). Each is
+// { name, wt, at }, where `at` holds that repo's PR (the session for its own, else the also entry).
+export function reposOf(s, store) {
+  const name = (dir) => store?.projectFor?.(dir)?.name || path.basename(dir || '');
+  return [s.worktree && { name: name(s.cwd), wt: s.worktree, at: s }, ...(s.also || []).map((a) => a.worktree && { name: name(a.cwd), wt: a.worktree, at: a })].filter(Boolean);
+}
+// Something new for this repo's PR: uncommitted changes, or commits its open PR (or a new one) lacks.
+const pending = (st, pr) => !!(st.dirty || (pr?.state === 'OPEN' ? st.unpushed : st.ahead));
+const hasTrees = (s) => !!(s?.worktree || s?.also?.some((a) => a.worktree));
+
 export function createShip(app) {
   const { store, runner } = app;
 
   // 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.
+  // not yet pushed. Rechecked whenever wisp might have changed the worktree. A task in several
+  // repos adds theirs up, and `repos` counts the ones with something to ship.
   const check = async (s) => {
-    if (!s?.worktree || s.parentId) return;
-    const { dirty, ahead, unpushed } = await worktreeStatus(s.worktree);
-    const next = { dirty, ahead, unpushed };
+    if (!hasTrees(s) || s.parentId) return;
+    const repos = reposOf(s, store);
+    const all = await Promise.all(repos.map((r) => worktreeStatus(r.wt)));
+    const sum = (k) => all.reduce((n, st) => n + st[k], 0);
+    const next = { dirty: sum('dirty'), ahead: sum('ahead'), unpushed: sum('unpushed'), ...(repos.length > 1 && { repos: all.filter((st, i) => pending(st, repos[i].at.pr)).length }) };
     if (JSON.stringify(next) === JSON.stringify(s.toShip)) return;
     s.toShip = next;
     app.sessionChanged(s);
@@ -47,7 +62,7 @@ export function createShip(app) {
   const checks = new Map(); // id → true while checking, 'again' if another check is due
   const checkedAt = new Map();
   const recheck = (s, { lazy = false } = {}) => {
-    if (!s?.worktree || s.parentId) return;
+    if (!hasTrees(s) || s.parentId) return;
     if (lazy && (runner.live.has(s.id) || checks.has(s.id) || Date.now() - (checkedAt.get(s.id) || 0) < SHIP_RECHECK_MS)) return;
     if (checks.has(s.id)) return void checks.set(s.id, 'again');
     checks.set(s.id, true);
@@ -61,8 +76,25 @@ export function createShip(app) {
       });
   };
 
+  // The PRs of the task's other repos: their state, checks and reviews, for the card.
+  const refreshAlso = async (s) => {
+    const open = (s.also || []).filter((a) => a.pr && a.worktree && a.pr.state === 'OPEN');
+    if (!open.length) return false;
+    let news = false;
+    await Promise.all(
+      open.map(async (a) => {
+        const prev = a.pr;
+        a.pr = await prView(fs.existsSync(a.worktree.path) ? a.worktree.path : a.worktree.root, prev.number).catch(() => ({ ...prev, checkedAt: Date.now() }));
+        if (a.pr.state !== prev.state || a.pr.review !== prev.review || (!a.pr.checks.pending && prev.checks?.pending)) news = true;
+      }),
+    );
+    if (news) s.unread = true;
+    app.sessionChanged(s);
+    return true;
+  };
   const refreshPr = async (s) => {
-    if (!s.pr || !s.worktree) return s.pr;
+    await refreshAlso(s);
+    if (!s.pr || !s.worktree) return s.pr || s.also?.find((a) => a.pr)?.pr;
     const prev = s.pr;
     const dir = fs.existsSync(s.worktree.path) ? s.worktree.path : s.worktree.root;
     const pr = await prView(dir, prev.number);
@@ -135,6 +167,59 @@ export function createShip(app) {
     recheck(s);
   };
 
+  // Ship it: commit, push and open (or update) the PR, in each of the task's repos with something
+  // new. One repo ships as before, even with nothing new (git says why). Several: one PR each,
+  // each noting the others; a failure names its repo and leaves the PRs already opened in place.
+  const shipAll = async (s, { title, body = '', draft = false }) => {
+    const repos = reposOf(s, store);
+    let todo = repos;
+    if (repos.length > 1) {
+      const st = await Promise.all(repos.map((r) => worktreeStatus(r.wt)));
+      todo = repos.filter((r, i) => pending(st[i], r.at.pr));
+      if (!todo.length) throw bad('Nothing to ship: none of the task’s repos have new changes.');
+    }
+    const note = repos.length > 1 ? `\n\nPart of one task across ${repos.map((r) => `\`${r.name}\``).join(', ')}: wisp opens a pull request in each.` : '';
+    s.shipping = { step: 'start', update: todo.every((r) => r.at.pr?.state === 'OPEN'), startedAt: Date.now(), ...(todo.length > 1 && { of: todo.length }) };
+    app.sessionChanged(s);
+    try {
+      for (const [i, r] of todo.entries()) {
+        const onStep = (step) => ((s.shipping = { ...s.shipping, step, ...(todo.length > 1 && { repo: r.name, at: i + 1 }) }), app.sessionChanged(s));
+        try {
+          r.at.pr = await ship(r.wt, { title, body: `${body}${note}`.trim(), draft, pr: r.at.pr, onStep });
+        } catch (err) {
+          throw repos.length > 1 ? Object.assign(new Error(`${r.name}: ${err.message}`), { status: err.status }) : err;
+        }
+      }
+      s.pushedAt = Date.now(); // the PR is polled fast for a while, so its checks show up as they start
+    } finally {
+      delete s.shipping;
+      app.sessionChanged(s, { now: true });
+    }
+    recheck(s);
+    return { ...(s.pr || todo[0].at.pr), ...(repos.length > 1 && { prs: prsOf(s) }) };
+  };
+  // Every PR the task opened, its own first: { repo, number, url, state }.
+  const prsOf = (s) => reposOf(s, store).filter((r) => r.at.pr).map((r) => ({ repo: r.name, number: r.at.pr.number, url: r.at.pr.url, state: r.at.pr.state }));
+
+  // Merge: squash-merge each open PR of the task, its own first. Stops at the first that fails.
+  const mergeAll = async (s) => {
+    const open = reposOf(s, store).filter((r) => r.at.pr?.state === 'OPEN');
+    if (!open.length) throw bad('No pull request to merge.');
+    const synced = [];
+    for (const r of open) {
+      try {
+        const { pr, sync } = await merge(r.wt, r.at.pr.number);
+        r.at.pr = pr;
+        synced.push(sync);
+      } catch (err) {
+        app.sessionChanged(s, { now: true });
+        throw open.length > 1 ? Object.assign(new Error(`${r.name}: ${err.message}`), { status: err.status }) : err;
+      }
+    }
+    const sync = { ok: synced.every((x) => x.ok), text: synced.map((x) => x.text).join(' ') };
+    return { pr: s.pr || open[0].at.pr, sync, ...(reposOf(s, store).length > 1 && { prs: prsOf(s) }) };
+  };
+
   // Default commit message and PR text, from the session's latest presentation.
   const draft = (s) => {
     const turn = s.turns.findLast((t) => t.status === 'done') || s.turns.at(-1);
@@ -158,7 +243,7 @@ export function createShip(app) {
     delete s.shipping; // a ship cut short by a restart isn't running anymore
     if (s.conflictFix?.step === 'pushing') Object.assign(s.conflictFix, { step: 'failed', why: 'wisp restarted while pushing the fix.' });
   }
-  for (const s of store.all()) if (s.worktree && !s.archived && s.pr?.state !== 'MERGED') recheck(s);
+  for (const s of store.all()) if (hasTrees(s) && !s.archived && s.pr?.state !== 'MERGED') recheck(s);
 
   // Open PRs are checked every minute, and every few seconds while their state is still settling,
   // so a check finishing or a pushed fix clearing the conflict shows up quickly.
@@ -171,7 +256,9 @@ export function createShip(app) {
     if (polling) return;
     polling = true;
     try {
-      const due = store.all().filter((s) => s.pr?.state === 'OPEN' && Date.now() - (s.pr.checkedAt || 0) >= (settling(s) ? PR_FAST_POLL_MS : PR_POLL_MS));
+      // A task's other repos' PRs ride along with its own (or poll on their own when it has none open).
+      const lead = (s) => (s.pr?.state === 'OPEN' ? s.pr : s.also?.find((a) => a.pr?.state === 'OPEN')?.pr);
+      const due = store.all().filter((s) => lead(s) && Date.now() - (lead(s).checkedAt || 0) >= (s.pr?.state === 'OPEN' && settling(s) ? PR_FAST_POLL_MS : PR_POLL_MS));
       await Promise.all(due.map((s) => refreshPr(s).catch(() => {})));
     } finally {
       polling = false;
@@ -179,5 +266,5 @@ export function createShip(app) {
   }, PR_TICK_MS);
   timer.unref();
 
-  return { recheck, refreshPr, fixConflicts, draft, stop: () => clearInterval(timer) };
+  return { recheck, refreshPr, fixConflicts, draft, shipAll, mergeAll, prsOf, stop: () => clearInterval(timer) };
 }

package/skills/wisp/SKILL.md

@@ -23,7 +23,8 @@ wisp "add pagination to /api/users" --cwd ~/code/api --wait     # block until do
 ```
 
 Options: `--agent claude|codex|opencode|cursor|antigravity|grok`, `--mode plan|edits|auto`, `--model ID`,
-`--effort low|medium|high`, `--cwd DIR` (default: current folder), `--wait`, `--json`.
+`--effort low|medium|high`, `--cwd DIR` (default: current folder), `--also DIR` (another folder the
+same agent works in, repeatable: e.g. the API and its web app), `--wait`, `--json`.
 `--json` prints the session summary; its `id` is what every other command takes.
 
 Write the prompt as a self-contained brief: the agent cannot see your conversation. Include the

package/web/css/feed.css

@@ -78,6 +78,9 @@
   font-size: 11px; font-weight: 500; padding: 0 7px; border-radius: 5px; line-height: 19px; white-space: nowrap; max-width: 120px; overflow: hidden; text-overflow: ellipsis;
   color: color-mix(in srgb, var(--pc) 65%, var(--ink)); background: color-mix(in srgb, var(--pc) 10%, transparent);
 }
+/* a task in several folders: the others after its own, each in its colour */
+.q-proj.multi { max-width: 180px; }
+.q-also { margin-left: 4px; color: color-mix(in srgb, var(--pc) 65%, var(--ink)); }
 .q-time { font-size: 11.5px; color: var(--faint); min-width: 26px; text-align: right; font-variant-numeric: tabular-nums; }
 .q-queued { font-size: 11px; color: var(--accent-ink); font-weight: 600; }
 /* one-click done on collapsed review rows; revealed on hover/focus */

package/web/css/launcher.css

@@ -41,6 +41,18 @@
 .lp-chip.more:hover, .lp-chip.more.open { color: var(--ink); border-color: var(--line-2); }
 .lp-chip.more .i { width: 12px; height: 12px; }
 .l-projects .lp-chip[hidden] { display: none; }
+/* one task, several folders: a small badge on a chip's corner adds it (+) or leaves it out (×) */
+.l-projects .lp-chip { position: relative; }
+.lp-also {
+  position: absolute; top: -6px; right: -5px; display: grid; place-items: center; width: 16px; height: 16px; border-radius: 50%;
+  background: var(--surface); border: 1px solid var(--line-2); color: var(--muted); box-shadow: var(--shadow-1);
+  opacity: 0; transform: scale(0.6); transition: opacity 0.12s, transform 0.12s, color 0.12s, background 0.12s; pointer-events: none;
+}
+.lp-also .i { width: 10px; height: 10px; }
+.lp-chip:is(:hover, :focus-visible) .lp-also { opacity: 1; transform: none; pointer-events: auto; }
+.lp-also:hover { color: #fff; background: var(--accent); border-color: var(--accent); }
+.lp-also.x:hover { background: var(--bad); border-color: var(--bad); }
+@media (hover: none) { .lp-also:not(.x) { opacity: 1; transform: none; pointer-events: auto; } }
 /* narrow, with "+N" (whose list has No folder too): it goes icon-only unless picked */
 @container launcher (max-width: 520px) { .l-projects:has(.more:not([hidden])) .lp-chip.none:not(.on) span { display: none; } }
 /* recipes: one-click prompts under the launch bar */

package/web/css/palette.css

@@ -73,6 +73,12 @@
 .pm-row .p-run { flex: none; }
 .pm-row .pm-check { flex: none; width: 14px; height: 14px; color: var(--accent); visibility: hidden; }
 .pm-row.on .pm-check { visibility: visible; }
+/* the launcher's list: + adds a project to the task, ✓ shows it's in */
+.pm-also { flex: none; display: grid; place-items: center; width: 20px; height: 20px; margin: -2px -4px -2px 0; border-radius: 6px; color: var(--faint); }
+.pm-also .i { width: 13px; height: 13px; }
+.pm-also:hover { color: var(--ink); background: var(--surface-2); }
+.pm-row.in .pm-also { color: var(--accent); }
+.pm-row.in .pm-name { font-weight: 500; color: var(--ink); }
 .pm-x .i { width: 14px; height: 14px; color: var(--muted); }
 .pm-empty { padding: 18px 10px; text-align: center; font-size: 13px; color: var(--muted); }
 .menu .danger:hover { color: var(--bad); background: var(--del-bg); }

package/web/css/ship.css

@@ -42,6 +42,7 @@
 .pill.st-running { --tone: var(--accent); }
 .it-meta .m.branch, .it-meta .m:has(> .i) { display: inline-flex; align-items: center; gap: 4px; min-width: 0; overflow: hidden; text-overflow: ellipsis; }
 .it-meta .m.branch { font: 11px var(--mono); color: var(--ink-2); }
+.it-meta .m.also { display: inline-flex; align-items: center; gap: 5px; color: var(--ink-2); }
 .it-meta .m .i { width: 12px; height: 12px; flex: none; color: var(--faint); }
 .it-meta .m.m-plan, .it-meta .m.m-plan .i { color: var(--accent-ink); }
 .it-meta .m.m-auto, .it-meta .m.m-auto .i { color: var(--warn); }
@@ -60,6 +61,14 @@
 .pr-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--tone); flex: none; }
 .pr-strip.pr-pending .pr-dot { animation: pulse 1.4s ease-in-out infinite; }
 .pr-num { font-weight: 600; color: var(--ink); white-space: nowrap; }
+/* a task in several repos: their PRs after the first, each with its own tone */
+.pr-also { --tone: var(--good); display: inline-flex; align-items: center; gap: 5px; flex: none; padding: 1px 7px; border-radius: 6px; font-weight: 500; color: var(--ink); white-space: nowrap; background: color-mix(in srgb, var(--tone) 10%, transparent); }
+.pr-also i { width: 6px; height: 6px; border-radius: 50%; background: var(--tone); }
+.pr-also:hover { background: color-mix(in srgb, var(--tone) 18%, transparent); }
+.pr-also.pr-pending { --tone: var(--warn); }
+.pr-also.pr-fail { --tone: var(--bad); }
+.pr-also.pr-merged { --tone: #8250df; }
+.pr-also.pr-closed { --tone: var(--faint); }
 .pr-line { color: var(--ink-2); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
 .pr-strip .ghost .i { width: 13px; height: 13px; }
 .pr-strip .pr-merge { color: var(--good); font-weight: 500; }
@@ -74,12 +83,15 @@
 .ship-route code { font: 12px var(--mono); padding: 1px 6px; border-radius: 6px; background: var(--bg-2); }
 .ship-route .i { width: 13px; height: 13px; color: var(--faint); }
 .ship-route .muted { margin-left: auto; }
+.ship-route .ship-repo { font-weight: 600; color: var(--ink); }
+.ship-route + .ship-route { margin-top: -6px; }
 .ship-field { display: flex; flex-direction: column; gap: 6px; margin: 12px 0 0; }
 .ship-field > span { font-size: 12.5px; font-weight: 500; color: var(--ink-2); }
 .ship-field select { width: 100%; }
 .ship-check { display: flex; margin-top: 10px; }
 .ship-foot { display: flex; align-items: center; gap: 12px; margin-top: 16px; }
 .ship-foot > .muted { margin-right: auto; }
+.ship-foot > .primary { flex: none; white-space: nowrap; }
 .ship-foot code { font-size: 11px; }
 .hint.bad { color: var(--bad); }
 

package/web/js/core/state.js

@@ -35,10 +35,12 @@ export const saveOpen = () => save('wisp.open', [...S.open]);
 export const setAgents = (list) => ((S.agents = list), save('wisp.agents', list));
 
 // Where the launcher sends a prompt: '' = this computer, else machine ids. Several run in parallel,
-// each in the project picked for it (launch.picks[place]), and show up as one task.
+// each in the project picked for it (launch.picks[place]), and show up as one task. A run can
+// work in more of that place's projects too (launch.also[place]): one agent, several folders.
 export const launch = {
   project: load('wisp.launchProject', null), // the project picked in the first place
   where: load('wisp.launchWhere', ['']),
   picks: load('wisp.launchPicks', {}),
+  also: load('wisp.launchAlso', {}),
 };
-export const saveLaunch = () => (save('wisp.launchWhere', launch.where), save('wisp.launchPicks', launch.picks), save('wisp.launchProject', launch.project));
+export const saveLaunch = () => (save('wisp.launchWhere', launch.where), save('wisp.launchPicks', launch.picks), save('wisp.launchAlso', launch.also), save('wisp.launchProject', launch.project));

package/web/js/features/actions.js

@@ -279,7 +279,7 @@ export async function rerun(id) {
     if (!prompt) return ta.focus();
     close();
     try {
-      const body = { prompt, cwd: s.cwd, agent, mode, model, effort, attachments: files.map((f) => f.id) };
+      const body = { prompt, cwd: s.cwd, also: s.also?.map((a) => a.cwd), agent, mode, model, effort, attachments: files.map((f) => f.id) };
       const next = await launchBehind({ prompt, cwd: s.cwd, runner: { agent, model, effort } }, () => api('/sessions', { method: 'POST', body }));
       setFocus(next.id);
     } catch (err) {

package/web/js/features/feed.js

@@ -9,16 +9,16 @@ import { S, save, saveOpen } from '../core/state.js';
 import { taskDone, taskMenu, toggleDone } from './actions.js';
 import { compareView } from './compare.js';
 import { renderLaunchChips } from './launcher.js';
-import { machinePill } from './places.js';
+import { inProject, machinePill, projectLabel } from './places.js';
 import { renderProjects } from './projects.js';
 import { agentName, effortLabel, harnessLogo, modelBadge } from './runners.js';
 import { scrollByPx, stage, topInset } from './scroll.js';
-import { prPill, shipPill } from './ship.js';
+import { prOf, prPill, shipPill } from './ship.js';
 import { teamStack } from './team.js';
 import { renderBody } from './turns.js';
 
 function visible(list) {
-  return S.filter === 'all' ? list : list.filter((s) => s.projectId === S.filter);
+  return S.filter === 'all' ? list : list.filter((s) => inProject(s, S.filter));
 }
 
 // Compare runs (one launch on several harnesses, sharing a groupId) are one task in the feed
@@ -209,10 +209,10 @@ function renderHead(n, s) {
       ${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.shipping ? shipPill(s) : prOf(s) ? prPill(prOf(s), 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) : ''}
-      <span class="q-proj">${esc(s.project)}</span>
+      ${projectLabel(s)}
       <span class="q-time">${ago(s.updatedAt)}</span>
       ${s.state === 'review' && !open && !s.archived ? `<button class="it-quick" data-a="quick-done" title="Mark done (E)">${icon('done')}</button>` : ''}
       ${icon('chevron', 'chev')}
@@ -253,11 +253,11 @@ function renderRunHead(n, s, { open, live, pill }) {
       ${live ? `<span class="q-live ${s.state}">${esc(s.live)}</span>` : open ? '' : `<span class="it-sub">${esc(s.preview || '')}</span>`}
     </span>
     <span class="it-side">
-      ${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>` : ''}
+      ${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>`}${projectLabel(s)}` : ''}
       ${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) : ''}
+      ${s.shipping ? shipPill(s) : prOf(s) ? prPill(prOf(s), s.conflictFix) : ''}
       <span class="q-time">${ago(s.updatedAt)}</span>
       ${icon('chevron', 'chev')}
     </span>`;
@@ -297,7 +297,7 @@ function taskItem(t) {
     </span>
     <span class="it-side">
       <button class="ghost xs" data-a="compare" title="Side by side: time, cost, changes, tests and each presentation"><b class="vs-mark">vs</b><span>Compare</span></button>
-      ${places > 1 ? '' : `<span class="q-proj">${esc(t.project)}</span>`}
+      ${places > 1 ? '' : projectLabel(t)}
       <span class="q-time">${ago(t.updatedAt)}</span>
       ${t.state === 'review' && !t.archived ? `<button class="it-quick" data-a="quick-done" title="Mark every run done">${icon('done')}</button>` : ''}
     </span>`;
@@ -394,7 +394,7 @@ export function reveal(id) {
     S.showDone = true;
     save('wisp.showDone', true);
   }
-  if (S.filter !== 'all' && S.filter !== s.projectId) {
+  if (S.filter !== 'all' && !inProject(s, S.filter)) {
     S.filter = 'all';
     save('wisp.filter', S.filter);
     renderLaunchChips();

package/web/js/features/launcher.js

@@ -31,6 +31,11 @@ import { canLead, paintTeamBtn, teamEditor } from './team.js';
 const NO_FOLDER = 'none';
 const GENERAL = { id: null, name: 'General', path: '', color: 'slate', scratch: true };
 const projectOf = (k) => (launch.picks[k] === NO_FOLDER ? GENERAL : projectById(launch.picks[k]));
+// The place's other folders for the task (launch.also), and whether a project is in it at all.
+const alsoAt = (k) => launch.also[k] || [];
+const chosen = (k, id) => id === launch.picks[k] || alsoAt(k).includes(id);
+const ownPick = (k) => projectsAt(k).some((p) => p.id === launch.picks[k]);
+const MOD = combo('').replace(/\+$/, ''); // ⌘ or Ctrl, for "⌘-click"
 // Project chips in the "in" row, at most, before the rest fold into "+N".
 const CHIPS = 5;
 
@@ -41,13 +46,23 @@ function syncWhere() {
   launch.where = launch.where.filter((k, i) => (!k || machineById(k)) && launch.where.indexOf(k) === i);
   if (!launch.where.length) launch.where = [''];
   // Filtering the feed to a project points the launcher at it (its machine joins if it wasn't picked).
+  // One that's already in the task (as its first folder or another) leaves the selection as it is.
   const f = S.filter !== 'all' && S.filter !== filterSeen && projectById(S.filter);
   filterSeen = S.filter;
   if (f) {
     if (!launch.where.includes(placeOf(f))) launch.where = [placeOf(f)];
-    launch.picks[placeOf(f)] = f.id;
+    if (!chosen(placeOf(f), f.id)) {
+      launch.picks[placeOf(f)] = f.id;
+      delete launch.also[placeOf(f)];
+    }
   } else if (projectById(launch.project) && !Object.values(launch.picks).includes(launch.project)) launch.picks[placeOf(projectById(launch.project))] ??= launch.project;
   for (const k of launch.where) if (launch.picks[k] !== NO_FOLDER && !cloneById(launch.picks[k]) && !projectsAt(k).some((p) => p.id === launch.picks[k])) launch.picks[k] = projectsAt(k)[0]?.id || null;
+  // Other folders only go with a project (not No folder or a clone), and only that place's projects.
+  for (const k of Object.keys(launch.also)) {
+    const ids = ownPick(k) ? launch.also[k].filter((id, i, a) => id !== launch.picks[k] && a.indexOf(id) === i && projectsAt(k).some((p) => p.id === id)) : [];
+    if (ids.length) launch.also[k] = ids;
+    else delete launch.also[k];
+  }
   launch.project = launch.picks[launch.where[0]] || null;
 }
 
@@ -250,7 +265,7 @@ export function renderLauncher() {
       return feedbackCommand(prompt, { restore: () => !ta.value && ((ta.value = prompt), ta.dispatchEvent(new Event('input'))) });
     }
     // One run per place picked under "Run on", each in the project picked for it.
-    const targets = launch.where.map((k) => ({ k, m: k ? machineById(k) : null, project: projectOf(k), clone: cloneById(launch.picks[k]) }));
+    const targets = launch.where.map((k) => ({ k, m: k ? machineById(k) : null, project: projectOf(k), clone: cloneById(launch.picks[k]), also: ownPick(k) ? alsoAt(k).map(projectById).filter(Boolean) : [] }));
     const unset = targets.find((t) => !t.project && !t.clone);
     if (unset) return openProjects({ focusAdd: true, machine: unset.k || null });
     const off = targets.find((t) => t.m && t.m.state !== 'online');
@@ -276,7 +291,7 @@ export function renderLauncher() {
     ta.value = '';
     S.drafts.delete('home');
     ta.dispatchEvent(new Event('input'));
-    if (S.filter !== 'all' && targets.some((t) => t.project?.scratch || t.project?.id !== S.filter)) {
+    if (S.filter !== 'all' && targets.some((t) => t.project?.scratch || (t.project?.id !== S.filter && !t.also.some((p) => p.id === S.filter)))) {
       S.filter = 'all';
       save('wisp.filter', S.filter);
     }
@@ -298,7 +313,7 @@ export function renderLauncher() {
         targets.map((t) =>
           api('/sessions', {
             method: 'POST',
-            body: { prompt, cwd: t.project.scratch ? undefined : t.project.path, scratch: t.project.scratch || undefined, machine: t.k || undefined, groupId, agent: runner.agent, mode: curMode, model: runner.model, effort: runner.effort, attachments, worktree: S.config.defaults.worktree === 'off' && !cmp.length ? false : undefined, compare: cmp.length ? cmp : undefined, subagents: team.length && canLead(runner.agent) ? team : undefined },
+            body: { prompt, cwd: t.project.scratch ? undefined : t.project.path, also: t.also.length ? t.also.map((p) => p.path) : undefined, scratch: t.project.scratch || undefined, machine: t.k || undefined, groupId, agent: runner.agent, mode: curMode, model: runner.model, effort: runner.effort, attachments, worktree: S.config.defaults.worktree === 'off' && !cmp.length ? false : undefined, compare: cmp.length ? cmp : undefined, subagents: team.length && canLead(runner.agent) ? team : undefined },
           }),
         ),
       );
@@ -374,16 +389,22 @@ export function renderLaunchChips() {
       .filter((c) => (c.where || '') === k)
       .map((c) => `<button class="lp-chip cloning ${c.id === launch.picks[k] ? 'on' : ''}" data-id="${c.id}" data-k="${k}" title="Cloning ${esc(c.label)}…"><span class="orb live"></span>${esc(c.name)}<span class="lp-note">cloning…</span></button>`)
       .join('');
-    // Tens of projects: the most recent few as chips (the pick always among them), the rest one
+    // Tens of projects: the most recent few as chips (the picks always among them), the rest one
     // search away behind "+N". fitChips() then folds more into it if the row would wrap.
     const max = multi ? 3 : CHIPS;
-    let shown = list;
-    if (list.length > max) {
-      const top = list.slice(0, max);
-      const picked = list.find((p) => p.id === launch.picks[k]);
-      shown = !picked || top.includes(picked) ? top : [...top.slice(0, -1), picked].sort((a, b) => list.indexOf(a) - list.indexOf(b));
-    }
-    const chips = cloning + shown.map((p) => `<button class="lp-chip c-${p.color} ${p.id === launch.picks[k] ? 'on' : ''}" data-id="${p.id}" data-k="${k}" title="${esc(projectTitle(p))}"><i class="p-dot"></i>${esc(p.name)}</button>`).join('');
+    const picked = list.filter((p) => chosen(k, p.id));
+    const rest = list.filter((p) => !chosen(k, p.id)).slice(0, Math.max(0, max - picked.length));
+    const shown = list.filter((p) => picked.includes(p) || rest.includes(p));
+    // A task can span several of the place's projects: ⌘-click a chip, or its + badge, to add it;
+    // the × on a picked one leaves it out again.
+    const own = ownPick(k);
+    const several = own && alsoAt(k).length > 0;
+    const badge = (p) =>
+      chosen(k, p.id)
+        ? several ? `<span class="lp-also x" data-also="${p.id}" title="Leave ${esc(p.name)} out of this task">${icon('x')}</span>` : ''
+        : own ? `<span class="lp-also" data-also="${p.id}" title="Also work in ${esc(p.name)} (${MOD}-click)">${icon('plus')}</span>` : '';
+    const tip = (p) => `${projectTitle(p)}${several && p.id === launch.picks[k] ? '\nThe agent starts here' : ''}${own && !chosen(k, p.id) ? `\n${MOD}-click to work in it too` : ''}`;
+    const chips = cloning + shown.map((p) => `<button class="lp-chip c-${p.color} ${chosen(k, p.id) ? 'on' : ''}" data-id="${p.id}" data-k="${k}" title="${esc(tip(p))}"><i class="p-dot"></i>${esc(p.name)}${badge(p)}</button>`).join('');
     const more = list.length > 1 ? `<button class="lp-chip more" data-more="${k}" data-total="${list.length}" title="All ${list.length} projects${k ? ` on ${esc(placeName(k))}` : ''}" aria-haspopup="dialog"><span class="lp-more-n"></span>${icon('search')}</button>` : '';
     const add = list.length || cloning
       ? `<button class="lp-chip add" data-add="${k}" title="Another folder${k ? ` on ${esc(placeName(k))}` : ''}">${icon('folder')}${multi || list.length > max ? '' : 'Other folder…'}</button>`
@@ -400,9 +421,21 @@ export function renderLaunchChips() {
   });
   fitRow.observe(box);
   paintScratch();
-  const pick = (k, id) => {
-    launch.picks[k] = id;
-    if (k === launch.where[0]) launch.project = id;
+  // A plain pick makes it the task's only folder; `add` (⌘-click, the + badge) adds it to the
+  // folders or takes it out. Leaving out the first folder hands its place to the next one.
+  const pick = (k, id, { add = false } = {}) => {
+    const also = alsoAt(k);
+    if (add && ownPick(k) && projectById(id)) {
+      if (id !== launch.picks[k]) launch.also[k] = also.includes(id) ? also.filter((x) => x !== id) : [...also, id];
+      else if (also.length) {
+        launch.picks[k] = also[0];
+        launch.also[k] = also.slice(1);
+      }
+    } else {
+      launch.picks[k] = id;
+      delete launch.also[k];
+    }
+    if (k === launch.where[0]) launch.project = launch.picks[k];
     saveLaunch();
     paintScratch();
     renderLaunchRecipes();
@@ -410,8 +443,9 @@ export function renderLaunchChips() {
   box.onclick = (e) => {
     const chip = e.target.closest('.lp-chip[data-id]');
     if (chip) {
-      pick(chip.dataset.k, chip.dataset.id);
-      $$(`.lp-chip[data-k="${chip.dataset.k}"]`, box).forEach((x) => x.classList.toggle('on', x === chip));
+      const k = chip.dataset.k;
+      pick(k, chip.dataset.id, { add: !!e.target.closest('[data-also]') || e.metaKey || e.ctrlKey || e.shiftKey });
+      renderLaunchChips(); // the + and × badges follow the picks
       return;
     }
     const more = e.target.closest('[data-more]');
@@ -420,6 +454,14 @@ export function renderLaunchChips() {
       return projectList(more, {
         projects: projectsAt(k),
         current: launch.picks[k],
+        // Each row's + adds it to the task (or takes it out) and leaves the list open.
+        also: ownPick(k) && {
+          has: (id) => chosen(k, id),
+          toggle: (id) => {
+            pick(k, id, { add: true });
+            renderLaunchChips();
+          },
+        },
         label: `Projects on ${placeName(k)}`,
         extras: [
           { id: NO_FOLDER, label: 'No folder', icon: 'spark' },
@@ -460,6 +502,7 @@ function fitChips(box) {
     if (launch.where.length > 1) continue;
     const wraps = () => {
       const kids = [...g.children].filter((x) => !x.hidden && x.offsetParent);
+      if (!kids.length) return false; // not laid out (a launcher painted over, or folded into the dock)
       const lin = $('.l-in', box); // "in" left alone on a line counts too
       return kids.some((x) => x.offsetTop >= kids[0].offsetTop + kids[0].offsetHeight) || (lin && kids[0].offsetTop >= lin.offsetTop + lin.offsetHeight);
     };
@@ -605,7 +648,7 @@ function launchedFx(from, to) {
 // A launch the server hasn't answered yet: a placeholder summary that shows in Working as a
 // "Starting up" card. It can't be opened; the real card takes its place.
 let pendingSeq = 0;
-function addPending(prompt, { project: p, m }, { agent, model, effort }, live = 'Starting up') {
+function addPending(prompt, { project: p, m, also = [] }, { agent, model, effort }, live = 'Starting up') {
   const id = `pending-${++pendingSeq}`;
   const line = plain(prompt).split('\n')[0].replace(/\s+/g, ' ');
   const now = Date.now();
@@ -621,6 +664,7 @@ function addPending(prompt, { project: p, m }, { agent, model, effort }, live =
     project: p.name,
     projectId: p.id,
     color: p.color || 'slate',
+    ...(also.length && { also: also.map((x) => ({ cwd: x.path, project: x.name, projectId: x.id, color: x.color, branch: '', pr: null })) }),
     state: 'running',
     live,
     createdAt: now,

package/web/js/features/places.js

@@ -8,6 +8,16 @@ import { S } from '../core/state.js';
 export const projectById = (id) => S.config.projects.find((p) => p.id === id);
 
 export const placeOf = (p) => p?.machine || '';
+// A task's projects: its own, then those of the other folders it works in (also).
+export const inProject = (s, id) => s.projectId === id || !!s.also?.some((a) => a.projectId === id);
+
+// The project on a card: "api + web", or "api +2" past that, each one in the tooltip.
+export function projectLabel(s) {
+  const also = s.also || [];
+  if (!also.length) return `<span class="q-proj">${esc(s.project)}</span>`;
+  const names = [s.project, ...also.map((a) => a.project)];
+  return `<span class="q-proj multi" title="${esc(`One task in ${names.length} folders: ${names.join(', ')}`)}">${esc(s.project)}<span class="q-also ${also.length === 1 ? `c-${also[0].color}` : ''}">${also.length === 1 ? `+ ${esc(also[0].project)}` : `+${also.length}`}</span></span>`;
+}
 export const placeName = (k) => (k ? machineById(k)?.name || 'machine' : 'This computer');
 export const recentFirst = (a, b) => (b.lastUsedAt || b.addedAt) - (a.lastUsedAt || a.addedAt);
 export const projectsAt = (k) => S.config.projects.filter((p) => placeOf(p) === k).sort(recentFirst);

package/web/js/features/project-list.js

@@ -6,6 +6,8 @@
 //   meta(p)   extra html after a row's name (status badges)
 //   extras    [{ id, label, icon }] fixed rows under the list (No folder, Other folder…)
 //   onPick    (id) => …, a project's id or an extra's
+//   also      { has(id), toggle(id) }: each row gets a + that adds the project to the task (✓ once
+//             it's in) without closing the list; ⌘/Ctrl/Shift+Enter does the same from the keyboard
 
 import { esc } from '../md.js';
 import { $, el, icon } from '../core/dom.js';
@@ -13,7 +15,7 @@ import { fuzzy, highlight } from '../fuzzy.js';
 import { popover } from '../ui/popover.js';
 import { projectTitle } from './places.js';
 
-export function projectList(anchor, { projects, current, meta = () => '', extras = [], onPick, label = 'Projects' }) {
+export function projectList(anchor, { projects, current, meta = () => '', extras = [], onPick, also = null, label = 'Projects' }) {
   if ($('.menu.pm')) return $('.menu.pm').close();
   const node = el(`
     <div class="menu pm" role="dialog" aria-label="${esc(label)}">
@@ -43,8 +45,10 @@ export function projectList(anchor, { projects, current, meta = () => '', extras
     list.innerHTML = hits.length
       ? hits
           .map(
-            ({ p, m }) => `<button class="pm-row c-${p.color} ${p.id === current ? 'on' : ''}" data-id="${esc(p.id)}" role="option" aria-selected="${p.id === current}" title="${esc(projectTitle(p))}">
-              <i class="p-dot"></i><span class="pm-name">${highlight(p.name, m?.idx, esc)}</span>${p.machine ? icon('server', 'pm-where') : ''}${meta(p)}<small class="pm-path">${esc(p.path.replace(/^\/(Users|home)\/[^/]+/, '~'))}</small>${icon('check', 'pm-check')}
+            ({ p, m }) => `<button class="pm-row c-${p.color} ${p.id === current ? 'on' : ''} ${also?.has(p.id) ? 'in' : ''}" data-id="${esc(p.id)}" role="option" aria-selected="${p.id === current}" title="${esc(projectTitle(p))}">
+              <i class="p-dot"></i><span class="pm-name">${highlight(p.name, m?.idx, esc)}</span>${p.machine ? icon('server', 'pm-where') : ''}${meta(p)}<small class="pm-path">${esc(p.path.replace(/^\/(Users|home)\/[^/]+/, '~'))}</small>${
+                also ? `<span class="pm-also" data-also title="${also.has(p.id) ? `Leave ${esc(p.name)} out of this task` : `Also work in ${esc(p.name)}`}">${icon(also.has(p.id) ? 'check' : 'plus')}</span>` : icon('check', 'pm-check')
+              }
             </button>`,
           )
           .join('')
@@ -57,9 +61,19 @@ export function projectList(anchor, { projects, current, meta = () => '', extras
     close();
     onPick(id);
   };
+  // Adding to the task keeps the list open, the row where it was and the search as typed.
+  const toggle = (r) => {
+    also.toggle(r.dataset.id);
+    const at = act;
+    paint();
+    mark(at, false);
+    input.focus({ preventScroll: true });
+  };
   node.onclick = (e) => {
     const r = e.target.closest('.pm-row');
-    if (r) pick(r.dataset.id);
+    if (!r) return;
+    if (also && !r.classList.contains('pm-x') && (e.target.closest('[data-also]') || e.metaKey || e.ctrlKey || e.shiftKey)) return toggle(r);
+    pick(r.dataset.id);
   };
   node.onmousemove = (e) => {
     const r = e.target.closest('.pm-row');
@@ -73,7 +87,8 @@ export function projectList(anchor, { projects, current, meta = () => '', extras
     } else if (e.key === 'Enter' && !e.isComposing) {
       e.preventDefault();
       const r = rows()[act];
-      if (r) pick(r.dataset.id);
+      if (r && also && !r.classList.contains('pm-x') && (e.metaKey || e.ctrlKey || e.shiftKey)) toggle(r);
+      else if (r) pick(r.dataset.id);
     } else if (e.key === 'Tab') close();
   };