@galda/cli 0.10.36 → 0.10.38

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. */
@@ -1930,12 +1948,180 @@
   .sa-done .undo{margin-left:auto;border:0;background:none;color:var(--ink3);font:500 10px/1 var(--mono);cursor:pointer}
   .sa-done .undo:hover{color:var(--ink);background:transparent}
   .sa-empty{font:500 11px/1 var(--mono);color:var(--ink3);padding:20px 0}
+  /* ═══ Review card redesign (REVIEW-CARD-SPEC.md · Masa 2026-07-20 confirmed):
+     Linear-docs typography · META = green outline pill (Chip) · GitHub diff = Bright.
+     Ported from the flagship redesign (fs-redesign.css), the dev-only PLAN/META/DIFF
+     switchers resolved to the confirmed defaults plan=d / meta=a / gh=d, and the
+     flagship fallback hexes mapped to the app's real theme tokens (theme.css).
+     Scoped to .sa-item.redesign so the plain .sa-done one-liner is untouched. ═══ */
+  #seeall .sa-panel{width:min(940px,94%);max-width:940px;backdrop-filter:blur(30px) saturate(1.4);-webkit-backdrop-filter:blur(30px) saturate(1.4)}
+  /* body/header/card geometry ported verbatim from the artifact (fs-redesign.css plan=d):
+     the CARD carries the 40px side gutters + 28/34 top/bottom, the header matches (40/34),
+     and the See-all body drops its own gutter/gap/centering so the card padding is the
+     single source of the Linear-docs air. !important because the app's own .sa-item /
+     .sa-body / .lg rules (added first, same-or-higher specificity) otherwise win. */
+  #seeall .sa-body:has(.sa-item.redesign){gap:0 !important;align-items:stretch !important}
+  #seeall .sa-panel .sa-hd:has(~ .sa-body .sa-item.redesign){padding:16px 34px 12px 40px !important}
+  .sa-item.redesign{width:100% !important;background:none !important;border:0 !important;border-radius:0 !important;box-shadow:none !important;
+    padding:28px 40px 34px !important;font-family:var(--ui);color:var(--ink);line-height:1.6}
+  .sa-item.redesign *{box-sizing:border-box}
+  /* first card: no extra top margin — the card's own 28px padding-top (plus the
+     body's 16px) is the top air, matching the ~40px inter-card rhythm below.
+     The old 52px pushed the header→#N gap to ~96px of dead whitespace (Masa 2026-07-20). */
+  #seeall .sa-body>.sa-item.redesign:first-child{margin-top:0 !important}
+  #seeall .sa-body>.sa-item.redesign+.sa-item.redesign{border-top:1px solid var(--hair) !important;margin-top:0 !important;padding-top:40px !important}
+  /* reply composer: match the flagship saItem field (34px tall · radius 10 · 12px left pad)
+     so it doesn't read cramped next to the 32px Approve/Dismiss (Masa 2026-07-20).
+     padding-right (42px for the send ring) stays from .sa-chatwrap .sa-chat. */
+  #seeall .sa-chat{height:34px;border-radius:10px;padding-left:12px}
+  /* header — mono eyebrow · review dot · In review */
+  .redesign .rhead{display:flex;align-items:center;gap:12px;font-family:var(--mono);font-size:11px;color:var(--ink3)}
+  .redesign .rtag{letter-spacing:.02em;font-variant-numeric:tabular-nums}
+  .redesign .rst{display:inline-flex;align-items:center;gap:6px;color:var(--ink2)}
+  .redesign .rdot{width:6px;height:6px;border-radius:50%;background:var(--amber,#e0a021);display:inline-block}
+  .redesign .rtitle{font-family:var(--ui);font-size:18px;font-weight:680;letter-spacing:-.018em;line-height:1.3;margin:8px 0 0 !important;color:var(--ink)}
+  /* meta — Linear sans, green/neutral chips, hairline under (spec §4) */
+  .redesign .rmeta{display:flex;flex-wrap:wrap;align-items:center;gap:8px 12px;margin:12px 0 0 !important;padding-bottom:12px !important;
+    border-bottom:1px solid var(--hair);font-family:var(--ui);font-size:12px;letter-spacing:-.004em;color:var(--ink2)}
+  .redesign .rmeta .mx{display:inline-flex;align-items:center;gap:5px}
+  .redesign .rmeta .mk{color:var(--ink3)}
+  .redesign .rmeta b{color:var(--ink);font-weight:600}
+  .redesign .rmeta .mmut{color:var(--ink3);font-weight:400}
+  .redesign .rmeta .ar{font-size:.82em;margin-left:1px;color:var(--ink3)}
+  .redesign .rmeta .a{color:#3fd07a;font-style:normal} .redesign .rmeta .d{color:#ff7b72;font-style:normal}
+  /* Chip = outline pill (meta=a): green for PR/Token, neutral for Local */
+  .redesign .rmeta .mlink{cursor:pointer;padding:3px 10px;border-radius:999px;
+    border:1px solid color-mix(in srgb,currentColor 40%,var(--hair));text-decoration:none;background:none;font:inherit}
+  .redesign .rmeta .mlink:hover{background:color-mix(in srgb,currentColor 9%,transparent)}
+  .redesign .rmeta .mlink.pr,.redesign .rmeta .mlink.pr *{color:var(--green)}
+  /* whole PR chip bold, not just the number (REVIEW-CARD-SPEC §5) — scoped to .mlink.pr so Token/Local chips are unaffected */
+  .redesign .rmeta .mlink.pr,.redesign .rmeta .mlink.pr .mk,.redesign .rmeta .mlink.pr b,.redesign .rmeta .mlink.pr .mmut{font-weight:700}
+  .redesign .rmeta .mlink:not(.pr){color:var(--ink2)}
+  .redesign .rmeta .mlink:not(.pr) .mk{color:var(--ink3)}
+  .redesign .rmeta .mlink:not(.pr) b{color:var(--ink)}
+  .redesign .rmeta .mtok{cursor:pointer;padding:3px 10px;border-radius:999px;font:inherit;
+    border:1px solid color-mix(in srgb,var(--green) 40%,var(--hair));background:none}
+  .redesign .rmeta .mtok,.redesign .rmeta .mtok *{color:var(--green)}
+  .redesign .rmeta .mtok b{font-weight:700}
+  .redesign .rmeta .ok{color:var(--green)}
+  .redesign .rmeta .tokchevron{font-style:normal;font-size:11px;line-height:1;transition:transform .2s;opacity:.8}
+  .redesign .rmeta .mtok.open .tokchevron{transform:rotate(90deg)}
+  .redesign .rmeta-detail{display:none;margin:12px 0 0;padding:9px 12px;background:color-mix(in srgb,var(--ink) 4%,transparent);border-radius:8px}
+  .redesign .rmeta-detail.open{display:block}
+  .redesign .rmeta-detail .k{font:600 8px/1 var(--mono);letter-spacing:.1em;text-transform:uppercase;color:var(--ink3);margin-bottom:5px;display:block}
+  .redesign .rmeta-detail .v{font:500 11.5px/1.6 var(--ui);color:var(--ink2)}
+  /* sections — Linear-docs bold sentence-case headings + high-contrast body.
+     margins are !important: the app's pre-existing .lg / .sa-item rules load first and
+     otherwise tie/beat these on specificity, flattening the Linear-docs rhythm. */
+  .redesign .rsec{margin-top:24px !important}
+  .redesign .rsec-h{font-family:var(--ui);font-size:15px;font-weight:680;letter-spacing:-.012em;line-height:1.3;color:var(--ink);margin:0 0 9px !important}
+  /* body prose = the app's normal text: 14px / −.012em, matching .bubble (Masa 2026-07-20:
+     13px read thinner/lighter for Japanese than the surrounding app). §2. */
+  .redesign .rbody{font-size:14px;line-height:1.62;letter-spacing:-.012em;color:var(--ink);max-width:70ch;margin:0 !important}
+  .redesign .rdesc,.redesign .rrisk{color:var(--ink2)}
+  .redesign .rfiles{margin:12px 0 0;font-family:var(--mono);font-size:12px;color:var(--ink2);line-height:1.75}
+  .redesign .rfiles .a{color:#3fd07a;font-style:normal}.redesign .rfiles .d{color:#ff7b72;font-style:normal}
+  /* Request accordion (spec §3) — chevron › rotate 90, body indented, no left rule */
+  .redesign .rreq .rsec-h{margin-bottom:6px !important}
+  .redesign .reqacc{margin-top:0 !important}
+  .redesign .racc>summary{list-style:none;cursor:pointer;display:flex;gap:10px;align-items:baseline}
+  .redesign .racc>summary::-webkit-details-marker{display:none}
+  .redesign .racc>summary::before{content:"›";font-size:1.05em;line-height:1;color:var(--ink2);display:inline-block;transition:transform .14s}
+  .redesign .racc[open]>summary::before{transform:rotate(90deg)}
+  .redesign .reqacc>summary{color:var(--ink);font-size:13.5px;line-height:1.55}
+  .redesign .reqbody{margin:14px 0 0 !important;padding-left:22px !important}
+  .redesign .rsub{font-family:var(--ui);font-size:11px;font-weight:600;color:var(--ink3);margin:16px 0 8px !important}
+  .redesign .reqbody>.rsub:first-child{margin-top:2px !important}
+  .redesign .reqbody .lg-bullets{margin:0;padding:0 0 0 16px;font-size:13px;line-height:1.65;color:var(--ink2)}
+  .redesign .reqbody .lg-bullets li{margin-bottom:5px}
+  .redesign .reqbody .lg-splitnote{background:color-mix(in srgb,var(--ink) 4%,transparent);border-radius:8px;padding:10px 12px;margin-top:12px}
+  .redesign .reqbody .lg-splitnote .hd{font:600 8.5px/1 var(--mono);letter-spacing:.08em;text-transform:uppercase;color:var(--ink3);margin-bottom:7px}
+  .redesign .reqbody .lg-splitnote ul{margin:0;padding:0;list-style:none;font-size:12px;line-height:1.8;color:var(--ink3)}
+  .redesign .reqbody .lg-splitnote li.cur{color:var(--ink)} .redesign .reqbody .lg-splitnote li.cur b{color:var(--green);font-weight:600}
+  /* workflow (spec §8) — vertical ✓ green / → green / □ dim */
+  .redesign .rwf{display:flex;flex-direction:column;gap:2px;margin:10px 0 0 !important;font-family:var(--ui);font-size:12px;letter-spacing:-.004em;color:var(--ink3)}
+  .redesign .rwf .wf-s{display:flex;align-items:center;gap:9px}
+  .redesign .rwf .wf-s .mk{width:12px;text-align:center;flex:0 0 12px}
+  .redesign .rwf .wf-s.ok{color:var(--ink2)}.redesign .rwf .wf-s.ok .mk{color:var(--green)}
+  .redesign .rwf .wf-s.now{color:var(--ink);font-weight:600}.redesign .rwf .wf-s.now .mk{color:var(--green);font-weight:700}
+  .redesign .rwf .wf-s.todo{color:var(--ink3)}.redesign .rwf .wf-s.todo .mk{color:var(--ink3);font-size:.82em}
+  /* proof (spec §6) — before/after forced same size · run-log · honest missing note */
+  .redesign .beforeafter{display:grid;grid-template-columns:1fr 1fr;gap:12px;max-width:640px;align-items:start}
+  .redesign .ba-col{display:flex;flex-direction:column;gap:6px;min-width:0}
+  .redesign .balabel{font-family:var(--mono);font-size:11px;letter-spacing:.04em;text-transform:uppercase;color:var(--ink3)}
+  .redesign .proofimg{display:block;width:100%;height:auto;max-height:none;object-fit:contain;border:1px solid var(--hair);border-radius:9px;cursor:zoom-in;margin:0}
+  .redesign .rproof{max-width:640px}
+  /* screen-recording player (spec §6) — sits under before/after, same 640px column */
+  .redesign .rvid{margin:12px 0 0;max-width:640px}
+  .redesign .rvid svg,.redesign .rvid .proofvid{display:block;width:100%;height:auto;border:1px solid var(--hair);border-radius:9px;background:#000}
+  .redesign .rvid .proofvid{aspect-ratio:16/9;object-fit:contain}
+  .redesign .rvid figcaption{margin-top:7px;font-family:var(--mono);font-size:11px;letter-spacing:.02em;color:var(--ink3)}
+  .redesign .rrun{border:1px solid var(--hair);border-radius:10px;overflow:hidden;font-family:var(--mono);font-size:12.5px;max-width:640px}
+  .redesign .rrun .rr{display:flex;justify-content:space-between;gap:16px;padding:10px 14px;border-top:1px solid var(--hair)}
+  .redesign .rrun .rr:first-child{border-top:0}
+  .redesign .rrun .rr .lab{color:var(--ink2)}.redesign .rrun .rr .v{color:var(--green);text-align:right}
+  .redesign .rmiss{display:flex;align-items:flex-start;gap:8px;font-size:12.5px;line-height:1.6;color:var(--ink2)}
+  .redesign .rmiss svg{width:15px;height:15px;flex:0 0 15px;margin-top:2px;fill:none;stroke:var(--amber);stroke-width:2;stroke-linecap:round;stroke-linejoin:round}
+  /* GitHub diff = Bright (gh=d): old|new gutters · +/− column · line+gutter tint */
+  .redesign .rdiff2{margin:12px 0 0;border:1px solid var(--hair);border-radius:10px;overflow:hidden;font-family:var(--mono);font-size:12px;line-height:1.6}
+  .redesign .ghl{display:grid;grid-template-columns:46px 46px 22px 1fr}
+  .redesign .ghl .gho,.redesign .ghl .ghn{color:var(--ink3);opacity:.6;text-align:right;padding:1px 8px;user-select:none;-webkit-user-select:none;font-variant-numeric:tabular-nums}
+  .redesign .ghl .ghm{text-align:center;color:var(--ink3);padding:1px 0}
+  .redesign .ghl .ghc{padding:1px 10px;white-space:pre-wrap;color:var(--ink)}
+  .redesign .gh-add{background:rgba(46,204,113,.22)}
+  .redesign .gh-add .gho,.redesign .gh-add .ghn{background:rgba(46,204,113,.30)}
+  .redesign .gh-add .ghm{color:#3fb950}
+  .redesign .gh-del{background:rgba(248,81,73,.20)}
+  .redesign .gh-del .gho,.redesign .gh-del .ghn{background:rgba(248,81,73,.30)}
+  .redesign .gh-del .ghm{color:#f85149}
+  .redesign .gh-hi{border-radius:2px;padding:0 1px}
+  .redesign .gh-add .gh-hi{background:rgba(46,204,113,.55)} .redesign .gh-del .gh-hi{background:rgba(248,81,73,.5)}
+  /* huge-diff footer (spec §7): "…+N 行 · GitHub で開く ↗" */
+  .redesign .ghfoot{margin-top:8px;font-family:var(--mono);font-size:11.5px;color:var(--ink3);display:flex;gap:2px;align-items:center;flex-wrap:wrap}
+  .redesign .ghfoot .ghopen{color:var(--ink2);text-decoration:none}
+  .redesign .ghfoot .ghopen:hover{color:var(--blue)}
+  /* meta links carry NO underline — PR is a real <a href> (spec §5, Masa 2026-07-20) */
+  .redesign .rmeta a{text-decoration:none}
+  /* Request / What-to-check = full contrast, same ink as the title (spec §2, no fade) */
+  .redesign .rask,.redesign .rcheck,.redesign .rcheck li,.redesign .rcheck1{color:var(--ink) !important}
+  .redesign ul.rcheck{margin:2px 0 0;padding:0 0 0 18px;font-size:14px;line-height:1.7;letter-spacing:-.012em}
+  .redesign ul.rcheck li{margin-bottom:6px}
+  /* Activity (spec §3) = ONE Linear-docs pulldown. Heading plain; chevron on the FIRST
+     line; tapping opens the rest below, offset-indented (no left rule); Discussion folds
+     in at the bottom of the opened body. */
+  .redesign .ract{margin-top:24px !important}
+  .redesign .ract>.rsec-h{margin-bottom:10px !important}
+  .redesign .lacc>summary{list-style:none;cursor:pointer;display:flex;gap:9px;align-items:baseline}
+  .redesign .lacc>summary::-webkit-details-marker{display:none}
+  .redesign .lacc .ltog{flex:0 0 auto;color:var(--ink3);font-style:normal;line-height:1;transition:transform .14s}
+  .redesign .lacc[open]>summary .ltog{transform:rotate(90deg)}
+  .redesign .lacc .lfirst{flex:1;min-width:0}
+  .redesign .lacc .lbody{margin-top:12px;padding-left:18px}
+  /* transcript rows — Linear-clean, borderless (You / tool mono / res green / Claude) */
+  .redesign .rtx{border:0;background:none}
+  .redesign .txr{display:flex;gap:12px;padding:5px 0;font-size:13px;line-height:1.55}
+  .redesign .txr .w{flex:0 0 46px;font-size:11px;color:var(--ink3);padding-top:1px}
+  .redesign .txr.you .w,.redesign .txr.cl .w{color:var(--ink);font-weight:600}
+  .redesign .txr .m{flex:1;min-width:0;color:var(--ink2)}
+  .redesign .txr.cl .m{color:var(--ink)}
+  .redesign .txr.tool .m{color:var(--ink2);font-family:var(--mono);font-size:12px}
+  .redesign .txr.tool .m b{color:var(--ink);font-weight:600}
+  .redesign .txr.res .m{font-family:var(--mono);font-size:12px;color:var(--green)}
+  /* Discussion (review back-and-forth) folded at the bottom of Activity's body */
+  .redesign .lbody .rthread{display:flex;flex-direction:column;gap:16px;margin:0}
+  .redesign .lbody .rmsg .who{font-size:12px;font-weight:600;color:var(--ink);margin-bottom:4px}
+  .redesign .lbody .rmsg .msg{font-size:13px;line-height:1.55;color:var(--ink2)}
+  /* sensitive-area note (real) sits below What changed */
+  .redesign .lg-risk{margin-top:20px}
   #saconf{position:fixed;inset:0;pointer-events:none;z-index:99;display:block}
   /* retest ×3 note surfaces on the lane review card too (v45 §5.3) */
   #fsRoot .rcard .rnote{display:block;font:500 9.5px/1.4 var(--mono);color:var(--green);margin-top:3px}
   /* 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 +2137,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 +2999,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">Dismiss</button>
       <span style="flex:1"></span>
       <button class="mbtn ghost" id="reviewClose">Close</button>
     </div>
@@ -2967,7 +3154,7 @@ const savedTheme = (() => {
   if (v !== s) localStorage.setItem('theme', v);
   return v;
 })();
-const state = { projects: [], goals: [], tasks: [], act: {}, actAt: {}, todos: {}, chatTurns: {}, active: 'galda2', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], expanded: new Set(), openThreads: new Set(), queueOrder: {}, externalActivity: [], selectedGoal: null, workflowColumns: {}, wfDraft: null, reviewDefinitions: {}, rdDraft: null, connectedApp: localStorage.getItem('sel:agent') || 'claude-code', reviewOpenGoal: null, reviewApprovals: {}, goalDetailOpen: null, qreplyOpen: new Set(), logCollapsed: localStorage.getItem('logCollapsed') !== '0', logEntries: [], layout: localStorage.getItem('layout') || 'flagship', theme: savedTheme, boardskin: localStorage.getItem('boardskin') || 'auto', summaryPattern: Number(localStorage.getItem('summaryPattern')) || 3, peraSpot: 0, skill: null, skillsCache: null,
+const state = { projects: [], goals: [], tasks: [], act: {}, actAt: {}, todos: {}, chatTurns: {}, active: 'default', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], expanded: new Set(), openThreads: new Set(), queueOrder: {}, externalActivity: [], selectedGoal: null, workflowColumns: {}, wfDraft: null, reviewDefinitions: {}, rdDraft: null, connectedApp: localStorage.getItem('sel:agent') || 'claude-code', reviewOpenGoal: null, reviewApprovals: {}, goalDetailOpen: null, qreplyOpen: new Set(), logCollapsed: localStorage.getItem('logCollapsed') !== '0', logEntries: [], layout: localStorage.getItem('layout') || 'flagship', theme: savedTheme, boardskin: localStorage.getItem('boardskin') || 'auto', summaryPattern: Number(localStorage.getItem('summaryPattern')) || 3, peraSpot: 0, skill: null, skillsCache: null,
   // per-message send overrides set via slash-commands (reset after each send,
   // except model which is sticky in localStorage). palette = open command list.
   msg: { mode: null, model: null, effort: null, skill: null, later: false, review: false },
@@ -3000,6 +3187,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: 'Dismissed',
 };
 // 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 +3206,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' ? ['DISMISSED', '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 +3510,17 @@ 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);
+  // The goal's short ticket NAME wins everywhere it's shown (See-all title, Review-list
+  // rail, board, sibling list) so the title reads the same in every place and never
+  // repeats the full request (Masa 2026-07-21, spec §4). Real goals have no
+  // reviewSummary.title, so they fall back to the request text unchanged (no regression).
+  return String(g?.reviewSummary?.title || 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 +4150,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 +4196,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,14 +4523,22 @@ 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: '' }) });
+      let r; for (const id of b.dataset.qdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/reject`), { method: 'POST' });
       qrefresh(r, 'Dismiss failed.'); };
   }
   // Archive: retire an unfinished goal cleanly (no rework spawned). The escape
@@ -5069,7 +5287,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 +5389,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 +5447,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('Dismiss 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 +5642,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('Dismiss 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 +5702,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 +5746,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 +5755,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 +6271,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,11 +6338,18 @@ 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: '' }) });
+    // 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('Dismiss failed.'); };
 }
 // Shared To Do bucketing (list rows AND the kanban board read the same groups —
@@ -6070,13 +6369,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 +6477,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"'}>Dismissed<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 +6491,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 +6823,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 +7080,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 +7443,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 +7519,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 +7682,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);
@@ -7713,16 +8094,46 @@ function saRows(){
       goalText: String(g?.text ?? '').replace(/\s+/g, ' ').trim(),
       did, siblings, risk: g?.risk ?? null,
       note: g?.retest?.passed ? g.retest.note : null,
-      pr: r.pr, testResult: r.testResult,
+      pr: r.pr,
+      // Explicit review-summary display fields (spec §11: the card's shape follows the
+      // task). A goal's reviewSummary may carry them directly (e.g. a conversational task
+      // that reports an Answer + its Activity, or a ticket whose test count / diff totals
+      // are recorded rather than re-derived); each falls back to the computed value.
+      testResult: (typeof (g?.reviewSummary?.tests) === 'string')
+        ? { ran: true, ok: true, passed: parseInt(g.reviewSummary.tests, 10) || 0, failed: 0, label: g.reviewSummary.tests }
+        : r.testResult,
+      answer: g?.reviewSummary?.answer ?? null,
+      activity: Array.isArray(g?.reviewSummary?.activity) ? g.reviewSummary.activity : null,
+      discussion: Array.isArray(g?.reviewSummary?.discussion) ? g.reviewSummary.discussion : null,
+      changedDesc: g?.reviewSummary?.changed ?? null,
+      metaFiles: Array.isArray(g?.reviewSummary?.files) ? g.reviewSummary.files : null,
+      metaAdd: g?.reviewSummary?.a ?? null, metaDel: g?.reviewSummary?.d ?? null,
+      ghRows: Array.isArray(g?.reviewSummary?.ghdiff) ? g.reviewSummary.ghdiff : null,
+      diffTotal: g?.reviewSummary?.diffTotal ?? null,
       proofTaskId: pt?.id ?? null, proofImg: pt?.proof?.png ?? pt?.proof?.gif ?? null,
       // Ledger before/after (docs/design/HANDOFF-review-card-evidence-first-2026-07-18.md
       // §3 kind==='image'): most tasks never have a "before" capture, so this is almost
       // always null and beforeAfterMediaHtml() falls back to the single-shot view.
       proofBefore: pt?.proof?.beforePng ?? pt?.proof?.beforeGif ?? null,
+      // Recording (spec §5/§6): a proof task may carry a screen recording (proof.mp4)
+      // or just a recording:true flag; the goal's reviewSummary can also name one.
+      // Drives the neutral "Verify recording ↗" meta chip + the Proof video player.
+      // "ないものは載せない": almost all real tasks have none, so both stay hidden.
+      recording: Boolean(pt?.proof?.mp4 || pt?.proof?.recording || g?.reviewSummary?.recording),
+      recordingUrl: pt?.proof?.mp4 ? withKey(`/proof/${pt.id}/${pt.proof.mp4}`) : (typeof g?.reviewSummary?.recording === 'string' ? g.reviewSummary.recording : null),
+      // Local URL (spec §5): a running localhost the reviewer can open ("Local localhost:4809 ↗").
+      // Falls back to the existing "Local run ↗" (runlocal) button when absent.
+      localUrl: g?.reviewSummary?.localUrl ?? null,
+      // Client-side diff fallback: the git-backed /diff endpoint is null for seeded/
+      // offline goals, so "What changed" never renders. A unified-diff string stored on
+      // the goal (or any of its tasks) lets saGhDiffHtml render locally with no server.
+      diffStr: g?.diff ?? (ts.filter((t) => r.goalIds.includes(t.goalId)).map((t) => t.diff).find(Boolean)) ?? null,
       // Token-frugality is the product's whole pitch — surface it here too, not
       // just in the per-goal review modal. buildReviewSummary computes the same
       // estimate; reuse its logic directly off the goal's runUsage/runTokens.
-      tokenOpt: estimateTokenOptimizationLocal({
+      tokenOpt: (typeof g?.reviewSummary?.token === 'number')
+        ? { percent: g.reviewSummary.token, basis: 'cache', techniques: ['prompt caching', '/compact'] }
+        : estimateTokenOptimizationLocal({
         usage: g?.runUsage, weightedTokens: g?.runTokens, cacheReadWeight: g?.runTokenWeight,
         sessionMode: g?.executionPlan?.sessionMode,
         usedHandoff: g?.executionPlan?.sessionMode === 'cold-handoff' || Boolean(g?.contextHandoff),
@@ -7808,8 +8219,82 @@ function saEvidenceHtml(kind, factRow, img, filePaths, diffText, gtr, it){
   // kind === 'image' (default)
   return `<div class="lg-ev"><div class="lg-evhd">Evidence</div><div class="row">${factRow}</div>${img}</div>`;
 }
+// Unified-diff → GitHub two-gutter model (REVIEW-CARD-SPEC §7 "GitHub diff = Bright"):
+// walk the @@ hunk headers to recover the old/new line numbers, emit one row per line
+// {o:oldNo|null, n:newNo|null, t:'add'|'del'|'ctx', c:text}. Word-level highlight is
+// NOT fabricated from a raw diff (the product never invents evidence) — the Bright
+// line+gutter tint carries the change and .gh-hi simply stays absent. Pure, so it is
+// extracted and unit-tested in engine/test/review-card-diff.test.mjs.
+function saUnifiedToGh(diff, max){
+  const cap = max || 80; const out = []; let o = 0, n = 0;
+  for (const raw of String(diff || '').split('\n')) {
+    if (raw === '') continue; // split artifact / blank input — a real blank ctx line is a single space
+    if (/^(diff --git|index |--- |\+\+\+ |new file|deleted file|old mode|new mode|similarity|rename |Binary )/.test(raw)) continue;
+    const m = raw.match(/^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
+    if (m) { o = +m[1]; n = +m[2]; continue; }
+    if (raw.startsWith('\\')) continue; // ""
+    if (raw.startsWith('+')) out.push({ o: null, n: n++, t: 'add', c: raw.slice(1) });
+    else if (raw.startsWith('-')) out.push({ o: o++, n: null, t: 'del', c: raw.slice(1) });
+    else out.push({ o: o++, n: n++, t: 'ctx', c: raw.replace(/^ /, '') });
+    if (out.length >= cap) break;
+  }
+  return out;
+}
+function saGhDiffHtml(diff){
+  const rows = saUnifiedToGh(diff);
+  if (!rows.length) return '';
+  return saGhDiffRowsHtml(rows);
+}
+// One Activity transcript row (spec §3): You / tool (mono, bold name) / res (green) /
+// Claude. Mirrors the flagship artifact's tx mapping so the pulldown pixel-matches.
+function saTxRowHtml(e){
+  if (e[0] === 'tool') return `<div class="txr tool"><span class="w">tool</span><span class="m"><b>${esc(e[1])}</b> ${esc(e[2] || '')}</span></div>`;
+  if (e[0] === 'res') return `<div class="txr res"><span class="w"></span><span class="m">${esc(String(e[1]).replace(/^✗ /, '').replace(/^✓ /, ''))}</span></div>`;
+  if (e[0] === 'user') return `<div class="txr you"><span class="w">You</span><span class="m">${esc(e[1])}</span></div>`;
+  return `<div class="txr cl"><span class="w">Claude</span><span class="m">${esc(e[1])}</span></div>`;
+}
+// Structured GitHub diff (REVIEW-CARD-SPEC §7): renders {o,n,t,c,h} rows with a
+// word-level highlight (h) and, for a huge change, a "…+N 行 · GitHub で開く ↗"
+// footer (only linking to GitHub when a PR exists). Mirrors the flagship artifact's
+// ghDiffHtml so the app pixel-matches. `more` = extra unshown line count; `pr` = url.
+function saGhDiffRowsHtml(rows, more, pr){
+  if (!rows || !rows.length) return '';
+  const body = '<div class="rdiff2">' + rows.map((l) => {
+    const cls = l.t === 'add' ? 'gh-add' : l.t === 'del' ? 'gh-del' : 'gh-ctx';
+    const mk = l.t === 'add' ? '+' : l.t === 'del' ? '−' : '';
+    let code = esc(l.c);
+    if (l.h) { const h = esc(l.h); code = code.replace(h, `<span class="gh-hi">${h}</span>`); }
+    return `<div class="ghl ${cls}"><span class="gho">${l.o ?? ''}</span><span class="ghn">${l.n ?? ''}</span><span class="ghm">${mk}</span><span class="ghc">${code}</span></div>`;
+  }).join('') + '</div>';
+  const foot = more ? `<div class="ghfoot"><span>…+${more} 行</span>${pr ? ` · <a class="ghopen" href="${esc(pr)}" target="_blank" rel="noopener">GitHub で開く ↗</a>` : ''}</div>` : '';
+  return body + foot;
+}
+// Screen-recording player for Proof (REVIEW-CARD-SPEC §6). A real file (recordingUrl)
+// renders a native <video controls>; otherwise a self-contained SVG player mockup
+// (faint app frame · centred play · scrub bar) matching the artifact's videoFig, with
+// a "▸ Watch recording · 0:12" caption. Purely presentational — no fabricated evidence
+// (only rendered when a recording actually exists on the task/goal).
+function saVideoFigHtml(url){
+  if (url) return `<figure class="rvid"><video class="proofvid" src="${esc(url)}" controls preload="metadata"></video><figcaption>▸ Watch recording</figcaption></figure>`;
+  const P = 'var(--panel)', H = 'var(--hair)';
+  const svg = `<svg viewBox="0 0 560 315" preserveAspectRatio="xMidYMid meet"><rect width="560" height="315" fill="${P}"/>`
+    + `<rect x="24" y="20" width="120" height="10" rx="3" fill="${H}"/><rect x="24" y="44" width="220" height="8" rx="3" fill="${H}"/><rect x="24" y="64" width="180" height="8" rx="3" fill="${H}"/>`
+    + `<circle cx="280" cy="165" r="34" fill="rgba(0,0,0,.35)"/><path d="M270 150 l24 15 l-24 15 z" fill="#fff"/>`
+    + `<rect x="24" y="286" width="512" height="4" rx="2" fill="${H}"/><rect x="24" y="286" width="150" height="4" rx="2" fill="#4fd79c"/><circle cx="174" cy="288" r="6" fill="#4fd79c"/></svg>`;
+  return `<figure class="rvid">${svg}<figcaption>▸ Watch recording · 0:12</figcaption></figure>`;
+}
+// Workflow (REVIEW-CARD-SPEC §8): vertical ✓ / → / □ built ONLY from real signals on
+// this goal — each ✓ reflects something that actually happened (implemented, tested,
+// proof captured); the card's own "In review" is the → here; merge/deploy are ahead.
+// No fabricated pipeline: an untested goal shows □ Tested, not a green ✓.
+function saWorkflowHtml(it){
+  const ran = Boolean(it.testResult?.ran);
+  const hasProof = Boolean(it.proofImg && it.proofTaskId != null);
+  const steps = [['Implemented', 'ok'], ['Tested', ran ? 'ok' : 'todo'], ['Proof captured', hasProof ? 'ok' : 'todo'], ['In review', 'now'], ['Merge', 'todo'], ['Deploy', 'todo']];
+  return '<div class="rwf">' + steps.map(([s, st]) => `<div class="wf-s ${st}"><span class="mk">${st === 'ok' ? '✓' : st === 'now' ? '→' : '□'}</span>${s}</div>`).join('') + '</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', '↩', 'Dismissed'], 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).
@@ -7817,70 +8302,162 @@ function saItemHtml(it, i){
     return `<div class="sa-done ${done[0]}"><span class="mk">${done[1]}</span>${done[2]} · <span style="color:var(--ink3)">${esc(it.title.slice(0, 44))}</span>${undo}</div>`;
   }
   const d = SA.diffs[it.goalId];
-  // Honest evidence chips (mirrors the vchip tested/proof/needs-you logic in
-  // renderReviewChecklist ~L3742-3752): absence of a signal is shown as a muted
-  // chip, never silently dropped — an untested/proofless goal must never LOOK verified.
-  // H23: facts stop looking like buttons — glyph carries the state colour, text
-  // stays plain ink, no border/pill (border is reserved for the PR link).
   const gtr = it.testResult;
-  const testsChip = gtr?.ran
-    ? (gtr.ok ? `<span class="vf ok"><i class="g">✓</i>${gtr.passed} passed</span>` : `<span class="vf no"><i class="g">✗</i>${gtr.passed}/${gtr.passed + (gtr.failed || 0)} passed</span>`)
-    : '<span class="vf none">— not tested</span>';
   const hasProofImg = it.proofImg && it.proofTaskId != null;
-  // Before/after (H23 spec §3 kind==='image'): reuse the same beforeafter/ba-col/
-  // balabel renderer as the older per-task checklist (beforeAfterMediaHtml, ~L3281).
-  // it.proofBefore is null for the ~all tasks with no "before" capture, so this
-  // falls back to the identical single <img class="proofimg"> markup it replaced.
-  // Diff-box + zoom inset (HANDOFF-review-card-diffbox-2026-07-18) is computed async
-  // after the card first paints (saEnhanceDiffBoxes, below saRender). SA.diffBoxHtml
-  // holds the result — a string once a box is found, null once ruled out, undefined
-  // until then — so it survives every later saRender() the same way SA.diffs already
-  // does for the changed-files diff.
+  // Before/after (spec §6): reuse the same beforeafter/ba-col/balabel renderer as the
+  // per-task checklist (beforeAfterMediaHtml). it.proofBefore is null for the ~all
+  // tasks with no "before" capture, so it falls back to the single <img class="proofimg">.
+  // Diff-box + zoom inset is computed async after first paint (saEnhanceDiffBoxes);
+  // SA.diffBoxHtml caches it so the box survives every later saRender().
   const boxedImg = SA.diffBoxHtml[it.goalId];
   const img = hasProofImg
-    ? (typeof boxedImg === 'string' ? boxedImg : beforeAfterMediaHtml(it.proofTaskId, { png: it.proofImg, beforePng: it.proofBefore }, 'proof'))
+    ? (typeof boxedImg === 'string' ? boxedImg : beforeAfterMediaHtml(it.proofTaskId, { png: it.proofImg, beforePng: it.proofBefore }, esc(it.title ?? '')))
     : '';
-  // Changed-file paths feed both the evidence-kind heuristic and the docs-kind diff —
-  // same source the old "Changed files & diff" fold used (d from the diff endpoint,
-  // falling back to task.changedFiles when the server has no diff for this goal).
+  // Changed-file paths: d from the diff endpoint ({add,del,files:[{path,add,del}],diff}),
+  // falling back to task.changedFiles when the server has no diff for this goal.
+  // A usable git diff has actual files; the endpoint returns an empty {add:0,del:0,
+  // files:[],diff:''} object for goals with no committed range (seeded/uncommitted),
+  // which must NOT shadow the client-side fallback below.
+  const hasGitDiff = Boolean(d && d.diff);
   let filePaths = [], nf = 0;
-  if (d) { filePaths = d.files.map((f) => f.path); nf = filePaths.length; }
-  else if (d === null) {
+  if (d && d.files.length) { filePaths = d.files.map((f) => f.path); nf = filePaths.length; }
+  else {
+    // no usable git diff: fall back to the tasks' own changedFiles so Files / What
+    // changed still populate for seeded/offline goals.
     filePaths = [...new Set((state.tasks || []).filter((t) => it.ids.includes(t.goalId)).flatMap((t) => t.changedFiles ?? []))];
     nf = filePaths.length;
   }
+  // Client-side unified diff (spec §4 fallback): render "What changed" locally when the
+  // server has no usable git diff. Line totals feed the Files chip's +add / −del.
+  const clientDiff = (!hasGitDiff && it.diffStr) ? it.diffStr : null;
+  let cAdd = 0, cDel = 0;
+  if (clientDiff) for (const l of saUnifiedToGh(clientDiff, 2000)) { if (l.t === 'add') cAdd++; else if (l.t === 'del') cDel++; }
+  // Recorded display fields (spec §11: card shape follows the task). A goal's reviewSummary
+  // may carry an explicit file list; prefer it (real git-backed goals keep the computed
+  // filePaths above). Split the "path  +N −M" string down to the bare path for kind/log.
+  if (it.metaFiles) { filePaths = it.metaFiles.map((f) => String(f).split(/\s{2,}/)[0]); nf = it.metaFiles.length; }
   const kind = saEvidenceKind(filePaths, hasProofImg, gtr);
-  const factRow = [
-    testsChip,
-    it.note ? `<span class="vf ok"><i class="g">✓</i>${esc(it.note)}</span>` : '',
-    `<span class="fls">${nf} file${nf === 1 ? '' : 's'}</span>`,
-    hasProofImg ? '' : '<span class="vf none">— no proof</span>',
-  ].filter(Boolean).join('');
   const gk = it.goalId;
-  // "What to look at" (H23 §2): the changed files themselves — a real, non-fabricated
-  // pointer for the reviewer's eyes, same file list that used to live in the retired
-  // "Changed files & diff" fold.
-  const look = filePaths.slice(0, 8);
-  if (filePaths.length > 8) look.push(`+${filePaths.length - 8} more`);
-  const contextHtml = saContextHtml({ goalText: it.goalText, siblings: it.siblings, did: it.did, look }, gk);
-  const evidenceHtml = saEvidenceHtml(kind, factRow, img, filePaths, d?.diff ?? null, gtr, it);
-  // shouldPause = classifyChangeRisk (engine/lib.mjs) already forced this goal to
-  // stop in review for exactly this reason — surface it; a non-blocking low-risk
-  // read isn't worth a permanent row on every card (goal 427 §4 already covers it
-  // in the per-goal modal), so the Ledger only speaks up when it actually matters.
+  const rs = it.goal?.reviewSummary || {};
+  // Conversational task (no code change): drops Proof + What changed, shows an Answer
+  // instead (spec §11); its Activity IS the conversation.
+  const isConv = Boolean(it.answer);
+  // ── meta (spec §5) — fully data-driven / hide-empty: each chip renders only when its
+  // data exists (no PR → no PR chip · no tests → no Tests · no file totals → no Files ·
+  // no recording → no Verify). PR = bold green, no underline (a real <a href>). ──
+  const arw = '<span class="ar">↗</span>';
+  const prNum = it.pr ? (it.pr.match(/pull\/(\d+)/) ?? [, ''])[1] : '';
+  const tokPct = it.tokenOpt ? Number(it.tokenOpt.percent) : 0;
+  const testsLabel = gtr?.ran ? (gtr.label || (gtr.ok ? `${gtr.passed} passed` : `${gtr.passed}/${gtr.passed + (gtr.failed || 0)} passed`)) : '';
+  // Files totals: recorded strings (metaAdd/metaDel, already signed) win, else git/client.
+  const fAdd = it.metaAdd ?? (hasGitDiff ? `+${d.add}` : clientDiff ? `+${cAdd}` : null);
+  const fDel = it.metaDel ?? (hasGitDiff ? `−${d.del}` : clientDiff ? `−${cDel}` : null);
+  const chips = [];
+  if (it.pr) chips.push(`<a class="mx mlink pr" href="${esc(it.pr)}" target="_blank" rel="noopener" title="Open pull request"><span class="mk">PR</span> <b>#${esc(prNum)}</b> <span class="mmut">Open</span>${arw}</a>`);
+  if (it.tokenOpt && tokPct > 0) chips.push(`<button type="button" class="mx mtok" data-saact="tok:${i}"><span class="mk">Token</span> <b>${tokPct}%</b> <span class="mmut">saved</span> <i class="tokchevron">›</i></button>`);
+  if (testsLabel) chips.push(`<span class="mx"><span class="mk">Tests</span> <b class="ok">${esc(testsLabel)}</b></span>`);
+  // Files: hide-empty — only with changed files AND totals (a bare-count chip reads odd).
+  if (nf && fAdd) chips.push(`<span class="mx"><span class="mk">Files</span> <b>${nf}</b> <span class="mmut">· <i class="a">${esc(fAdd)}</i> <i class="d">${esc(fDel)}</i></span></span>`);
+  // Local: an open localhost URL (neutral, not green). A bare host:port isn't navigable in
+  // the demo, so it renders as a non-navigating chip; a real URL opens in a new tab.
+  if (it.localUrl) { const lu = String(it.localUrl); const isUrl = /^https?:/.test(lu);
+    chips.push(`<a class="mx mlink"${isUrl ? ` href="${esc(lu)}" target="_blank" rel="noopener"` : ' style="cursor:pointer"'} title="Open the running app"><span class="mk">Local</span> <b>${esc(lu.replace(/^https?:\/\//, ''))}</b>${arw}</a>`); }
+  else if (gtr?.ran) chips.push(`<button type="button" class="mx mlink" data-saact="runlocal:${i}" title="Run this locally"><span class="mk">Local</span> <b>run</b>${arw}</button>`);
+  // Verify = a screen recording of the check (spec §5): NEUTRAL. Opens the file when there
+  // is a real URL, otherwise scrolls to the in-card player.
+  if (it.recording) chips.push(it.recordingUrl
+    ? `<a class="mx mlink" href="${esc(it.recordingUrl)}" target="_blank" rel="noopener" title="Watch the recording"><span class="mk">Verify</span> <b>recording</b>${arw}</a>`
+    : `<a class="mx mlink" data-saact="rec:${i}" style="cursor:pointer" title="Watch the recording"><span class="mk">Verify</span> <b>recording</b>${arw}</a>`);
+  const tokCmp = it.tokenOpt?.basis === 'baseline' ? 'vs your recent average' : 'from prompt caching';
+  const tokTech = (it.tokenOpt?.techniques ?? []).slice(0, 4).join(' / ');
+  const metaDetail = (it.tokenOpt && tokPct > 0) ? `<div class="rmeta-detail" id="tokdetail${i}"><span class="k">How this run used tokens</span><span class="v">${esc(tokCmp)}${tokTech ? ` · ${esc(tokTech)}` : ''}</span></div>` : '';
+  const runNote = gtr?.ran ? `<div class="rmeta-detail" id="runlocal${i}"><span class="v">No local run command is wired for this task yet.</span></div>` : '';
+  const meta = `<div class="rmeta">${chips.join('')}</div>${metaDetail}${runNote}`;
+  // ── Request (spec §4): a PLAIN section — the user's own short words (goal.text). Never
+  // an accordion, never the implementation spec (that lives in Activity below). ──
+  const reqSec = it.goalText
+    ? `<section class="rsec rreq"><div class="rsec-h">Request</div><p class="rbody rask">${esc(it.goalText)}</p></section>`
+    : '';
+  // ── What to check (spec §2.5): a bulleted list when several, a line when one. ──
+  // Only an explicit review-summary check renders here — never the goal text echoed back
+  // (it.check falls back to goal.text via checkLine, which would fabricate a "What to
+  // check" for a conversational task that has none). §0.5 no placeholder.
+  const checkArr = Array.isArray(rs.checkList) ? rs.checkList.filter(Boolean)
+    : Array.isArray(rs.check) ? rs.check.filter(Boolean)
+    : (typeof rs.check === 'string' && rs.check.trim() ? [rs.check.trim()] : []);
+  const checkBody = checkArr.length > 1
+    ? `<ul class="rcheck">${checkArr.map((c) => `<li>${esc(c)}</li>`).join('')}</ul>`
+    : (checkArr.length ? `<p class="rbody rcheck1">${esc(checkArr[0])}</p>` : '');
+  // ── Proof (spec §6/§11): before/after (identical size) when a real image exists; a
+  // run-log for logic-only tests; dropped entirely for a conversational task. ──
+  let proofInner = '';
+  if (!isConv) {
+    if (hasProofImg) proofInner = `<div class="rproof">${img}</div>`;
+    else if (kind === 'logic' && gtr?.ran) proofInner = `<div class="rrun"><div class="rr"><span class="lab">Tests</span><span class="v">${esc(testsLabel)}</span></div>${filePaths.length ? `<div class="rr"><span class="lab">Files</span><span class="v">${esc(filePaths.join(', '))}</span></div>` : ''}</div>`;
+    if (it.recording) proofInner += saVideoFigHtml(it.recordingUrl);
+  }
+  // ── What changed (spec §4/§7): description + files summary (always) + the diff, which
+  // peeks then "…+N 行 · GitHub で開く ↗" for a huge change (no GitHub link when there's no
+  // PR). Structured recorded rows (ghRows) win over a git/client unified diff. Dropped
+  // entirely for a conversational task. ──
+  const changedDescHtml = (it.changedDesc || rs.changed) ? `<p class="rbody rdesc">${esc(String(it.changedDesc || rs.changed).slice(0, 600))}</p>` : '';
+  const filesListHtml = it.metaFiles
+    ? `<div class="rfiles">${it.metaFiles.map((f) => esc(f)).join('<br>')}</div>`
+    : (d && d.files.length) ? `<div class="rfiles">${d.files.map((f) => `${esc(f.path)}  <i class="a">+${f.add}</i> <i class="d">−${f.del}</i>`).join('<br>')}</div>`
+      : (clientDiff && filePaths.length) ? `<div class="rfiles">${filePaths.map((p) => esc(p)).join('<br>')}</div>` : '';
+  const diffHtml = it.ghRows
+    ? saGhDiffRowsHtml(it.ghRows, it.diffTotal || 0, it.pr || '')
+    : hasGitDiff ? saGhDiffHtml(d.diff) : clientDiff ? saGhDiffHtml(clientDiff) : '';
+  const changedBody = isConv ? '' : (changedDescHtml + filesListHtml + diffHtml);
+  // ── sensitive-area note (real: classifyChangeRisk forced the pause) ──
   const risk = it.risk;
   const riskHtml = risk?.shouldPause
     ? `<div class="lg-risk"><svg viewBox="0 0 24 24"><path d="M12 8v5M12 16.5v.5"/><path d="M10.3 3.9 2.4 18a1.9 1.9 0 0 0 1.7 2.9h15.8a1.9 1.9 0 0 0 1.7-2.9L13.7 3.9a1.9 1.9 0 0 0-3.4 0z"/></svg>Needs your review — touches a sensitive area${risk.categories?.length ? `: ${esc(risk.categories.map((c) => c.label).join(', '))}` : ''}</div>`
     : '';
-  return `<div class="sa-item lg${it.goalId === SA.cur ? ' cur' : ''}" data-gid="${it.goalId}">
-    <div class="lg-hd"><span class="no">${it.no != null ? `#${it.no}` : ''}</span><span class="t">${esc(it.title)}</span><span class="lg-state review">Review</span></div>
-    ${saMetaRowHtml(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}
+  // ── Activity (spec §3): ONE Linear-docs pulldown. The "Activity" heading is plain; the
+  // chevron sits on the FIRST line (the opening "You …" row); tapping it opens the rest
+  // below, offset-indented. The review Discussion folds in at the bottom of the body. The
+  // transcript is the recorded build (activity); real goals fall back to "what we did".
+  // Persisted open-state via data-detkey so SSE re-renders don't collapse it. ──
+  const txArr = (it.activity && it.activity.length)
+    ? it.activity.map((e) => saTxRowHtml(e))
+    : (it.did?.length ? it.did.map((s) => saTxRowHtml(['claude', s])) : []);
+  const discArr = it.discussion || it.thread || null;
+  const threadHtml = (discArr && discArr.length)
+    ? discArr.map((m) => `<div class="rmsg${m[0] === 'you' ? ' you' : ''}"><div class="who">${m[0] === 'you' ? 'You' : 'Manager'}</div><div class="msg">${esc(m[1])}</div></div>`).join('')
+    : '';
+  const actOpen = SA.detOpen.has(`${gk}:act`) ? ' open' : '';
+  const txFirst = txArr[0] || '<div class="txr"><span class="w"></span><span class="m">Activity</span></div>';
+  const txRest = txArr.slice(1).join('');
+  const discInner = threadHtml ? `<div class="rsub">Discussion</div><div class="rthread">${threadHtml}</div>` : '';
+  const activitySec = (txArr.length || threadHtml)
+    ? `<section class="rsec ract"><div class="rsec-h">Activity</div><details class="lacc" data-detkey="${gk}:act"${actOpen}><summary><i class="ltog">›</i><div class="rtx lfirst">${txFirst}</div></summary><div class="lbody">${txRest ? `<div class="rtx">${txRest}</div>` : ''}${discInner}</div></details></section>`
+    : '';
+  const S = (label, body) => body ? `<section class="rsec"><div class="rsec-h">${label}</div>${body}</section>` : '';
+  return `<div class="sa-item lg redesign${it.goalId === SA.cur ? ' cur' : ''}" data-gid="${it.goalId}">
+    <div class="rhead"><span class="rtag">${it.no != null ? `#${it.no}` : ''}</span><span class="rst"><span class="rdot"></span>In review</span></div>
+    <h2 class="rtitle">${esc(it.title)}</h2>
+    ${meta}
+    ${reqSec}
+    ${S('What to check', checkBody)}
+    ${S('Answer', it.answer ? `<p class="rbody">${esc(it.answer)}</p>` : '')}
+    ${S('Proof', proofInner)}
+    ${S('What changed', changedBody)}
+    ${S('Not done', it.risk?.summary ? `<p class="rbody rrisk">${esc(it.risk.summary)}</p>` : '')}
     ${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>
+    ${activitySec}
+    ${S('Workflow', saWorkflowHtml(it))}
+    <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="Reply, ask, or send back to the AI…"><button class="sa-send" data-saact="send:${i}" title="Send"><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>`;
 }
+// Scroll the See-all body so a card's top edge (.rhead) sits at the top of the visible
+// scroll area — the reviewer always starts reading a card from its header, never partway
+// down (Masa 2026-07-20). Uses a rect delta so it works regardless of offsetParent.
+function saScrollCardToTop(el){
+  const body = document.querySelector('#seeall .sa-body');
+  if (!body || !el) return;
+  body.scrollTop += el.getBoundingClientRect().top - body.getBoundingClientRect().top;
+}
 function saRender(){
   const S = $('seeall'); if (!S) return;
   const pending = SA.items.filter((x) => x.st === 0);
@@ -7894,22 +8471,32 @@ function saRender(){
   // 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)
   // and wire each one's toggle to keep that set current.
-  for (const det of S.querySelectorAll('.lg-goal[data-detkey]')) {
+  for (const det of S.querySelectorAll('[data-detkey]')) {
     det.addEventListener('toggle', () => {
       const k = det.dataset.detkey;
       if (det.open) SA.detOpen.add(k); else SA.detOpen.delete(k);
     });
   }
-  // H14: if a single-review focus is pending, center its card and flash a blue
-  // ring. Re-scroll on EVERY render for the focus window — the post-diff saSync
-  // rebuild resets .sa-body scroll to the top, so a one-shot scroll would land
-  // back at the top. Self-clears after ~1.4s (outlasts the localhost diff fetch)
-  // so live SSE ticks stop yanking the view.
+  // "ないものは載せない" (Masa): a Proof <img> whose file is missing/broken must never
+  // show a broken-image placeholder. proofImg is only a stored filename, so a file that
+  // isn't on disk (or fails to load) can only be caught at load time — drop the whole
+  // Proof section if any of its images fails. Real captures load and stay.
+  for (const im of S.querySelectorAll('.redesign .rproof img')) {
+    const drop = () => { const sec = im.closest('section.rsec'); if (sec) sec.remove(); };
+    if (im.complete && im.naturalWidth === 0) drop();
+    else im.addEventListener('error', drop, { once: true });
+  }
+  // H14: if a single-review focus is pending, bring the card's HEADER (#tag + In review
+  // + title) to the very top of the scroll area — never mid-card (Masa 2026-07-20) — and
+  // flash a blue ring. Re-scroll on EVERY render for the focus window — the post-diff
+  // saSync rebuild resets .sa-body scroll to the top, so a one-shot scroll would land back
+  // there. Self-clears after ~1.4s (outlasts the localhost diff fetch) so live SSE ticks
+  // stop yanking the view.
   if (SA.focusGid != null) {
     requestAnimationFrame(() => {
       const el = S.querySelector(`.sa-item[data-gid="${SA.focusGid}"]`);
       if (!el) return;
-      el.scrollIntoView({ block: 'center', behavior: 'auto' });
+      saScrollCardToTop(el);
       el.classList.add('sa-flash');
       if (!SA.focusTimer) SA.focusTimer = setTimeout(() => { SA.focusGid = null; SA.focusTimer = null; }, 1400);
     });
@@ -7980,6 +8567,14 @@ function saOpen(focusGoalId){
   }
   saRender();
   $('seeall').classList.add('open');
+  // Land the opening card's header at the very top of the scroll area (Masa 2026-07-20).
+  // With focusGid set, saRender's focus block already does this; without it (a plain
+  // "See all"), resolved one-liners can sit above the first pending card, so scrollTop 0
+  // isn't enough — scroll the current card's header to the top explicitly.
+  if (SA.focusGid == null && SA.cur != null) requestAnimationFrame(() => {
+    const el = $('seeall').querySelector(`.sa-item[data-gid="${SA.cur}"]`);
+    if (el) saScrollCardToTop(el);
+  });
   saFetchDiffs();
   saEnhanceDiffBoxes();
 }
@@ -8031,7 +8626,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]');
@@ -8044,9 +8639,17 @@ $('seeall').addEventListener('click', async (e) => {
   // Run-locally to reveal the honest "not wired yet" note — neither performs an action.
   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; }
+  // Verify chip (no external recording URL) → scroll the in-card video player into view.
+  if (k === 'rec') { $('seeall').querySelector(`.sa-item[data-gid="${it.goalId}"] .rvid`)?.scrollIntoView({ behavior: 'smooth', block: 'center' }); 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 +8693,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 +9011,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 +9023,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 +9763,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'