@galda/cli 0.10.36 → 0.10.37

package/app/index.html

@@ -192,6 +192,18 @@
   .qico:disabled{opacity:.25;cursor:default}
   .qico:disabled:hover{color:var(--ink3);background:transparent}
   .qico svg{width:14px;height:14px;stroke:currentColor;stroke-width:1.8;fill:none;stroke-linecap:round;stroke-linejoin:round}
+  /* Connection status line (offline) — inline color element, NEVER a painted
+     surface (DESIGN-RULES §1.5-8). Lives as the top row of the queue tray. The
+     .creconn button reuses the .errbtn idiom but re-declares its base here: #queue
+     sits in #composerWrap, OUTSIDE #fsRoot, so `#fsRoot .errbtn` never reaches it. */
+  .connline{display:flex;align-items:center;gap:8px;padding:6px 10px 6px 8px;font-family:var(--mono);font-size:10.5px;line-height:1.4}
+  .connline .cdot{width:6px;height:6px;border-radius:50%;flex:0 0 auto;background:var(--danger);animation:connpulse 1.6s ease-in-out infinite}
+  .connline .cw{font-weight:600;color:var(--danger)}
+  .connline .cmsg{color:var(--ink2)}
+  .connline .creconn{margin-left:auto;border:0;background:transparent;color:var(--ink2);font-family:var(--mono);font-size:10px;letter-spacing:.02em;font-weight:600;line-height:1.15;padding:2.5px 10px;border-radius:7px;box-shadow:inset 0 0 0 1px var(--hair2);cursor:pointer}
+  .connline .creconn:hover{background:var(--hover);color:var(--ink)}
+  @keyframes connpulse{0%,100%{opacity:1}50%{opacity:.35}}
+  @media (prefers-reduced-motion:reduce){.connline .cdot{animation:none}}
   .qedit{width:100%;box-sizing:border-box;background:var(--paper);border:1px solid var(--hair2);border-radius:9px;color:var(--ink);
     font:inherit;font-size:13px;line-height:1.5;padding:7px 10px;outline:none;min-height:56px;resize:vertical;margin:4px 0}
   .qbtns{display:flex;align-items:center;gap:6px;justify-content:flex-end;padding-bottom:4px}
@@ -201,6 +213,7 @@
 
   .errbar{position:absolute;left:50%;bottom:96px;transform:translateX(-50%);z-index:40;background:var(--errbg);backdrop-filter:blur(14px);
     border:1px solid rgba(var(--danger-rgb),.4);color:var(--danger);font-size:12.5px;border-radius:10px;padding:8px 14px;display:none}
+  .errbar.ok{border-color:rgba(var(--green-rgb),.45);color:var(--green)} /* 07-20c: neutral/success toast (PR merged) */
 
   /* composer */
   .composer-wrap{flex:0 0 auto;padding:8px 22px 18px}
@@ -400,6 +413,7 @@
   .chip2{font-family:var(--mono);font-size:9.5px;letter-spacing:.05em;padding:2px 7px;border-radius:6px;border:1px solid var(--hair2);color:var(--ink3);flex:0 0 auto}
   .chip2.doing{color:var(--ink);border-color:rgba(var(--blue-rgb),.4)}
   .chip2.review{color:var(--amber);border-color:rgba(var(--amber-rgb),.4)}
+  .chip2.rejected{color:var(--danger);border-color:rgba(var(--danger-rgb),.35)}
   .goalx{scroll-margin-top:24px;border-radius:12px;transition:background-color .3s}
   .goalx.selected{background-color:rgba(var(--amber-rgb),.12)}
   .prmini{font-family:var(--mono);font-size:9.5px;color:var(--green);text-decoration:none;border:1px solid rgba(var(--green-rgb),.35);border-radius:6px;padding:2px 7px;flex:0 0 auto;background:transparent;cursor:pointer}
@@ -666,6 +680,10 @@
   .delmodal{width:380px}
   .delpreview{border:1px solid var(--hair2);border-radius:10px;padding:10px 12px;background:var(--paper);
     color:var(--ink);font-size:12.5px;line-height:1.5;max-height:120px;overflow:auto;word-break:break-word}
+  /* 07-20c: borderless preview for the merge-confirm dialog — must NOT read as an editable field */
+  .delpreview.plain{border:none;background:none;padding:2px 0;max-height:none}
+  .delpreview.plain .pvtitle{font-weight:600;color:var(--ink);font-size:14px}
+  .delpreview.plain .pvpr{color:var(--ink2);font-size:11px;font-family:var(--mono);margin-top:3px}
   /* moment ③ New-project paywall dialog (H22). Same narrow .modal as .delmodal,
      but a one-action layout (Masa 2026-07-17 確定 __dlg(2)): Upgrade full-width,
      "Not now" a quiet underlined link centered below it. */
@@ -1936,6 +1954,9 @@
   /* To Do timeline: order via tone + labels, no axis line (§1.5-4) */
   #fsRoot .tl{position:relative}
   #fsRoot .tlcap{display:block;font-family:var(--mono);font-size:8.5px;letter-spacing:.1em;color:var(--ink3);text-transform:uppercase;padding:13px 0 5px 0} /* left 8->0: sit the DOING/Next up/Later labels on the same spine as the section headings (Masa 2026-07-18) */
+  /* 07-20c: Rejected reads as a real section heading (like Review), not the tiny mono lane captions */
+  #fsRoot .tlcap.rejcap{display:flex;align-items:baseline;gap:8px;font-family:inherit;font-size:13px;letter-spacing:0;text-transform:none;color:var(--ink);padding-top:16px}
+  #fsRoot .tlcap.rejcap .num{font-size:10px;color:var(--ink3)}
   #fsRoot .tlcap.needs{color:var(--amber)} /* "Needs you" caption tinted to the attention accent, matching the board's Needs-you column (Masa 2026-07-19). Colour on the label only — the rows below carry their own in-row colour per §1.5-8. */
   #fsRoot .trow{position:relative;padding:6px 6px 6px 0;border-radius:8px;font-size:12.5px;color:var(--ink);display:flex;align-items:center;gap:9px} /* left 8->0: row dot lines up with the Review/To Do headings' left edge, not 8px inside it (Masa 2026-07-18) */
   #fsRoot .trow .tt{color:color-mix(in srgb,var(--ink) 84%,var(--panel))} /* §13.2 soften To Do row name (not pure black); left chat feed keeps --ink */
@@ -1951,6 +1972,7 @@
   #fsRoot .trow .stword.int{color:var(--amber)}
   #fsRoot .trow .st.ok{border-color:transparent;background:rgba(var(--green-rgb),.12);position:relative}
   #fsRoot .trow .st.ok::after{content:"✓";position:absolute;inset:0;display:grid;place-items:center;font-size:8px;color:var(--green)}
+  #fsRoot .trow .st.rej{border-color:rgba(var(--danger-rgb),.5)} /* 07-20c: rejected — a quiet danger dot (settled, not alarming) */
   #fsRoot .trow .tt{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
   #fsRoot .trow .num{font-size:10px;color:var(--ink3);flex:0 0 auto}
   #fsRoot .trow .pct{font-size:10.5px;color:var(--green);flex:0 0 auto;font-family:var(--mono);font-variant-numeric:tabular-nums}
@@ -2812,7 +2834,7 @@
     <div class="reqlist" id="reviewList"></div>
     <div class="revactions">
       <button type="button" class="reqbtn approve" id="reviewApprove">Approve goal</button>
-      <button type="button" class="reqbtn dismiss" id="reviewDismiss">Dismiss goal</button>
+      <button type="button" class="reqbtn dismiss" id="reviewDismiss">Reject</button>
       <span style="flex:1"></span>
       <button class="mbtn ghost" id="reviewClose">Close</button>
     </div>
@@ -2882,7 +2904,7 @@
     </div>
     <div class="sa-act">
       <button type="button" class="sa-app" id="gdApprove"><svg viewBox="0 0 24 24"><path d="M5 12.5l4.2 4.2L19 7"/></svg>Approve</button>
-      <button type="button" class="sa-dis" id="gdDismiss">Dismiss</button>
+      <button type="button" class="sa-dis" id="gdDismiss">Reject</button>
       <div class="sa-chatwrap">
         <input type="text" class="sa-chat" id="gdRevisionInput" placeholder="Tell the worker what to try next…">
         <button type="button" class="sa-send" id="gdSend" title="Send" aria-label="Send"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button>
@@ -3000,6 +3022,7 @@ function restoreFocusedAnswerInput(container, attr, saved){
 const STATUS_LABEL = {
   sending: 'Sending…', stacked: 'Queued', planning: 'Planning…', queued: 'To do', running: 'Working…', needsInput: 'Needs input',
   review: 'In review', done: 'Done', failed: 'Failed', partial: 'Partly failed', interrupted: 'Interrupted', skipped: 'Skipped',
+  rejected: 'Rejected',
 };
 // Mirrors engine/lib.mjs goalChip() — kept in sync manually since this
 // inline script can't import server-side code. `columns` (a project's
@@ -3018,6 +3041,7 @@ const GOAL_CHIP = (s, columns, startedAt) => s === 'stacked' || s === 'sending'
   s === 'done' ? [pickColumnLabel(columns, 'done', 'DONE'), ''] :
   s === 'retesting' ? ['RE-TESTING', 'doing'] :
   s === 'reverted' ? ['REVERTED', ''] :
+  s === 'rejected' ? ['REJECTED', 'rejected'] :
   s === 'folded' ? ['FOLDED', ''] :
   s === 'blocked' ? ['BLOCKED', 'blocked'] : s === 'needsInput' ? ['NEEDS INPUT', 'blocked'] : ['FAIL', ''];
 const FINISHED = (s) => ['done', 'partial', 'failed', 'interrupted'].includes(s);
@@ -3321,11 +3345,13 @@ function buildReviewDigest({ goals, tasks } = {}){
   }
   return rows;
 }
-// Review title: mirrors the label convention used throughout (reviewSummary.changed
-// → plan[0] → text) — pulled into one place so the review card's own title and its
-// sibling-goal titles (H23 split note) stay consistent.
+// Review title: the same goal title the list view's goal header shows
+// (goalHeadText = g.text ?? g.plan[0]) so a card in "See all" and the same goal
+// in the list read identically (Masa 2026-07-19). Text-first; reviewSummary.changed
+// stays only as a last resort for a goal with no text. Pulled into one place so the
+// review card's own title and its sibling-goal titles (H23 split note) stay consistent.
 function saReviewTitle(g){
-  return String(g?.reviewSummary?.changed || g?.plan?.[0] || g?.text || '').replace(/\s+/g, ' ').trim().slice(0, 90);
+  return String(g?.text || g?.plan?.[0] || g?.reviewSummary?.changed || '').replace(/\s+/g, ' ').trim().slice(0, 90);
 }
 // H23 (2026-07-18) evidence-kind detection. Mirrors engine/lib.mjs isUiChange() /
 // hasTestRelevantChanges() — kept in sync manually since the browser script isn't a
@@ -3955,21 +3981,35 @@ function renderQueue(){
   const stacked = state.goals.filter((g) => g.projectId === state.active && g.status === 'stacked')
     .sort((a, b) => (b.prio ?? 0) - (a.prio ?? 0) || a.id - b.id);
   const planning = state.goals.filter((g) => g.projectId === state.active && ['sending', 'planning'].includes(g.status));
-  if (!ob.length && !stacked.length && !planning.length) { q.classList.remove('show'); q.innerHTML = ''; return; }
+  // Offline connection line: connOffline is the grace-debounced (~800ms) SSE-down
+  // flag from the reconnect loop. When offline we always show the tray (even with
+  // no queued items) so the red status line + Reconnect is visible above the composer.
+  const offline = connOffline;
+  if (!ob.length && !stacked.length && !planning.length && !offline) { q.classList.remove('show'); q.innerHTML = ''; return; }
   q.classList.add('show');
+  // mirror connectionBannerState({online}) from engine/lib.mjs (a browser static file
+  // can't import the module) — offline ⇒ red inline line + Reconnect atop the tray.
+  const connHtml = offline
+    ? '<div class="connline"><span class="cdot"></span><span class="cw">Galda is offline</span><span class="cmsg">— reconnecting…</span><button class="errbtn creconn" data-reconnect>Reconnect</button></div>'
+    : '';
   // Optimistic outbox items (saved to localStorage BEFORE the network call) render
   // first — instant, offline-safe, never lost. 'unsent' rows are tap-to-resend.
   const obRows = ob.map((o) => {
     const unsent = o.status === 'unsent';
     const lead = unsent ? '<span class="qdot"></span>' : '<span class="spinner" style="width:9px;height:9px;flex:0 0 9px"></span>';
-    return `<div class="qrow"${unsent ? ` data-oresend="${o.oid}"` : ''}>${lead}<span class="qtxt">${esc((o.text ?? '').replace(/\s+/g, ' '))}</span><span class="meta">${unsent ? 'Unsent — tap to resend' : 'Sending…'}</span></div>`;
+    // mirror unsentMetaLabel({online}) from engine/lib.mjs — offline resend is a lie
+    // (recovery is the connline's Reconnect), so drop tap-to-resend and swap the label.
+    const resendable = unsent && !offline;
+    const metaTxt = unsent ? (offline ? 'Waiting for connection' : 'Unsent — tap to resend') : 'Sending…';
+    return `<div class="qrow"${resendable ? ` data-oresend="${o.oid}"` : ''}>${lead}<span class="qtxt">${esc((o.text ?? '').replace(/\s+/g, ' '))}</span><span class="meta">${metaTxt}</span></div>`;
   }).join('');
   const planningRows = planning.map((g) =>
     `<div class="qrow"><span class="spinner" style="width:9px;height:9px;flex:0 0 9px"></span><span class="qtxt">${esc((g.text ?? '').replace(/\s+/g, ' '))}</span><span class="meta">breaking down → To do…</span></div>`).join('');
   // Flagship: qtray label is the quiet mono "Queued · N" (flagship que1); other
   // layouts keep the explanatory sentence.
   const qn = ob.length + stacked.length + planning.length;
-  q.innerHTML = `<div class="qhead">${state.layout === 'flagship' ? `Queued · ${qn}` : `${qn} queued · goals become To dos in ~30s`}</div>` + obRows + planningRows + stacked.map((g) => {
+  const headHtml = qn > 0 ? `<div class="qhead">${state.layout === 'flagship' ? `Queued · ${qn}` : `${qn} queued · goals become To dos in ~30s`}</div>` : '';
+  q.innerHTML = connHtml + headHtml + obRows + planningRows + stacked.map((g) => {
     if (state.editing === g.id) {
       return `<textarea class="qedit" id="qedit-${g.id}">${esc(g.text)}</textarea>
         <div class="qbtns">
@@ -3987,6 +4027,7 @@ function renderQueue(){
       <button class="qico del qd" data-id="${g.id}" title="Delete">${ICONS.trash}</button></div>`;
   }).join('');
   for (const el of q.querySelectorAll('[data-oresend]')) el.onclick = () => { const item = outbox.load().find((x) => x.oid === el.dataset.oresend); if (item) postOutboxItem(item); };
+  for (const el of q.querySelectorAll('[data-reconnect]')) el.onclick = () => forceReconnect();
   const qrows = [...q.querySelectorAll('.qrow[data-goal]')];
   for (const el of qrows) {
     el.addEventListener('dragstart', (e) => { state.dragGoal = Number(el.dataset.goal); el.classList.add('dragging'); e.dataTransfer.effectAllowed = 'move'; });
@@ -4313,15 +4354,23 @@ function renderTasks(){
   for (const b of $('tasklist').querySelectorAll('[data-qapprove]')) {
     b.onclick = async (e) => { e.stopPropagation();
       const bx = b.getBoundingClientRect(); // capture before await/re-render — burst FROM the ✓ button
-      let r; for (const id of b.dataset.qapprove.split(',')) r = await fetch(withKey(`/api/goals/${id}/approve`), { method: 'POST' });
-      if (r && r.ok) confettiBurst(bx.left + bx.width / 2, bx.top + bx.height / 2);
-      qrefresh(r, 'Approve failed.'); };
+      let ok = true, mergeGoal = null;
+      for (const id of b.dataset.qapprove.split(',')) {
+        const r = await fetch(withKey(`/api/goals/${id}/approve`), { method: 'POST' });
+        if (!r.ok){ ok = false; break; }
+        const j = await r.json(); if (j && j.needsMerge) mergeGoal = j.goal; // 07-20c: PR goal
+      }
+      if (!ok){ showErr('Approve failed.'); return; }
+      await refresh();
+      if (mergeGoal){ confirmMerge(mergeGoal); return; } // merge instead of confetti
+      confettiBurst(bx.left + bx.width / 2, bx.top + bx.height / 2); };
   }
   for (const b of $('tasklist').querySelectorAll('[data-qdismiss]')) {
+    // 07-20c: the inline ✕ is a pure Reject — park the goal in the Rejected column (/reject),
+    // no auto-rework. Rework is asked for via chat.
     b.onclick = async (e) => { e.stopPropagation();
-      let r; for (const id of b.dataset.qdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/dismiss`), { method: 'POST',
-        headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: '' }) });
-      qrefresh(r, 'Dismiss failed.'); };
+      let r; for (const id of b.dataset.qdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/reject`), { method: 'POST' });
+      qrefresh(r, 'Reject failed.'); };
   }
   // Archive: retire an unfinished goal cleanly (no rework spawned). The escape
   // hatch for half-finished (partial/blocked) items so Attention stays drainable.
@@ -5069,7 +5118,39 @@ async function setRequirementStatus(goalId, taskId, status){
 // backend has never heard of, e.g. an injected verify fixture) and then
 // persisted server-side; a real goal's SSE 'goal' event reconciles it right
 // after, a no-op since the value already matches.
+// 07-20c: a review goal that HAS a PR is finished by MERGING the PR, not by approving in
+// the app (that was the "approved but PR still open" zombie). Reuses the confirmDelete modal
+// as a merge-confirm: primary action opens the PR; the goal stays in review and
+// syncGoalMerges flips it to done once GitHub reports the merge.
+async function confirmMerge(goal){
+  const prNo = goal && goal.pr ? (String(goal.pr).match(/pull\/(\d+)/) ?? [, ''])[1] : '';
+  const open = await confirmDelete({
+    title: 'Merge the Pull Request to finish',
+    body: 'This goal has a PR. Approving here does not merge it — open the PR and merge it, and it moves to Done automatically.',
+    previewHtml: `<div class="pvtitle">${esc(goal?.text || '')}</div>${prNo ? `<div class="pvpr">PR #${prNo} ↗</div>` : ''}`,
+    previewPlain: true,
+    confirmLabel: 'Open PR', cancelLabel: 'Close', confirmDanger: false,
+  });
+  if (open && goal && goal.pr) window.open(goal.pr, '_blank', 'noopener');
+}
+// Shared approve-response handler for the simple approve surfaces (inline ✓, review-card ✓,
+// See-all). Returns true if the goal actually advanced (done), false if it needs a merge.
+function handleApproveJson(json, goal){
+  if (json && json.needsMerge){ if (json.goal) upsert(state.goals, json.goal); confirmMerge(json.goal || goal); return false; }
+  if (json) upsert(state.goals, json);
+  return true;
+}
 async function advanceGoalAfterAllApproved(goal){
+  // 07-20c: a PR goal is not finished here — route it to the merge-confirm dialog and keep
+  // it in review (no optimistic done, no celebration until the PR is actually merged).
+  if (goal.pr){
+    try {
+      const r = await fetch(withKey(`/api/goals/${goal.id}/advance-review`), { method: 'POST' });
+      if (r.ok){ const j = await r.json(); if (j.goal) upsert(state.goals, j.goal); if (j.needsMerge) confirmMerge(j.goal || goal); }
+    } catch { /* offline — leave as review */ }
+    renderReviewChecklist(); render();
+    return;
+  }
   const fly = captureReviewFly(goal.id);
   goal.status = 'done';
   renderReviewChecklist(); render();
@@ -5139,8 +5220,16 @@ $('reviewApprove').onclick = async () => {
   try {
     const r = await fetch(withKey(`/api/goals/${goal.id}/approve`), { method: 'POST' });
     if (!r.ok) throw new Error();
+    const j = await r.json();
+    if (j.needsMerge){ // 07-20c: PR goal — send to the merge dialog, no celebration/advance
+      if (j.goal) upsert(state.goals, j.goal);
+      renderReviewChecklist();
+      $('reviewApprove').disabled = false;
+      confirmMerge(j.goal || goal);
+      return;
+    }
     const fly = captureReviewFly(goal.id);
-    upsert(state.goals, await r.json());
+    upsert(state.goals, j);
     renderReviewChecklist();
     const dm = $('reviewDoneMsg');
     if (dm){ dm.classList.remove('pop'); void dm.offsetWidth; dm.classList.add('pop'); }
@@ -5189,7 +5278,21 @@ async function sendReviewDismiss(text){
     render();
   } catch { showErr('Dismiss failed.'); }
 }
-$('reviewDismiss').onclick = () => sendReviewDismiss('');
+// 07-20c: the review dialog's Reject button parks the goal in the Rejected column (/reject),
+// no auto-rework. Typing feedback into the box below and pressing Send still reworks (/dismiss).
+async function sendReviewReject(){
+  const goal = state.goals.find((g) => g.id === state.reviewOpenGoal);
+  if (!goal) return;
+  try {
+    const r = await fetch(withKey(`/api/goals/${goal.id}/reject`), { method: 'POST' });
+    if (!r.ok) throw new Error();
+    const body = await r.json();
+    upsert(state.goals, body.goal);
+    closeReviewChecklist();
+    render();
+  } catch { showErr('Reject failed.'); }
+}
+$('reviewDismiss').onclick = () => sendReviewReject();
 $('reviewFixSend').onclick = () => { const t = $('reviewFixInput').value.trim(); if (t || reviewAttach.length) sendReviewDismiss(t); };
 $('reviewFixInput').addEventListener('keydown', (e) => {
   if (e.key === 'Enter') { const t = $('reviewFixInput').value.trim(); if (t || reviewAttach.length) sendReviewDismiss(t); }
@@ -5370,12 +5473,26 @@ $('gdApprove').onclick = async () => {
   try {
     const r = await fetch(withKey(`/api/goals/${goalId}/approve`), { method: 'POST' });
     if (!r.ok) throw new Error();
-    upsert(state.goals, await r.json());
+    handleApproveJson(await r.json(), state.goals.find((g) => g.id === goalId)); // 07-20c: PR goal → merge dialog
     closeGoalDetail();
     render();
   } catch { showErr('Approve failed.'); }
   $('gdApprove').disabled = false;
 };
+// 07-20c: the goal-detail Reject button parks the goal in the Rejected column (/reject).
+// Revision text typed into gdSend still goes to /dismiss (rework) via sendDismiss below.
+async function sendReject(goalId){
+  $('gdApprove').disabled = true; $('gdDismiss').disabled = true; $('gdSend').disabled = true;
+  try {
+    const r = await fetch(withKey(`/api/goals/${goalId}/reject`), { method: 'POST' });
+    if (!r.ok) throw new Error();
+    const body = await r.json();
+    upsert(state.goals, body.goal);
+    closeGoalDetail();
+    render();
+  } catch { showErr('Reject failed.'); }
+  $('gdApprove').disabled = false; $('gdDismiss').disabled = false; $('gdSend').disabled = false;
+}
 async function sendDismiss(goalId, text){
   $('gdApprove').disabled = true; $('gdDismiss').disabled = true; $('gdSend').disabled = true;
   try {
@@ -5416,7 +5533,7 @@ async function discardGoal(goalId){
   } catch { showErr('Discard failed.'); }
   $('gdSend').disabled = false; $('gdDiscard').disabled = false;
 }
-$('gdDismiss').onclick = () => { const goalId = state.goalDetailOpen; if (goalId != null) sendDismiss(goalId, ''); };
+$('gdDismiss').onclick = () => { const goalId = state.goalDetailOpen; if (goalId != null) sendReject(goalId); };
 $('gdDiscard').onclick = () => { const goalId = state.goalDetailOpen; if (goalId != null) discardGoal(goalId); };
 $('gdSend').onclick = () => {
   const goalId = state.goalDetailOpen;
@@ -5460,7 +5577,7 @@ const fsUI = {
   rv: [1, 2, 3].includes(Number(localStorage.getItem('fsRv'))) ? Number(localStorage.getItem('fsRv')) : 3, // review view: 3 thumbnails (default) / 1 list / 2 compact
   band: Number(localStorage.getItem('fsBand') ?? 0),   // theme-6 band choice
   revMore: false,                                      // "+N more" fold on the review list (§1.5-8)
-  todoFold: false, doneOpen: false, todoMore: false,
+  todoFold: false, doneOpen: false, rejOpen: false, todoMore: false,
   todoView: localStorage.getItem('fsTodoView') === 'board' ? 'board' : 'list', // To Do: list (default) / kanban board (Masa 2026-07-16)
   logOpen: new Set(), logFocus: null,                  // "View log" targets
   repsOpen: new Set(),                                 // reply-group folds
@@ -5469,6 +5586,7 @@ const FS_ICONS = {
   reply: '<svg viewBox="0 0 24 24"><path d="M10 16l-5-4 5-4"/><path d="M5 12h9a4 4 0 0 1 4 4v2"/></svg>',
   edit: '<svg viewBox="0 0 24 24"><path d="M4 20h4L18.5 9.5a2.1 2.1 0 0 0-3-3L5 17v3z"/><path d="M14 7l3 3"/></svg>',
   del: '<svg viewBox="0 0 24 24"><path d="M4 7h16M9 7V4h6v3M6 7l1 13h10l1-13"/></svg>',
+  reopen: '<svg viewBox="0 0 24 24"><g transform="translate(24,0) scale(-1,1)"><polyline points="3 5 3 10 8 10"/><path d="M5.6 15.4A8 8 0 1 0 6 8.3L3 10.8"/></g></svg>', /* 07-20c: rotate arrow (mirrored → arrowhead top-right) = reopen/restore */
 };
 // per-project count icons (HANDOFF-v45 §10): To Do = rounded square, Review = Scan
 // (magnifier) — both stroked, NEUTRAL ink (never green); shape is the only distinction.
@@ -5984,14 +6102,19 @@ function renderFsReview(){
     const cnote = carried.length ? `<span class="fnote">${foldLangFor(g0) === 'ja'
       ? `+ ${carried.map((x) => `#${x.id}`).join(', ')} の仕事もここに入っています`
       : `also carries ${carried.map((x) => `#${x.id}`).join(', ')}`}</span>` : '';
-    return `<div class="rcard${img ? '' : ' noimg'}" data-fsrev="${r.goalIds[0]}">${img}<div class="rc"><div class="t">${rid}${esc(r.checkLine)}</div>${rnote}${cnote}${pr}</div>
+    // Title = the goal's own title (saReviewTitle → text-first), same as the See-all
+    // Ledger and the To Do list, so a review card and its list row read identically
+    // (Masa 2026-07-20: this card showed reviewSummary.check "…が出ない" while the list
+    // showed the request text). Plan-reviews keep their "PLAN — approve to execute:"
+    // checkLine, which is the actionable label there, not a title mismatch.
+    return `<div class="rcard${img ? '' : ' noimg'}" data-fsrev="${r.goalIds[0]}">${img}<div class="rc"><div class="t">${rid}${esc(r.plan ? r.checkLine : saReviewTitle(g0))}</div>${rnote}${cnote}${pr}</div>
       <div class="act"><button class="b" data-fsapprove="${ids}" title="Approve">✓</button><button class="b no" data-fsdismiss="${ids}" title="Send back">✕</button></div></div>`;
   };
   // A folded goal is settled, not failed: no ✓/✕ (the thing to approve lives on the goal
   // it was folded into), no red, no painted surface (§1.5-8) — just its own number, what
   // it asked for, and where the work went. Tapping it opens that goal (§1.5-9 wording).
   const foldCard = (g) => {
-    const line = String(g.reviewSummary?.check || g.plan?.[0] || g.text || '').replace(/\s+/g, ' ').slice(0, 60);
+    const line = saReviewTitle(g).slice(0, 60); // title-first, same as the review card above
     const mergedNote = foldLangFor(g) === 'ja' ? `→ #${esc(String(g.foldedInto))} にまとめました` : `merged into #${esc(String(g.foldedInto))}`;
     return `<div class="rcard noimg fold" data-fsfold="${g.id}">
       <div class="rc"><div class="t"><span class="rid gno" data-n="${g.id}">#${g.id}</span>${esc(line)}</div>
@@ -6046,12 +6169,19 @@ function renderFsReview(){
     else openGoalDetail(target.id);
   };
   for (const b of el.querySelectorAll('[data-fsapprove]')) b.onclick = async (e) => { e.stopPropagation();
-    let r; for (const id of b.dataset.fsapprove.split(',')) r = await fetch(withKey(`/api/goals/${id}/approve`), { method: 'POST' });
-    if (r && r.ok) { celebrateApprove(); await refresh(); } else showErr('Approve failed.'); };
+    let ok = true, mergeGoal = null;
+    for (const id of b.dataset.fsapprove.split(',')) {
+      const r = await fetch(withKey(`/api/goals/${id}/approve`), { method: 'POST' });
+      if (!r.ok){ ok = false; break; }
+      const j = await r.json(); if (j && j.needsMerge) mergeGoal = j.goal; // 07-20c: PR goal
+    }
+    if (!ok){ showErr('Approve failed.'); return; }
+    await refresh();
+    if (mergeGoal) confirmMerge(mergeGoal); else celebrateApprove(); };
   for (const b of el.querySelectorAll('[data-fsdismiss]')) b.onclick = async (e) => { e.stopPropagation();
-    let r; for (const id of b.dataset.fsdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/dismiss`), { method: 'POST',
-      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: '' }) });
-    if (r && r.ok) await refresh(); else showErr('Dismiss failed.'); };
+    // 07-20c: the review-card ✕ is a pure Reject → Rejected column (/reject), no auto-rework.
+    let r; for (const id of b.dataset.fsdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/reject`), { method: 'POST' });
+    if (r && r.ok) await refresh(); else showErr('Reject failed.'); };
 }
 // Shared To Do bucketing (list rows AND the kanban board read the same groups —
 // single source of truth, see renderFsBoard below). Pure of the DOM: state in, groups out.
@@ -6070,13 +6200,14 @@ function fsBucketTodo(){
     queued: list.filter((t) => t.status === 'queued' && !t.reply).sort(byQueue),
     doneAll: list.filter((t) => ['done', 'skipped'].includes(t.status)).sort((a, b) => b.num - a.num),
     later: pgoals.filter((g) => g.status === 'pending'),
+    rejected: pgoals.filter((g) => g.status === 'rejected'), // 07-20c: Reject parks goals here (own fold, like Done)
   };
 }
 // To Do (below Review): Doing rows with bar + mono %, Next up in queue order,
 // error as a small in-row colour element (§1.5-8), quiet Done fold.
 function renderFsTodo(){
   const el = $('fsTodoSec'); if (!el) return;
-  const { pgoals, list, running, failed, blocked, needsInput, queued, doneAll, later } = fsBucketTodo();
+  const { pgoals, list, running, failed, blocked, needsInput, queued, doneAll, later, rejected } = fsBucketTodo();
   const paused = !!state.projects.find((p) => p.id === state.active)?.paused; // list版 Doing トグルの状態
   // 一時停止したゴール(blocked kind:'paused')は Doing に「Paused」1行で留める(Masa 2026-07-19)。
   // Needs you 側(failed/blocked)へは出さず、その走行/中断タスク行も抑止して二重行を作らない。
@@ -6177,7 +6308,8 @@ function renderFsTodo(){
     <div class="tl">
       ${(doingRows || paused) ? `<span class="tlcap tlcap-doing" style="padding-top:0">Doing<button class="tlcap-pause" data-fspause="1" aria-pressed="${paused ? 'true' : 'false'}" title="${paused ? 'Resume — 再開' : 'Pause — 一時停止'}">${paused ? '<svg viewBox="0 0 24 24"><path d="M8 5v14l11-7z"/></svg>' : '<svg viewBox="0 0 24 24"><rect x="6" y="5" width="4" height="14" rx="1"/><rect x="14" y="5" width="4" height="14" rx="1"/></svg>'}</button></span>${doingRows}` : ''}
       ${needsRows ? `<span class="tlcap needs"${(doingRows || paused) ? '' : ' style="padding-top:0"'}>Needs you</span>${needsRows}` : ''}
-      ${upRows ? `<span class="tlcap"${(doingRows || paused) || needsRows ? '' : ' style="padding-top:0"'}>Next up</span>${upRows}` : ''}
+      ${rejected.length ? `<span class="tlcap rejcap"${(doingRows || paused) || needsRows ? '' : ' style="padding-top:0"'}>Rejected<span class="num">${rejected.length}</span></span>${rejected.map((g) => `<div class="trow up rej"><span class="st rej"></span>${noSpan(g.id)}<span class="tt">${tt(g.text, 70)}</span><span class="acts"><button class="ab" data-fsreopen="${g.id}" title="Reopen — back to Review">${FS_ICONS.reopen}</button><button class="ab" data-fsrejdel="${g.id}" title="Delete — discard (closes the PR)">${FS_ICONS.del}</button></span></div>`).join('')}` : ''}
+      ${upRows ? `<span class="tlcap"${(doingRows || paused) || needsRows || rejected.length ? '' : ' style="padding-top:0"'}>Next up</span>${upRows}` : ''}
       ${queued.length > NCAP ? `<div class="morefold" id="fsTodoMore">${fsUI.todoMore ? 'less' : `+${queued.length - NCAP} more`}<span class="g">›</span></div>` : ''}
       ${laterRows ? `<span class="tlcap">Later</span>${laterRows}` : ''}
       <button class="qadd" data-fsnew="1" title="New goal"><span class="paplus"></span>New</button>
@@ -6190,6 +6322,16 @@ function renderFsTodo(){
   if (qadd) qadd.onclick = () => $('input')?.focus();
   const dl = el.querySelector('#fsDoneLine');
   if (dl) dl.onclick = () => { fsUI.doneOpen = !fsUI.doneOpen; dl.classList.toggle('open', fsUI.doneOpen); el.querySelector('#fsDonelist').hidden = !fsUI.doneOpen; };
+  for (const b of el.querySelectorAll('[data-fsreopen]')) b.onclick = async (e) => { e.stopPropagation();
+    const r = await fetch(withKey(`/api/goals/${b.dataset.fsreopen}/reopen`), { method: 'POST' });
+    if (!r.ok) showErr('Reopen failed.'); else await refresh(); };
+  for (const b of el.querySelectorAll('[data-fsrejdel]')) b.onclick = async (e) => { e.stopPropagation();
+    const preview = b.closest('.trow')?.querySelector('.tt')?.textContent || '';
+    // Delete on a rejected goal = revert: it closes the PR + drops the worktree, so a rejected
+    // goal that had a PR doesn't leave an orphan PR behind (DELETE would 409 — rejected isn't deletable).
+    if (!(await confirmDelete({ title: 'Discard this rejected goal?', preview }))) return;
+    const r = await fetch(withKey(`/api/goals/${b.dataset.fsrejdel}/revert`), { method: 'POST' });
+    if (!r.ok) showErr('Delete failed.'); else await refresh(); };
   const more = el.querySelector('#fsTodoMore');
   if (more) more.onclick = () => { fsUI.todoMore = !fsUI.todoMore; renderFsTodo(); };
   for (const b of el.querySelectorAll('[data-fsreps]')) b.onclick = () => {
@@ -6512,7 +6654,20 @@ function renderClawdHero(){
     $('fsRailTg').innerHTML = tgSvg('left', !root.classList.contains('railfold'));
     $('fsLaneTg').innerHTML = tgSvg('right', !root.classList.contains('lanefold'));
   };
-  $('fsRailTg').onclick = () => { root.classList.toggle('railfold'); tgUpdate(); fsGearAlignX(); }; // §1.5-7: fold
+  $('fsRailTg').onclick = () => { // §1.5-7: fold
+    root.classList.toggle('railfold'); tgUpdate();
+    // Re-align the gear only AFTER the rail's fold animation settles. The old
+    // synchronous fsGearAlignX() measured a half-collapsed rail mid-transition and
+    // left the gear at a stale offset once the width finished moving — "たたむと歯車が
+    // ズレる" (#474/#548, Masa 2026-07-19). Clear any stale offset now, re-measure on
+    // transitionend (flex-basis), with a timeout fallback for reduced-motion / .noanim.
+    const btn = $('fsMoreBtn'); if (btn) btn.style.transform = '';
+    const rail = root.querySelector('.fsrail');
+    let aligned = false;
+    const align = () => { if (aligned) return; aligned = true; fsGearAlignX(); };
+    if (rail) rail.addEventListener('transitionend', function te(e){ if (e.propertyName !== 'flex-basis') return; rail.removeEventListener('transitionend', te); align(); });
+    setTimeout(align, 340);
+  };
   $('fsLaneTg').onclick = () => { root.classList.toggle('lanefold'); tgUpdate(); };
   // List/Board toggle — wired once (static, unlike the row it used to live inside which
   // rebuilds on every renderFsTodo()); syncFsTvSeg() paints .on and is called from renderFsLane.
@@ -6756,12 +6911,22 @@ function clearBillingBlocked(){
 }
 function showErr(msg){
   const bar = $('errbar');
-  bar.classList.remove('billing'); // shed the paywall styling if it was last used for that
+  bar.classList.remove('billing', 'ok'); // shed the paywall/success styling if it was last used for that
   billingBlockedActive = false;
   bar.textContent = msg; bar.style.display = 'block';
   clearTimeout(errTimer);
   errTimer = setTimeout(() => { if (authDown) return; bar.style.display = 'none'; }, 6000);
 }
+// 07-20c: a neutral/success toast (green), reusing the #errbar surface. Used when a PR merge
+// lands back in the app (review→done via syncGoalMerges).
+function showToast(msg){
+  const bar = $('errbar');
+  bar.classList.remove('billing'); bar.classList.add('ok');
+  billingBlockedActive = false;
+  bar.textContent = msg; bar.style.display = 'block';
+  clearTimeout(errTimer);
+  errTimer = setTimeout(() => { bar.classList.remove('ok'); bar.style.display = 'none'; }, 4000);
+}
 
 // Free-limit copy (H22, Masa 2026-07-17 確定 · ja+en). The sentence is content,
 // so it follows the user's language; the mono label and buttons stay English
@@ -7109,15 +7274,55 @@ function scheduleActRender(){ if (_actT) { _actP = true; return; } renderActPane
 // (connection refused = fatal, no auto-retry), so we own the reconnect loop.
 let esRetryMs = 1000;
 let sseUp = false; // live engine link — the honest signal behind the MCP tab's status dot (v46)
+// Connection status line (queue tray): grace-debounce the offline state ~800ms so
+// sub-second SSE blips don't flash a red line. connOffline is the debounced flag
+// renderQueue() reads; connSetOnline/Offline flip it around real sseUp changes.
+let connOffline = false, _connGraceT = null, _sseReconnectT = null, _es = null, _healthT = null;
+function connSetOnline(){ if (_connGraceT) { clearTimeout(_connGraceT); _connGraceT = null; } if (connOffline) { connOffline = false; renderQueue(); } }
+function connSetOffline(){ if (_connGraceT || connOffline) return; _connGraceT = setTimeout(() => { _connGraceT = null; connOffline = true; renderQueue(); }, 800); }
+// Reconnect button: drop any pending backoff timer and reopen the EventSource now.
+function forceReconnect(){ if (_sseReconnectT) { clearTimeout(_sseReconnectT); _sseReconnectT = null; } try { _es && _es.close(); } catch { /* already closed */ } esRetryMs = 1000; connectSSE(); }
+// Robust liveness backstop that does NOT depend on EventSource onerror firing.
+// The browser throttles background tabs, so onerror can be delayed or never fire and
+// sseUp goes stale-true — that is why a dropped link showed no red line until the tab
+// was refreshed. A cheap HEAD probe (visible tabs only; also fired on tab-focus) flips
+// the connline within seconds of the user viewing a dead link, and forces a fresh SSE
+// so recovery (onopen -> clear + flush) still happens when onerror never fired.
+async function checkHealth(){
+  if (document.hidden) return;
+  let ok = false;
+  try {
+    const c = new AbortController(); const to = setTimeout(() => c.abort(), 3000);
+    const r = await fetch(withKey('/'), { method: 'HEAD', cache: 'no-store', signal: c.signal });
+    clearTimeout(to); ok = r.ok;
+  } catch { ok = false; }
+  if (!ok) {
+    connSetOffline(); // grace-debounced ~800ms
+    if (!_sseReconnectT) { try { _es && _es.close(); } catch {} sseUp = false; esRetryMs = Math.min(esRetryMs, 4000); _sseReconnectT = setTimeout(connectSSE, esRetryMs); }
+  } else if (connOffline && !_sseReconnectT) {
+    forceReconnect(); // server reachable again but the line is still up → reconnect to clear + flush
+  }
+}
+function startHealthPoll(){ clearInterval(_healthT); _healthT = setInterval(checkHealth, 4000); }
 function connectSSE(){
-  const es = new EventSource(withKey('/api/events'));
-  es.onopen = () => { esRetryMs = 1000; sseUp = true; console.log('[manager] sse connected'); refresh(); flushOutbox();
+  _sseReconnectT = null; // this attempt supersedes any scheduled retry
+  const es = _es = new EventSource(withKey('/api/events'));
+  es.onopen = () => { esRetryMs = 1000; sseUp = true; connSetOnline(); console.log('[manager] sse connected'); refresh(); flushOutbox();
     if ($('gearPop').classList.contains('open') && custTab === 'mcp') buildGearPop(); };
   es.onmessage = (e) => {
     const m = JSON.parse(e.data);
     if (m.ev === 'goal') {
-      const line = goalLogLine(m.goal, state.goals.find((g) => g.id === m.goal.id));
+      const prev = state.goals.find((g) => g.id === m.goal.id);
+      const line = goalLogLine(m.goal, prev);
       if (line) state.logEntries = pushCapped(state.logEntries, { text: line, ts: Date.now() });
+      // 07-20c: a PR goal reaches 'done' ONLY via a real merge (syncGoalMerges) — so a
+      // review→done flip on a goal that has a PR means the user just merged it on GitHub and
+      // came back. Celebrate (confetti) + a "merged" toast so the merge is unmistakable.
+      if (prev && prev.status === 'review' && m.goal.status === 'done' && m.goal.pr) {
+        try { celebrateApprove(); } catch {}
+        const prNo = (String(m.goal.pr).match(/pull\/(\d+)/) ?? [, ''])[1];
+        showToast(`PR #${prNo} merged — “${(m.goal.text || '').replace(/\s+/g, ' ').slice(0, 48)}” is Done`);
+      }
       upsert(state.goals, m.goal);
     }
     else if (m.ev === 'goal-deleted') state.goals = state.goals.filter((g) => g.id !== m.id);
@@ -7145,13 +7350,19 @@ function connectSSE(){
     scheduleRender();
   };
   es.onerror = () => {
-    if (es.readyState === EventSource.CLOSED) {
-      es.close();
-      if (sseUp) { sseUp = false; if ($('gearPop').classList.contains('open') && custTab === 'mcp') buildGearPop(); }
-      console.log(`[manager] sse closed — reconnecting in ${esRetryMs}ms`);
-      setTimeout(connectSSE, esRetryMs);
-      esRetryMs = Math.min(esRetryMs * 2, 15000);
-    }
+    // Native EventSource sits silently in CONNECTING and auto-retries on a dropped
+    // or refused connection — readyState only reaches CLOSED on a non-2xx response.
+    // Gating on CLOSED therefore missed every REAL relay/network drop (verified
+    // 2026-07-20: CDP-offline AND killing the server both left the old gate un-fired,
+    // so the red line never showed). Treat ANY error as the live link going down:
+    // stop the native retry (close), flag offline (grace-debounced), own the backoff.
+    if (_sseReconnectT) return; // a reconnect is already scheduled — don't stack
+    try { es.close(); } catch { /* already closed */ }
+    if (sseUp) { sseUp = false; if ($('gearPop').classList.contains('open') && custTab === 'mcp') buildGearPop(); }
+    connSetOffline(); // arm the ~800ms grace timer before the red connline shows
+    console.log(`[manager] sse down (readyState=${es.readyState}) — reconnecting in ${esRetryMs}ms`);
+    _sseReconnectT = setTimeout(connectSSE, esRetryMs);
+    esRetryMs = Math.min(esRetryMs * 2, 15000);
   };
 }
 
@@ -7302,7 +7513,8 @@ async function boot(){
   await refresh();
   flushOutbox();
   connectSSE();
-  document.addEventListener('visibilitychange', () => { if (!document.hidden) { refresh(); flushOutbox(); } });
+  startHealthPoll();
+  document.addEventListener('visibilitychange', () => { if (!document.hidden) { refresh(); flushOutbox(); checkHealth(); } });
   // belt and suspenders for the never-lose guarantee: even if every event
   // path misfires, unsent memos are retried on a slow heartbeat
   setInterval(() => { if (outbox.load().some((o) => o.status === 'unsent')) flushOutbox(); }, 15000);
@@ -7809,7 +8021,7 @@ function saEvidenceHtml(kind, factRow, img, filePaths, diffText, gtr, it){
   return `<div class="lg-ev"><div class="lg-evhd">Evidence</div><div class="row">${factRow}</div>${img}</div>`;
 }
 function saItemHtml(it, i){
-  const done = { 1: ['ok', '✓', 'Approved'], 2: ['no', '↩', 'Dismissed — re-testing ×3'], 3: ['no', '↩', 'Feedback sent — returned to To Do'], 4: ['ar', '—', 'Archived'], 5: ['no', '↩', 'Reverted — change undone'] }[it.st];
+  const done = { 1: ['ok', '✓', 'Approved'], 2: ['no', '↩', 'Rejected'], 3: ['no', '↩', 'Feedback sent — returned to To Do'], 4: ['ar', '—', 'Archived'], 5: ['no', '↩', 'Reverted — change undone'] }[it.st];
   if (done) {
     // Revert deliberately has NO undo: the PR is closed and its branch deleted —
     // an "UNDO" here would be a lie (HANDOFF-v45 §5.3 honesty over symmetry).
@@ -7878,7 +8090,7 @@ function saItemHtml(it, i){
     <div class="lg-ctx">${contextHtml}<div class="lg-fact"><span class="k">Done when</span><span class="v">${esc(it.check)}</span></div></div>
     ${evidenceHtml}
     ${riskHtml}
-    <div class="sa-act"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button><button class="sa-dis" data-saact="dis:${i}">Dismiss</button><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" placeholder="What's wrong? Send back to Claude Code…"><button class="sa-send" data-saact="send:${i}" title="Send back"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
+    <div class="sa-act"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button><button class="sa-dis" data-saact="dis:${i}">Reject</button><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" placeholder="What's wrong? Send back to Claude Code…"><button class="sa-send" data-saact="send:${i}" title="Send back"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
   </div>`;
 }
 function saRender(){
@@ -7889,7 +8101,7 @@ function saRender(){
   const c = `${pending.length} ready · ${green === pending.length ? 'all green' : `${pending.length - green} failing`} · ${proofN} with proof`;
   const curIdx = pending.findIndex((x) => x.goalId === SA.cur);
   const posLabel = pending.length && curIdx >= 0 ? `${curIdx + 1} / ${pending.length}` : '';
-  S.innerHTML = `<div class="sa-panel"><div class="sa-hd"><span class="t">Review</span><span class="c">${c}</span><span class="sa-count">${posLabel}</span><span class="keys">↑↓ MOVE · A APPROVE · D DISMISS · ESC CLOSE</span><button class="sa-x" data-saact="close:0">✕</button></div>
+  S.innerHTML = `<div class="sa-panel"><div class="sa-hd"><span class="t">Review</span><span class="c">${c}</span><span class="sa-count">${posLabel}</span><span class="keys">↑↓ MOVE · A APPROVE · D REJECT · ESC CLOSE</span><button class="sa-x" data-saact="close:0">✕</button></div>
     <div class="sa-body">${SA.items.length ? SA.items.map((it, i) => saItemHtml(it, i)).join('') : '<div class="sa-empty">Nothing waiting for review.</div>'}</div></div>`;
   // Native <details> would collapse on every rebuild (SSE tick, approve, etc.) —
   // track what's open per goal+section in SA.detOpen (persists across re-renders)
@@ -8031,7 +8243,7 @@ async function saAct(it, st, path, body){
   saSync();
   return true;
 }
-const SA_UNDO = { 1: 'revert-review', 2: 'retest-cancel', 3: 'undismiss', 4: 'unarchive' };
+const SA_UNDO = { 1: 'revert-review', 2: 'reopen', 3: 'undismiss', 4: 'unarchive' }; // 07-20c: st 2 = Reject, undo = reopen
 $('seeall').addEventListener('mousedown', (e) => { if (e.target === $('seeall')) saClose(); }); // no-dim dialog: outside = close
 $('seeall').addEventListener('click', async (e) => {
   const b = e.target.closest('[data-saact]');
@@ -8045,8 +8257,14 @@ $('seeall').addEventListener('click', async (e) => {
   if (k === 'tok') { b.classList.toggle('open'); $('seeall').querySelector(`#tokdetail${i}`)?.classList.toggle('open'); return; }
   if (k === 'runlocal') { $('seeall').querySelector(`#runlocal${i}`)?.classList.toggle('open'); return; }
   // every verdict auto-advances the focus to the next pending card (tempo).
-  if (k === 'app') { const bx = b.getBoundingClientRect(); confettiBurst(bx.left + bx.width / 2, bx.top + bx.height / 2); return saAct(it, 1, 'approve').then((ok) => { if (ok) saAdvanceFocus(it.goalId); }); }
-  if (k === 'dis') return saAct(it, 2, 'retest').then((ok) => { if (ok) saAdvanceFocus(it.goalId); });
+  if (k === 'app') { const bx = b.getBoundingClientRect(); return saAct(it, 1, 'approve').then((ok) => {
+    if (!ok) return;
+    // 07-20c: if the goal has a PR it stays in review (needsMerge) — open the merge dialog
+    // instead of celebrating/advancing; saCall already upserted the still-'review' goal.
+    const g = state.goals.find((x) => x.id === it.goalId);
+    if (g && g.status === 'review' && g.pr) { confirmMerge(g); return; }
+    confettiBurst(bx.left + bx.width / 2, bx.top + bx.height / 2); saAdvanceFocus(it.goalId); }); }
+  if (k === 'dis') return saAct(it, 2, 'reject').then((ok) => { if (ok) saAdvanceFocus(it.goalId); }); // 07-20c: Reject → Rejected column
   if (k === 'arch') return saAct(it, 4, 'archive').then((ok) => { if (ok) saAdvanceFocus(it.goalId); });
   if (k === 'rev') return saAct(it, 5, 'revert').then((ok) => { if (ok) saAdvanceFocus(it.goalId); });
   if (k === 'send') {
@@ -8090,11 +8308,16 @@ document.addEventListener('keydown', (e) => {
   e.preventDefault();
   const gid = it.goalId;
   if (e.key === 'a' || e.key === 'A') {
-    const el = $('seeall').querySelector(`.sa-item[data-gid="${gid}"] .sa-app`);
-    const box = el?.getBoundingClientRect();
-    confettiBurst(box ? box.left + box.width / 2 : innerWidth / 2, box ? box.top + box.height / 2 : innerHeight / 3);
-    saAct(it, 1, 'approve').then((ok) => { if (ok) saAdvanceFocus(gid); });
-  } else saAct(it, 2, 'retest').then((ok) => { if (ok) saAdvanceFocus(gid); });
+    saAct(it, 1, 'approve').then((ok) => {
+      if (!ok) return;
+      const g = state.goals.find((x) => x.id === gid);
+      if (g && g.status === 'review' && g.pr) { confirmMerge(g); return; } // 07-20c: PR goal → merge dialog
+      const el = $('seeall').querySelector(`.sa-item[data-gid="${gid}"] .sa-app`);
+      const box = el?.getBoundingClientRect();
+      confettiBurst(box ? box.left + box.width / 2 : innerWidth / 2, box ? box.top + box.height / 2 : innerHeight / 3);
+      saAdvanceFocus(gid);
+    });
+  } else saAct(it, 2, 'reject').then((ok) => { if (ok) saAdvanceFocus(gid); }); // 07-20c: D = Reject
 });
 // 紙吹雪 (Approveの気持ちよさ=機能要件・PRD §5.1) — flagship confetti port:
 // 6 full-spectrum colours, ~90 small rects, gravity, gone in 1.4s.
@@ -8403,7 +8626,7 @@ let _delConfirmResolve = null;
 // Discard positioned left); dismissing the dialog must still land on the non-destructive choice
 // regardless of which label happens to sit in which slot.
 let _delDismissValue = false;
-function confirmDelete({ title, body, preview, confirmLabel, cancelLabel, dismissValue = false, confirmDanger = true, cancelDanger = false } = {}){
+function confirmDelete({ title, body, preview, previewHtml, previewPlain = false, confirmLabel, cancelLabel, dismissValue = false, confirmDanger = true, cancelDanger = false } = {}){
   $('delModalTitle').textContent = title || 'Delete this goal?';
   $('delModalBody').textContent = body || "This can't be undone.";
   $('delConfirmBtn').textContent = confirmLabel || 'Delete';
@@ -8415,7 +8638,10 @@ function confirmDelete({ title, body, preview, confirmLabel, cancelLabel, dismis
   $('delConfirmBtn').className = 'mbtn' + (confirmDanger ? ' danger' : ' primary');
   $('delCancelBtn').className = 'mbtn' + (cancelDanger ? ' danger' : ' ghost');
   const pv = $('delPreviewTitle');
-  if (preview) { pv.textContent = preview; pv.style.display = ''; } else { pv.textContent = ''; pv.style.display = 'none'; }
+  pv.classList.toggle('plain', !!previewPlain);
+  if (previewHtml) { pv.innerHTML = previewHtml; pv.style.display = ''; }
+  else if (preview) { pv.textContent = preview; pv.style.display = ''; }
+  else { pv.textContent = ''; pv.style.display = 'none'; }
   _delDismissValue = dismissValue;
   $('deleteConfirmOverlay').classList.add('show');
   return new Promise((resolve) => { _delConfirmResolve = resolve; });
@@ -9152,7 +9378,6 @@ function gearSetHTML(){
   // to anonymous free users too. Sign-in is an extra (sync across devices), not a
   // gate to see your own usage or upgrade.
   const freeUsage = `<div class="srow"><div class="sl">Plan</div><span class="bx-sval">Free</span></div>
-       <div class="srow"><div class="sl">To Dos<span class="sd">pending, this install</span></div><span class="bx-sval bx-num">${u.pending ?? 0} / ${lim.pending ?? 5}</span></div>
        <div class="srow"><div class="sl">Lifetime</div><span class="bx-sval bx-num">${u.cumulative ?? 0} / ${lim.cumulative ?? 20}</span></div>
        <button class="bx-cta bx-up-set" data-gupgrade="1"><span class="bx-spin"></span>Upgrade${priceTag(bill.price)}</button>`;
   const billingRow = bill.plan === 'paid'

package/engine/lib.mjs

@@ -877,6 +877,42 @@ export function buildGoalPrBody({ lang, goal, goalTasks, files, owner, branch, p
   ].join('\n');
 }
 
+// summarizeForReview's prompt + reply parser, kept pure/here so engine/test can
+// assert (a) the JSON asks for a work-title, (b) the title guidance names
+// 修正/追加/改善/調査 so an "追加したい" request never becomes "…の修正", and (c) a
+// failed/missing reply falls back to goal.text (no regression) — all without an
+// LLM call. The app's saReviewTitle reads reviewSummary.title first (PR-B).
+export function buildReviewSummaryPrompt({ lang, goalText, changed, reports }) {
+  return [
+    `あるゴールの実装が完了しました。レビューする人が一目で判断できるよう、やさしい${lang === 'ja' ? '日本語' : lang}で書いてください。`,
+    '専門用語・長い説明は禁止。小学生でも分かる短い言い方。JSONのみ出力（前後に文章を書かない）:',
+    '{"title":"依頼を短い作業タイトルに言い換え(体言止め可)","check":"何を確認すれば良いか(1行)","changed":"何を変えたか(1行)"}',
+    'titleは依頼文の意図を取り違えないこと。修正/追加/改善/調査を区別する。'
+      + '例:「Xの不具合」→「Xの修正」/「Yを追加したい」→「Yの追加」/「Zを速くしたい」→「Zの改善」/「なぜWか調べて」→「Wの調査」。',
+    '',
+    `ゴール: ${(goalText ?? '').slice(0, 300)}`,
+    `変更ファイル: ${(changed ?? []).join(', ') || '(なし)'}`,
+    `ワーカー報告:\n${(reports ?? '').slice(0, 1500)}`,
+  ].join('\n');
+}
+
+// Parse the model's JSON into {title, check, changed}, per-field fallback when a
+// key is missing/blank. `fallback` carries the text-derived defaults
+// (title/changed = goal.text) so a goal whose summary call failed still shows
+// its own request text. Never throws — a broken/absent JSON yields the fallback.
+export function parseReviewSummary(raw, fallback = {}) {
+  const clean = (v, n) => String(v ?? '').replace(/\s+/g, ' ').slice(0, n);
+  const m = String(raw ?? '').match(/\{[\s\S]*\}/);
+  if (!m) return { ...fallback };
+  let o;
+  try { o = JSON.parse(m[0]); } catch { return { ...fallback }; }
+  return {
+    title: clean(o.title, 60) || fallback.title,
+    check: clean(o.check, 120),
+    changed: clean(o.changed, 120) || fallback.changed,
+  };
+}
+
 // A finished task's changed files look like a UI edit: app/ (the Manager's
 // own UI dir, or an equivalent frontend root) plus common frontend source
 // extensions. Pure/deterministic — no LLM — so it can gate proof capture
@@ -1139,6 +1175,7 @@ export function goalGroupStatus(goalStatus, startedAt) {
   if (goalStatus === 'folded') return 'review'; // PRD §6.5: rendered inside the Review section, not Done
   if (goalStatus === 'blocked') return 'attn'; // §4E: blocked is Attention, not Done
   if (goalStatus === 'needsInput') return 'todo'; // smart intake: awaiting an answer
+  if (goalStatus === 'rejected') return 'rejected'; // 07-20c: Reject を溜める独立欄（Done ではない）
   return 'done'; // includes 'reverted' (terminal)
 }
 
@@ -1495,6 +1532,8 @@ export function isNothingVerifiable({ changedFiles = [], hasPassCondition = fals
 // 人がアプリ側から閉じる経路。
 export function advanceReviewGoal(goal) {
   if (goal.status !== 'review') return { ok: false, error: 'goal is not in review' };
+  // 07-20c: PR ありゴールは Approve だけで done にしない（merge=採用が唯一の完了トリガー）。
+  if (goal && goal.pr) return { ok: true, needsMerge: true, status: 'review' };
   return { ok: true, status: 'done' };
 }
 
@@ -1508,20 +1547,39 @@ export function revertReviewGoal(goal) {
 // レビュー詳細パネル(task 70)のApprove/Dismissボタンの判定。advanceReviewGoal(task 62,
 // チェックリスト全件Approveの自動進行)とは別に、人間がレビュー画面から単発で下す判断
 // を扱う——PRの有無を問わず、レビュー中のgoalだけが対象。
-// Approveはそのままdoneへ。goalGroupStatus/goalChipのdone分岐(review以外は全部doneと
-// 読む)と揃えているので、doneに寄せて問題ない。
-export function approveGoal({ goalStatus }) {
+// Approve は PR の有無で分岐する（07-20c）。PR 無しは従来どおり即 done。PR ありは
+// Approve だけで done にせず needsMerge を返す——呼び出し側が「PR をマージして完了」
+// ダイアログを出して PR へ飛ばし、マージ後に syncGoalMerges が review→done を自動確定
+// する。これで「アプリで Approve 済みだが PR は開いたまま」のゾンビを構造的に消す
+// （merge=採用は人の操作、の鉄則を守る）。
+export function approveGoal({ goalStatus, hasPr = false }) {
   if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
+  if (hasPr) return { ok: true, needsMerge: true, status: 'review' };
   return { ok: true, status: 'done' };
 }
 
-// Dismiss(差し戻し)は 'running' に戻す——goalGroupStatus/goalChipは 'running' を
-// startedAt済みなら'doing'バケットに読むので、これでレビュー中断→作業中の表示に戻る。
+// Dismiss(差し戻し)は 'running' に戻す——チャット(/reply や /dismiss にテキスト)での
+// 「作り直し」依頼の受け皿。goalGroupStatus は startedAt 済みなら 'doing' に読む。
 export function dismissGoal({ goalStatus }) {
   if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
   return { ok: true, status: 'running' };
 }
 
+// Reject（07-20c・Dismiss とは別物）は自動再作業をせず、Rejected 欄に溜める 'rejected'
+// へ park する。作り直しはチャット（/reply）で依頼する。Rejected からは reopenGoal で
+// review へ戻せ、Delete（=revert）で PR ごと破棄できる。/dismiss（rework）とは別の
+// /reject エンドポイントが担うので、既存のチャット rework 契約を壊さない。
+export function rejectGoal({ goalStatus }) {
+  if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
+  return { ok: true, status: 'rejected' };
+}
+
+// Rejected 欄の『Reopen』——rejected を review に戻す（rejectGoal の逆操作）。
+export function reopenGoal({ goalStatus }) {
+  if (goalStatus !== 'rejected') return { ok: false, error: 'goal is not rejected' };
+  return { ok: true, status: 'review' };
+}
+
 // ---- MODE (Auto / Plan) ----------------------------------------------------
 // A goal runs in one of two modes. 'auto' = the default implement→verify→review
 // flow (worker edits files with acceptEdits). 'plan' = the worker runs under
@@ -2461,6 +2519,8 @@ export function goalLogLine(goal, prevGoal) {
   const label = String(goal?.plan?.[0] ?? goal?.text ?? '').replace(/\s+/g, ' ').trim().slice(0, 60);
   if (!prevGoal) return goal?.status === 'pending' ? `Goal shelved to Pending: "${label}"` : null;
   if (prevGoal.status === 'review' && goal.status === 'done') return `Approved: "${label}"`;
+  if (prevGoal.status === 'review' && goal.status === 'rejected') return `Rejected: "${label}"`;
+  if (prevGoal.status === 'rejected' && goal.status === 'review') return `Reopened: "${label}"`;
   if (prevGoal.status === 'review' && goal.status === 'running') return `Dismissed: "${label}" — back to work`;
   if (prevGoal.status !== 'running' && goal.status === 'running' && Array.isArray(goal.plan) && goal.plan.length) {
     return `Goal decomposed into ${goal.plan.length} task(s) → To do: "${label}"`;
@@ -2564,8 +2624,10 @@ export function computeRetestOutcome(results = [], total = 3) {
 // terminal 'reverted' status (distinct from 'skipped'/archived). Decision only —
 // the destructive gh/git calls live behind the server's small wrapper.
 export function revertGoal({ goalStatus }) {
-  if (!['review', 'done', 'blocked', 'partial'].includes(goalStatus)) {
-    return { ok: false, error: 'only a finished (review/done/blocked/partial) goal can be reverted' };
+  // 07-20c: 'rejected' も対象に含める——Rejected 欄の Delete は revert 経由で PR を閉じ
+  // worktree を落とす（PR を残したまま消すと孤児 PR ＝別のゾンビになるため）。
+  if (!['review', 'done', 'blocked', 'partial', 'rejected'].includes(goalStatus)) {
+    return { ok: false, error: 'only a finished (review/done/blocked/partial/rejected) goal can be reverted' };
   }
   return { ok: true, status: 'reverted' };
 }
@@ -2903,8 +2965,11 @@ export function nextResumeDelay(attempt, { baseMs = 5 * 60 * 1000, maxMs = 60 *
 // tested — sharing a module across that boundary would couple two things
 // that fail and deploy on different schedules. Keep the two copies in sync by
 // hand; both have their own test coverage against the same free-tier numbers.
+// maxPendingGoals (the 5 concurrent "queued to-do" cap) was REMOVED 2026-07-20
+// (Masa): the free tier no longer caps how many to-dos run at once, and the UI
+// drops the "x / 5" counter. The lifetime (20) and project (1) caps remain the
+// monetization wall.
 export const FREE_TIER_LIMITS = Object.freeze({
-  maxPendingGoals: 5,
   maxCumulativeGoals: 20,
   maxProjects: 1,
 });
@@ -2921,12 +2986,10 @@ export const QUEUED_GOAL_STATUSES = Object.freeze([
 ]);
 
 export function checkFreeTierLimit(usage) {
-  const pendingCount = Number(usage?.pendingCount) || 0;
   const cumulativeCount = Number(usage?.cumulativeCount) || 0;
   const projectCount = Number(usage?.projectCount) || 0;
-  if (pendingCount > FREE_TIER_LIMITS.maxPendingGoals) {
-    return { blocked: true, reason: 'pending-goal-limit', limit: FREE_TIER_LIMITS.maxPendingGoals, value: pendingCount };
-  }
+  // Concurrent "pending" to-dos are no longer capped (Masa 2026-07-20) — only
+  // the lifetime total and the project count gate the free tier.
   if (cumulativeCount > FREE_TIER_LIMITS.maxCumulativeGoals) {
     return { blocked: true, reason: 'cumulative-goal-limit', limit: FREE_TIER_LIMITS.maxCumulativeGoals, value: cumulativeCount };
   }
@@ -3509,3 +3572,15 @@ export function parseClaimResponse(obj) {
   if (obj.token) return { state: 'ready', token: String(obj.token), email: obj.email != null ? String(obj.email) : undefined };
   return { state: 'pending' };
 }
+
+// --- connection status line (queue tray) -------------------------------------
+// Pure source of truth for the offline/reconnecting line that renders as the top
+// row of the queued tray above the composer. app/index.html is a browser static
+// file that can't import this module, so it MIRRORS these two tiny functions
+// inline (see renderQueue()); keep the logic identical on both sides.
+export function connectionBannerState({ online }) {
+  return online ? { kind: 'ok' } : { kind: 'offline', reconnect: true };
+}
+export function unsentMetaLabel({ online }) {
+  return online ? 'Unsent — tap to resend' : 'Waiting for connection';
+}

package/engine/server.mjs

@@ -21,7 +21,7 @@ import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { pathToFileURL } from 'node:url';
 import { needsProjectFolder, folderLabel, buildFolderQuestion, resolveFolderAnswer, classifyFolderTarget, buildFolderInitConfirm, isFolderInitConfirmed, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer, routeQuestionAnswer, notUnderstoodNote, parseRelocalizedQuestion, classifyAuthProbe, authBannerText, makeSigninChallenge, parseClaimResponse } from './lib.mjs';
-import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, permissionModeFor, isPlanReview, nextAfterPlanApprove, GOAL_MODES, parseSkillFrontmatter, collectSkills, retestGoal, cancelRetestGoal, computeRetestOutcome, revertGoal, planRevertActions, archiveGoal, unarchiveGoal, undismissGoal, parseNumstat, truncateDiffText, sumUsage, resolveEntryUrl, parseGitLog, diffNewCommits, replayQueueLog, reconcileOrphanGoals, reorderQueue, sortQueueByPriority, TASK_PRIORITIES, validateWorkflowColumns, DEFAULT_WORKFLOW_COLUMNS, validateReviewDefinition, DEFAULT_REVIEW_DEFINITION, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyVerifyGate, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot } from './lib.mjs';
+import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, buildReviewSummaryPrompt, parseReviewSummary, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, rejectGoal, reopenGoal, permissionModeFor, isPlanReview, nextAfterPlanApprove, GOAL_MODES, parseSkillFrontmatter, collectSkills, retestGoal, cancelRetestGoal, computeRetestOutcome, revertGoal, planRevertActions, archiveGoal, unarchiveGoal, undismissGoal, parseNumstat, truncateDiffText, sumUsage, resolveEntryUrl, parseGitLog, diffNewCommits, replayQueueLog, reconcileOrphanGoals, reorderQueue, sortQueueByPriority, TASK_PRIORITIES, validateWorkflowColumns, DEFAULT_WORKFLOW_COLUMNS, validateReviewDefinition, DEFAULT_REVIEW_DEFINITION, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyVerifyGate, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot } from './lib.mjs';
 import { openPR } from './pr.mjs';
 import { runVerification, exerciseUi } from './verify.mjs';
 
@@ -2604,21 +2604,19 @@ async function summarizeForReview(goal, siblings, dir, reviewDefinition) {
   const lang = reviewDefinition.language === 'auto' ? detectRequestLanguage(goal.text) : (reviewDefinition.language || 'ja');
   const changed = [...new Set(siblings.flatMap((t) => t.changedFiles ?? []))].slice(0, 20);
   const reports = siblings.filter((t) => !t.reply).map((t) => `- ${t.title}: ${(t.result ?? '').replace(/\s+/g, ' ').slice(0, 300)}`).join('\n');
-  const fallback = { check: '', changed: (goal.plan?.[0] ?? goal.text ?? '').replace(/\s+/g, ' ').slice(0, 80) };
+  // fallback = current behavior: title/changed derived from the goal's own text,
+  // so a goal with no summary (AI failed or nothing to summarize) still shows a
+  // meaningful title/changed and never a blank or mis-phrased "…の修正".
+  const fallback = {
+    title: (goal.text ?? '').replace(/\s+/g, ' ').slice(0, 60),
+    check: '',
+    changed: (goal.plan?.[0] ?? goal.text ?? '').replace(/\s+/g, ' ').slice(0, 80),
+  };
   if (!changed.length && !reports) return fallback;
-  const prompt = [
-    `あるゴールの実装が完了しました。レビューする人が一目で判断できるよう、やさしい${lang === 'ja' ? '日本語' : lang}で2行だけ書いてください。`,
-    '専門用語・長い説明は禁止。小学生でも分かる短い言い方。JSONのみ出力（前後に文章を書かない）:',
-    '{"check":"何を確認すれば良いか(1行)","changed":"何を変えたか(1行)"}',
-    '',
-    `ゴール: ${(goal.text ?? '').slice(0, 300)}`,
-    `変更ファイル: ${changed.join(', ') || '(なし)'}`,
-    `ワーカー報告:\n${reports.slice(0, 1500)}`,
-  ].join('\n');
+  const prompt = buildReviewSummaryPrompt({ lang, goalText: goal.text, changed, reports });
   try {
     const r = await runUtility({ prompt, cwd: dir, tools: 'Read' });
-    const m = r.result.match(/\{[\s\S]*\}/);
-    if (m) { const o = JSON.parse(m[0]); return { check: String(o.check ?? '').replace(/\s+/g, ' ').slice(0, 120), changed: String(o.changed ?? '').replace(/\s+/g, ' ').slice(0, 120) || fallback.changed }; }
+    return parseReviewSummary(r.result, fallback);
   } catch { /* fall through */ }
   return fallback;
 }
@@ -3177,8 +3175,8 @@ const server = createServer(async (req, res) => {
       email: licenseState.email,
       isPaying: Boolean(licenseState.isPaying),
       plan: licenseState.isPaying ? 'paid' : 'free',
-      usage: { pending: freeUsage.pendingCount, cumulative: freeUsage.cumulativeCount },
-      limits: { pending: FREE_TIER_LIMITS.maxPendingGoals, cumulative: FREE_TIER_LIMITS.maxCumulativeGoals },
+      usage: { cumulative: freeUsage.cumulativeCount },
+      limits: { cumulative: FREE_TIER_LIMITS.maxCumulativeGoals },
       price: await getBillingPrice(),
       siteUrl: BILLING_API_URL || null,
     };
@@ -3786,6 +3784,9 @@ const server = createServer(async (req, res) => {
     if (!requireGoalOwnership(req, res, goal)) return;
     const result = advanceReviewGoal(goal);
     if (!result.ok) return json(res, 409, { error: result.error });
+    // 07-20c: PR ありは done にせず「PR をマージして完了」を促す。status は review の
+    // まま。マージ後に syncGoalMerges が done を確定する。
+    if (result.needsMerge) return json(res, 200, { goal, needsMerge: true, pr: goal.pr });
     goal.status = result.status;
     saveGoal(goal);
     return json(res, 200, goal);
@@ -4047,8 +4048,12 @@ const server = createServer(async (req, res) => {
       pump(goal.projectId);
       return json(res, 200, goal);
     }
-    const result = approveGoal({ goalStatus: goal.status });
+    const result = approveGoal({ goalStatus: goal.status, hasPr: !!goal.pr });
     if (!result.ok) return json(res, 409, { error: result.error });
+    // 07-20c: PR ありは Approve だけで done にしない。status は review のまま返し、
+    // クライアントは「PR をマージして完了してください」ダイアログ＋ Open PR を出す。
+    // マージされたら syncGoalMerges が review→done を自動確定する。
+    if (result.needsMerge) return json(res, 200, { goal, needsMerge: true, pr: goal.pr });
     goal.status = result.status;
     saveGoal(goal);
     return json(res, 200, goal);
@@ -4228,6 +4233,46 @@ const server = createServer(async (req, res) => {
     return;
   }
 
+  // 07-20c: Reject — park a review goal in the Rejected column. No auto-rework
+  // (rework is asked for via chat /reply or /dismiss). Kept as a SEPARATE
+  // endpoint from /dismiss so the existing chat-rework contract is untouched.
+  // An optional text is kept as a rejection note; no worker is spawned.
+  const rejectMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/reject$/);
+  if (rejectMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(rejectMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    const result = rejectGoal({ goalStatus: goal.status });
+    if (!result.ok) return json(res, 409, { error: result.error });
+    let body = '';
+    req.on('data', (d) => { body += d; });
+    req.on('end', () => {
+      let text = '';
+      try { text = String(JSON.parse(body || '{}').text ?? '').trim(); } catch {}
+      goal.status = result.status;
+      if (text) goal.rejectNote = text;
+      goal.rejectedAt = new Date().toISOString();
+      saveGoal(goal);
+      json(res, 200, { goal });
+    });
+    return;
+  }
+
+  // 07-20c: Rejected 欄の『Reopen』——rejected を review へ戻す（Reject の取り消し）。
+  // Delete（破棄）は既存の /revert（PR を閉じ worktree を落とす）を使う。
+  const reopenMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/reopen$/);
+  if (reopenMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(reopenMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    const result = reopenGoal({ goalStatus: goal.status });
+    if (!result.ok) return json(res, 409, { error: result.error });
+    goal.status = result.status;
+    goal.rejectNote = null; goal.rejectedAt = null;
+    saveGoal(goal);
+    return json(res, 200, goal);
+  }
+
   // image attachments: upload (base64 JSON) + serve back for thumbnails
   if (url.pathname === '/api/upload' && req.method === 'POST') {
     let body = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galda/cli",
-  "version": "0.10.36",
+  "version": "0.10.37",
   "type": "module",
   "description": "Galda - hand off work to Claude Code or Codex, get proof back. Runs on your existing subscription, no extra API cost.",
   "scripts": {