@galda/cli 0.10.68 → 0.10.70

package/app/index.html

@@ -297,9 +297,8 @@
   .ctxseg svg{width:13px;height:13px;flex:0 0 13px;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}
   .ctxseg b{font-weight:600;font-size:11.5px;color:var(--ink);overflow:hidden;text-overflow:ellipsis;max-width:300px}
   .ctxdiv{width:1px;align-self:stretch;margin:5px 0;background:var(--hair);flex:0 0 1px}
-  /* worktree — Masa 2026-07-23: 「claude code は ✓ が外れるだけなのでそれでいきたい。機能も
-     claude code と同じにしたい」。OFF just loses its tick and sinks; no amber, no note, no
-     dialog. ON is --ink, never --green: in this product green means "it passed" (PR green,
+  /* workspace mode — isolated worktree is the default; direct workspace is explicit.
+     ON is --ink, never --green: in this product green means "it passed" (PR green,
      tests green, Token green), and a settings checkbox borrowing it makes that green cheap.
      The tick is knocked out in --panel (the surface it sits on), NOT --invink. */
   .ctxwt{font-size:11.5px;color:var(--ink2)}
@@ -309,6 +308,9 @@
   .ctxwt[aria-checked="true"] .ctxbox{background:var(--ink);border-color:var(--ink)}
   .ctxwt[aria-checked="true"] .ctxbox::after{content:"";position:absolute;left:3px;top:0;width:3px;height:7px;
     border:solid var(--panel);border-width:0 1.6px 1.6px 0;transform:rotate(42deg)}
+  .ctxworkwarn{display:flex;align-items:center;gap:6px;margin:-3px 2px 6px;color:var(--amber);
+    font:500 11.5px/1.35 var(--ui)}
+  .ctxworkwarn[hidden]{display:none}
   .ctxmenu{min-width:230px;max-width:420px}
   /* The folder list is galda's own screen (Claude has none — it opens ONE folder; galda
      moves between repos). The one thing that actually goes wrong is that names alone look
@@ -568,6 +570,8 @@
   .blockreason{color:var(--amber)}
   .rvcheck2{font-size:15px;font-weight:600;color:var(--ink);line-height:1.5;margin-bottom:4px}
   .rvchanged{font-size:12.5px;color:var(--ink2);line-height:1.5;margin-bottom:6px}
+  .rvinfra{font-size:12.5px;color:var(--ink2);line-height:1.5;margin:8px 0 6px;padding:8px 10px;border:1px solid rgba(var(--amber-rgb),.35);border-radius:8px;background:rgba(var(--amber-rgb),.06)}
+  .rvinfra .retrybtn{margin-left:8px}
   .rvtokenopt{font-family:var(--mono);font-size:10.5px;font-weight:700;color:var(--green);line-height:1.45;margin:2px 0 7px}
   .rvlbl{display:inline-block;font-family:var(--mono);font-size:9px;letter-spacing:.06em;color:var(--ink3);background:var(--hair2);border-radius:4px;padding:1px 6px;margin-right:7px;vertical-align:1px}
   /* goal 427 §4: change-risk section on the review card. §5.5/§1.5-8: an
@@ -721,9 +725,19 @@
   .review-fly .name.flystrike{text-decoration:line-through;text-decoration-color:var(--green);
     opacity:.7;transition:opacity .25s ease}
 
-  /* task 121: Approve確定の瞬間に一度だけ弾ける紙吹雪。位置/色/回転はJSで都度
-     ランダムに設定するので、ここは土台だけ。 */
+  /* Approve celebration: bright Figma-like confetti plus a short, explicit
+     completion state inside the Review dialog before it closes. */
   .confetti-piece{position:fixed;pointer-events:none;z-index:9999;will-change:transform,opacity}
+  .sa-finish{position:fixed;z-index:10000;display:grid;place-items:center;pointer-events:none;overflow:hidden;border-radius:16px;
+    background:color-mix(in srgb,var(--canvas) 20%,transparent);backdrop-filter:blur(2px);animation:saFinishFade .9s ease both}
+  .sa-finish-mark{width:104px;height:104px;border-radius:50%;display:grid;place-items:center;background:#18c77a;
+    box-shadow:0 18px 52px rgba(24,199,122,.34);animation:saFinishPop .72s cubic-bezier(.2,1.35,.35,1) both}
+  .sa-finish-mark svg{width:56px;height:56px;fill:none;stroke:#fff;stroke-width:3.4;stroke-linecap:round;stroke-linejoin:round}
+  .sa-finish-mark path{stroke-dasharray:70;stroke-dashoffset:70;animation:saFinishDraw .42s ease .18s forwards}
+  @keyframes saFinishPop{0%{transform:scale(.45);opacity:0}62%{transform:scale(1.1);opacity:1}100%{transform:scale(1)}}
+  @keyframes saFinishDraw{to{stroke-dashoffset:0}}
+  @keyframes saFinishFade{0%,72%{opacity:1}100%{opacity:0}}
+  @media (prefers-reduced-motion:reduce){.sa-finish,.sa-finish-mark,.sa-finish-mark path{animation:none}.sa-finish{background:transparent}}
 
   /* connect modal */
   /* A confirm dialog (deleteConfirmOverlay etc.) must always sit above other
@@ -1758,10 +1772,9 @@
   /* ---- + New (CDO decision 5, Masa 2026-07-17): a quiet add-row where + sits in the ● column
      and New in the text column — aligned to the row's own grid, not a box shoved right. The
      shared .paplus glyph is 13px (the same span as the ● dot), with the stroke re-centred inside
-     that box so the GLYPH lines up, not the box (Masa aesthetic: align glyphs, not boxes). Click
-     = focus the composer (#input) — the one real create path, no invented row / server call. On
-     the board it lives ONLY in the To Do column: a new goal is a new to-do; you don't "create"
-     into Done/Review/Doing. ---- */
+     that box so the GLYPH lines up, not the box (Masa aesthetic: align glyphs, not boxes). The
+     bottom List row focuses the composer; the Later row below the Later caption posts pending:true
+     directly so it shelves work without spawning a worker. ---- */
   #fsRoot .paplus{width:13px;height:13px;flex:0 0 13px;position:relative;display:inline-block}
   #fsRoot .paplus::before,#fsRoot .paplus::after{content:"";position:absolute;background:currentColor;border-radius:1px}
   #fsRoot .paplus::before{left:5.85px;top:2px;width:1.3px;height:9px}
@@ -1769,6 +1782,10 @@
   /* list rail add-row — padding-left:8px puts + on the .trow ● (8px pad + 13px ● + 9px gap grid) */
   #fsRoot .qadd{all:unset;box-sizing:border-box;display:flex;align-items:center;gap:9px;width:100%;padding:6px 4px 6px 8px;border-radius:8px;color:var(--ink3);font-size:11.5px;cursor:pointer;opacity:.45;transition:opacity .15s,color .15s}
   #fsRoot .qadd:hover{opacity:1;color:var(--ink)}
+  #fsRoot .lateridle{display:flex;align-items:center;gap:9px;margin:5px 0 2px;padding:9px 10px;border:1px solid var(--hair);border-radius:8px;color:var(--ink2);font-size:10.5px;line-height:1.45}
+  #fsRoot .lateridle .msg{flex:1;min-width:0}
+  #fsRoot .lateridle button{height:26px;padding:0 10px;border:1px solid var(--hair2);border-radius:7px;background:var(--panel);color:var(--ink);font:600 10px/1 var(--mono);cursor:pointer;white-space:nowrap}
+  #fsRoot .lateridle button:hover{border-color:var(--ink3)}
   /* board To Do column add-row — 2px body pad + 10px card pad = 12px lines + up with the card's #NN */
   #fsRoot .fsbadd{margin:5px 2px 0;padding:6px 10px;border-radius:7px;border:0;background:none;color:var(--ink3);font:400 11.5px/1 var(--ui);text-align:left;cursor:pointer;display:flex;align-items:center;gap:9px;opacity:.45;transition:opacity .15s,color .15s}
   #fsRoot .fsbadd:hover{opacity:1;color:var(--ink2)}
@@ -1802,7 +1819,7 @@
   #fsRoot .sm2 .m-bar{height:3px;border-radius:2px;background:var(--hair);margin:8px 0 6px;overflow:hidden}
   #fsRoot .sm2 .m-bar i{display:block;height:100%;background:var(--green)}
   #fsRoot .sm2 .s{font-size:10.5px;color:var(--ink3)}
-  /* Review header + 3 view buttons (rv3 thumbnails default / rv1 list / rv2 compact) */
+  /* Review header. Review cards use one stable, screenshot-free row design. */
   #fsRoot .revhd{display:flex;align-items:baseline;gap:8px;margin-bottom:11px}
   #fsRoot .revhd[hidden]{display:none}
   #fsRoot .revhd .hd{font-size:13.5px;letter-spacing:-.02em}
@@ -1816,28 +1833,30 @@
      it duplicated the sm2 meter directly above. Reviews render as meter + header + cards;
      zero reviews render nothing at all (§1.5-3). */
   #fsRoot .revlist{display:block}
-  /* rcard base (rv1 list) */
-  #fsRoot .rcard{margin-top:9px;border:1px solid var(--hair);border-radius:11px;padding:9px 10px;display:flex;gap:10px;align-items:center;cursor:pointer}
-  #fsRoot .rcard img{width:56px;height:38px;border-radius:6px;object-fit:cover;box-shadow:0 0 0 1px var(--hair);background:var(--thumbbg);flex:0 0 56px}
+  /* Approved B Status dot: borderless, title-only Review rows. Details and proof
+     stay in the Review dialog, where they can be inspected without bloating the board. */
+  #fsRoot .rcard{position:relative;min-height:31px;margin-top:1px;border:0;border-radius:0;padding:5px 4px 5px 15px;display:flex;gap:7px;align-items:center;background:transparent;box-shadow:none;cursor:pointer}
+  #fsRoot .rcard::before{content:"";position:absolute;left:4px;top:50%;width:5px;height:5px;border-radius:50%;background:var(--green);transform:translateY(-50%)}
+  #fsRoot .rcard img{display:none}
   #fsRoot .rcard .rc{flex:1;min-width:0}
-  #fsRoot .rcard .t{font-size:12.5px;font-weight:500;line-height:1.35;color:color-mix(in srgb,var(--ink) 84%,var(--panel))} /* §13.2 soften imageless review heading; rv3 photo-overlay stays #fff (more specific rule below) */
+  #fsRoot .rcard .t{font-size:11.5px;font-weight:500;line-height:1.35;color:color-mix(in srgb,var(--ink) 84%,var(--panel));white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
   #fsRoot .rcard .pr{font-family:var(--mono);font-size:9.5px;color:var(--green);background:rgba(var(--green-rgb),.12);border-radius:5px;padding:2px 7px;font-weight:600;margin-top:3px;display:inline-block;text-decoration:none}
+  #fsRoot .rcard .rstat{font-family:var(--mono);font-size:9.5px;color:var(--ink3);letter-spacing:.04em;text-transform:uppercase;margin-top:3px;display:inline-block}
+  #fsRoot .rcard .rstat.conflict{color:var(--amber)}
+  #fsRoot .rcard .pr,#fsRoot .rcard .rstat,#fsRoot .rcard .rnote{display:none}
+  #fsRoot .rcard.foldrow{border-style:dashed;background:transparent}
+  #fsRoot .rcard.foldrow .rstat{color:var(--ink2)}
   /* review row number — #NN PREFIX on the title (HANDOFF-v45 §11), same form as the To Do
      rows (PRD §5: numbering matches the sidebar) */
   #fsRoot .rcard .rid{font-size:10.5px;font-weight:600;color:var(--ink3);margin:0 5px 0 0;display:inline-block;font-variant-numeric:tabular-nums}
-  /* PRD §6.5 → Masa 2026-07-21: the fold note ("also carries #13" on the carrier card,
-     "merged into #12" on the folded card) no longer renders in the Review list at all —
-     it read as the same report-in-the-list clutter the feature was meant to avoid. Where
-     folded work went is now logged in the opened detail's "Also carries" section only, so
-     the .fnote / .rcard.fold* rules that used to style these list-level notes are gone
-     with them (dead CSS orphaned the moment nothing emits those classes any more). */
+  /* Folded work must stay visible in List view: it is a settled pointer, not a vanished task. */
   /* reference numbers everywhere else (HANDOFF-v45 §11): a leading #NN prefix on every
      To Do item's name — same goal = same number (goalReviewNumber), distinct from the
      PR's own #id shown separately. */
   #fsRoot .trow .gno{font-size:10.5px;font-weight:600;color:var(--ink3);margin-right:5px;flex:0 0 auto;font-variant-numeric:tabular-nums}
   #fsRoot .rcard .act{display:flex;gap:5px;opacity:0;transition:opacity .15s} /* hover-only ✓/✕ (§1.5-10) */
   #fsRoot .rcard:hover .act{opacity:1}
-  #fsRoot .rcard .b{width:24px;height:24px;border-radius:7px;border:1px solid var(--hair2);background:transparent;display:grid;place-items:center;cursor:pointer;color:var(--green);font-size:11px;font:inherit}
+  #fsRoot .rcard .b{width:21px;height:21px;border-radius:7px;border:1px solid var(--hair2);background:transparent;display:grid;place-items:center;cursor:pointer;color:var(--green);font-size:11px;font:inherit}
   #fsRoot .rcard .b.no{color:var(--danger)}
   #fsRoot .rcard .b:hover{background:var(--hover)}
   /* rv2 compact one-line rows */
@@ -2141,6 +2160,9 @@
   /* 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 .rinfra{padding:10px 12px;border:1px solid rgba(var(--amber-rgb),.35);border-radius:8px;background:rgba(var(--amber-rgb),.06)}
+  .redesign .rinfra .rbody{color:var(--ink2)}
+  .redesign .rinfra .retrybtn{margin-top:8px;margin-left:0}
   .redesign .rdesc,.redesign .rrisk{color:var(--ink2)}
   /* Result (P1, Masa 2026-07-21): the AI's own report, rendered as written. Same 14px
      body rhythm as .rbody — it is prose the reviewer reads, not a log. Headings/lists/
@@ -2330,6 +2352,8 @@
   /* Doing-failure state word (HANDOFF-v45 §11): colour TEXT only, no badge/pill surface —
      Failed = red, Interrupted = amber. */
   #fsRoot .trow .stword{font-size:10.5px;font-weight:600;color:var(--danger);flex:0 0 auto}
+  #fsRoot .trow .stword.run{color:var(--green)}
+  #fsRoot .trow .stword.wait{color:var(--ink3)}
   #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)}
@@ -2986,10 +3010,11 @@
               <svg viewBox="0 0 24 24"><path d="M6 3v12M6 15a3 3 0 100 6 3 3 0 000-6zM18 9a3 3 0 100-6 3 3 0 000 6zM18 9v3a4 4 0 01-4 4H8"/></svg><span id="ctxbranchname"></span></span>
             <span class="ctxdiv"></span>
             <button type="button" class="ctxseg ctxwt" id="ctxwt" role="checkbox" aria-checked="true"
-              title="On: each goal works in its own copy, so this folder is never touched. Off: the work happens right here.">
-              <i class="ctxbox"></i>worktree</button>
+              title="isolated worktree: default clean copy. direct workspace: inherits and edits this folder.">
+              <i class="ctxbox"></i><span id="ctxwtlabel">isolated worktree</span></button>
           </div>
         </div>
+        <div class="ctxworkwarn" id="ctxworkwarn" hidden></div>
         <!-- Conversation-first composer (SLICE 2, docs/HANDOFF-ONBOARDING-conversational.md):
              a chat/help/settings message gets a quiet reply HERE instead of
              becoming a To-Do. Reuses the .peraanswer surface; hidden until a
@@ -3081,7 +3106,7 @@
        Structure ported from docs/design/flagship/flagship.html: rail | Implementing | lane.
        The composer (#composerWrap: queue + composer + send/prism ring) is ADOPTED into
        #fsCompwrap by positionLayout() — same nodes, same handlers, input-focus fix intact. -->
-  <div id="fsRoot" data-rv="3">
+  <div id="fsRoot" data-rv="1">
     <div class="fscard fsrail">
       <button class="railtg" id="fsRailTg" title="Fold the rail"></button><!-- panel icon filled by tgUpdate (v45 §4) -->
       <button class="fsprojbtn" id="fsProjBtn" title="Switch project"><span class="pname" id="fsProjBtnName"></span><svg viewBox="0 0 24 24"><path d="M6 9l6 6 6-6"/></svg></button>
@@ -3373,7 +3398,7 @@ const savedTheme = (() => {
   if (v !== s) localStorage.setItem('theme', v);
   return v;
 })();
-const state = { repos: null, repoHome: '', /* GET /api/repos — the folders a project can point at (Context Bar) */ projects: [], goals: [], tasks: [], act: {}, actAt: {}, todos: {}, chatTurns: {}, active: localStorage.getItem('sel:project') || 'default', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], auth: null, 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, projectRules: {}, rulesOpen: false,
+const state = { repos: null, repoHome: '', /* GET /api/repos — the folders a project can point at (Context Bar) */ projects: [], goals: [], tasks: [], act: {}, actAt: {}, todos: {}, chatTurns: {}, active: localStorage.getItem('sel:project') || 'default', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], auth: null, expanded: new Set(), openThreads: new Set(), queueOrder: {}, externalActivity: [], selectedGoal: null, workflowColumns: {}, wfDraft: null, reviewDefinitions: {}, rdDraft: null, runningCounts: {}, parallelLimits: 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, projectRules: {}, rulesOpen: false,
   // 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 },
@@ -3704,6 +3729,7 @@ function buildReviewDigest({ goals, tasks } = {}){
       checkLine: plan ? `PLAN — approve to execute: ${checkLine}`.slice(0, 90) : checkLine,
       pr: g.pr ?? null,
       testResult: g.testResult ?? null,
+      verificationInfraError: g.verificationInfraError ?? null,
       proof: proofTask?.proof ?? null,
       proofTaskId: proofTask?.id ?? null,
       plan,
@@ -3715,6 +3741,7 @@ function buildReviewDigest({ goals, tasks } = {}){
       if (row.reviewNumber != null && (existing.reviewNumber == null || row.reviewNumber < existing.reviewNumber)) existing.reviewNumber = row.reviewNumber;
       if (existing.proof == null) { existing.proof = row.proof; existing.proofTaskId = row.proofTaskId; }
       if (existing.testResult == null) existing.testResult = row.testResult;
+      if (existing.verificationInfraError == null) existing.verificationInfraError = row.verificationInfraError;
       continue;
     }
     if (row.pr) byPr.set(row.pr, row);
@@ -4247,7 +4274,11 @@ function goalRow(g){
     const summary = GOAL_COMPLETE_STATUSES.includes(g.status) && g.summary
       ? `<div class="gsummary"><div class="gslabel"><span class="dot"></span>Manager結論サマリ</div>${esc(g.summary)}</div>` : '';
     const pr = g.pr ? `<a class="prlink" href="${esc(g.pr)}" target="_blank">${g.status === 'review' ? 'In review — open the Pull Request' : 'Open the Pull Request'}</a>`
-      : g.prError ? `<div class="prfail">PR failed: ${esc(g.prError)}</div>` : '';
+      : g.prError ? (() => {
+        const meta = (() => { const raw = g.prErrorClass || inferErrorClass(`PR step failed: ${g.prError}`, g.agent); const C = FAILURE_COPY[failureLang()]; return { ...raw, title: C.infra.title, body: C.infra[raw.reason] || C.infra.pr, copy: C }; })();
+        const repair = g.prRepair ? `<div class="prrepair"><b>${esc(g.prRepair.title || 'Repair')}</b><ul>${(g.prRepair.steps || []).map((s) => `<li>${esc(s)}</li>`).join('')}</ul>${g.prRepair.dirtyFiles?.length ? `<div class="dim">dirty: ${g.prRepair.dirtyFiles.map(esc).join(' · ')}</div>` : ''}</div>` : '';
+        return `<div class="prfail"><b>${esc(meta.title)}</b> — ${esc(meta.body)} <span class="dim">${esc(g.prError)}</span>${repair}<div class="acts2">${errorButtonsHtml(meta, { goalId: g.id, agent: g.agent, pr: true })}</div></div>`;
+      })() : '';
     // task 96: PRなしのreviewゴールは、チャット内で要約＋個別Approve＋チェックリスト導線を出す。
     const reviewBox = g.status === 'review' && !g.pr ? reviewActionsHtml(g) : '';
     const active = replies.some((r) => ['running', 'queued'].includes(r.status));
@@ -4354,6 +4385,9 @@ function renderStream(){
   for (const b of $('stream').querySelectorAll('.reqopen')) {
     b.onclick = () => openReviewChecklist(Number(b.dataset.goal));
   }
+  for (const b of $('stream').querySelectorAll('[data-fsprretry]')) {
+    b.onclick = () => fsRetryPrGoal(b);
+  }
   // task 96: chat-side per-requirement Approve — same flow as the checklist
   // (setRequirementStatus toggles the approval and auto-advances the goal when
   // every requirement is approved, then render() redraws this thread).
@@ -4422,6 +4456,17 @@ function renderQueue(){
   // layouts keep the explanatory sentence.
   const qn = ob.length + stacked.length + planning.length;
   const headHtml = qn > 0 ? `<div class="qhead">${state.layout === 'flagship' ? `Queued · ${qn}` : `${qn} queued · goals become To dos in ~30s`}</div>` : '';
+  const stackedMeta = (g) => {
+    const project = state.projects.find((p) => p.id === g.projectId);
+    if (project?.paused) return 'Paused · press play to start';
+    const activeIds = [...new Set([
+      ...state.tasks.filter((t) => t.projectId === g.projectId && t.status === 'running' && t.goalId != null).map((t) => t.goalId),
+      ...state.goals.filter((x) => x.projectId === g.projectId && x.status === 'planning').map((x) => x.id),
+    ])].filter((id) => id !== g.id);
+    const cap = state.parallelLimits?.project ?? 2;
+    if (activeIds.length >= cap) return `Waiting for parallel slot · active ${activeIds.map((id) => `#${id}`).join(', ')} · starts when one reaches Review/Done · Run next / switch Agent`;
+    return `Next up · starts automatically · Agent: ${esc(g.agent || state.connectedApp || 'worker')}`;
+  };
   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>
@@ -4434,7 +4479,7 @@ function renderQueue(){
           <button class="gbtn qsave" data-id="${g.id}">Save</button><button class="gbtn qcancel">Cancel</button>
         </div>`;
     }
-    return `<div class="qrow" draggable="true" data-goal="${g.id}"><span class="qdot"></span><span class="qtxt">${esc(g.text.replace(/\s+/g, ' '))}</span>
+    return `<div class="qrow" draggable="true" data-goal="${g.id}"><span class="qdot"></span><span class="qtxt">${esc(g.text.replace(/\s+/g, ' '))}</span><span class="meta">${stackedMeta(g)}</span>
       <button class="qico qe" data-id="${g.id}" title="Edit">${ICONS.pencil}</button>
       <button class="qico qp" data-id="${g.id}" title="Run next">${ICONS.up}</button>
       <button class="qico del qd" data-id="${g.id}" title="Delete">${ICONS.trash}</button></div>`;
@@ -5204,7 +5249,13 @@ function wireWfEditButtons(){
 // /api/goals/:id/reply thread. Approvals live client-side only
 // (state.reviewApprovals) since they are a review action, not new work.
 function reviewRequirementsFor(goalId){
-  return state.tasks.filter((t) => t.goalId === goalId && !t.reply).sort((a, b) => (a.num ?? 0) - (b.num ?? 0));
+  const reqs = state.tasks.filter((t) => t.goalId === goalId && !t.reply).sort((a, b) => (a.num ?? 0) - (b.num ?? 0));
+  const outcome = latestGoalOutcomeTask(goalId, state.tasks);
+  if (reqs.length === 1 && outcome?.reply) {
+    const req = reqs[0];
+    return [{ ...req, ...outcome, id: req.id, title: req.title, outcomeTaskId: outcome.id }];
+  }
+  return reqs;
 }
 function openReviewChecklist(goalId){
   // H14 (Masa 2026-07-08): a single review IS the See-all Ledger focused on that
@@ -5318,6 +5369,8 @@ function renderReviewChecklist(){
   const hasProof = state.tasks.some((t) => t.goalId === goal.id && (t.proof?.png || t.proof?.gif));
   const VF = { pass: 'tests pass', fail: 'tests fail', untested: 'not tested', proof: 'proof', noproof: 'no proof', human: 'needs you' }; // #377-7: chrome is English
   const vchips = [];
+  vchips.push(`<span class="vchip none">${esc(workspaceModeText(goal))}</span>`);
+  if (goal.workspaceWarning) vchips.push(`<span class="vchip human high">⚠ ${esc(goal.workspaceWarning.slice(0, 80))}</span>`);
   vchips.push(gtr?.ran
     ? (gtr.ok ? `<span class="vchip ok">✓ ${VF.pass}</span>` : `<span class="vchip no">✗ ${VF.fail}</span>`)
     : `<span class="vchip none">— ${VF.untested}</span>`);
@@ -5329,10 +5382,15 @@ function renderReviewChecklist(){
   const failureHtml = fm?.whatHappened
     ? `<div class="rvchanged"><span class="rvlbl">Failure memory</span>${esc(fm.whatHappened)} ${fm.nextPolicy ? `<span class="muted">${esc(fm.nextPolicy)}</span>` : ''}</div>`
     : '';
+  const infra = goal.verificationInfraError;
+  const infraHtml = infra?.detail
+    ? `<div class="rvinfra"><span class="rvlbl">${esc(infra.title || '検証基盤エラー')}</span>${esc(infra.detail)} <button type="button" class="retrybtn" data-goalreverify="${goal.id}">再検証</button></div>`
+    : '';
   $('reviewSummary').innerHTML =
     vfyHtml
     + (grs.check ? `<div class="rvcheck2"><span class="rvlbl">${L.check}</span>${esc(grs.check)}</div>` : '')
     + (grs.changed ? `<div class="rvchanged"><span class="rvlbl">${L.changed}</span>${esc(grs.changed)}</div>` : '')
+    + infraHtml
     + failureHtml
     + optHtml
     + `<div class="rvhead">${testLine}${esc(sum.headline)} · ${esc(sum.detail)}${prLink ? ` · ${prLink}` : ''}</div>`
@@ -5356,7 +5414,7 @@ function renderReviewChecklist(){
     }
     // P1: one shot when a promised check actually captured one, otherwise nothing at
     // all — "No capture yet" was us apologising for a photo we no longer go and take.
-    const media = proofMediaHtml(t.id, t.proof, esc(t.title ?? ''));
+    const media = proofMediaHtml(t.outcomeTaskId ?? t.id, t.proof, esc(t.title ?? ''));
     // task 156/234 + 160: show the WORKER'S REPORT (what it actually did/found,
     // incl. any test-only verification it describes) — that's what you read to
     // decide. Falls back to the instruction if the worker left no result.
@@ -5395,6 +5453,15 @@ function renderReviewChecklist(){
   for (const c of $('reviewList').querySelectorAll('[data-reopen]')) {
     c.onclick = () => setRequirementStatus(goalId, Number(c.dataset.reopen), 'approved'); // same status toggles it off
   }
+  for (const b of $('reviewSummary').querySelectorAll('[data-goalreverify]')) {
+    b.onclick = async (e) => {
+      e.stopPropagation();
+      b.disabled = true;
+      b.textContent = '再検証中…';
+      const r = await fetch(withKey(`/api/goals/${b.dataset.goalreverify}/reverify`), { method: 'POST' });
+      if (r.ok) await refresh(); else showErr('再検証に失敗');
+    };
+  }
   for (const b of $('reviewList').querySelectorAll('.reqsend')) {
     b.onclick = async () => {
       const taskId = Number(b.dataset.task);
@@ -5450,15 +5517,15 @@ function playReviewFly(capture){
 }
 // task 121: 承認が確定した瞬間に一度だけ紙吹雪を弾けさせる共通フック。両方の
 // 承認経路(reviewApprove.onclick / advanceGoalAfterAllApproved)から呼ぶ。
-// --iri(虹グラデーション)はAI要素専用の配色なので使わず、成功色の--green/
-// --amberと中立色の--ink系だけに絞った数色にとどめる。
-const CONFETTI_COLORS = ['var(--green)', 'var(--amber)', 'var(--ink)', 'var(--ink2)'];
+// Figma's playful primary family: vivid enough to read as a reward on both
+// light and dark themes while the green check remains the success anchor.
+const CONFETTI_COLORS = ['#F24E1E', '#FF7262', '#A259FF', '#1ABCFE', '#0ACF83', '#FFD166'];
 function celebrateApprove(){
   const dm = $('reviewDoneMsg');
   const rect = dm && dm.offsetParent ? dm.getBoundingClientRect() : null;
   const originX = rect ? rect.left + Math.min(28, rect.width / 2) : window.innerWidth / 2;
   const originY = rect ? rect.top + rect.height / 2 : window.innerHeight * 0.3;
-  for (let i = 0; i < 16; i++){
+  for (let i = 0; i < 42; i++){
     const el = document.createElement('div');
     el.className = 'confetti-piece';
     const size = 6 + Math.random() * 6;
@@ -5472,7 +5539,7 @@ function celebrateApprove(){
     el.style.transition = 'transform .9s cubic-bezier(.15,.7,.3,1), opacity .9s ease .25s';
     document.body.appendChild(el);
     const angle = Math.random() * Math.PI * 2;
-    const dist = 60 + Math.random() * 120;
+    const dist = 90 + Math.random() * 190;
     const dx = Math.cos(angle) * dist;
     const dy = Math.sin(angle) * dist * 0.6 + 90; // outward burst, then settle downward like falling confetti
     const rot = (Math.random() < 0.5 ? -1 : 1) * (360 + Math.random() * 360);
@@ -5483,6 +5550,34 @@ function celebrateApprove(){
     setTimeout(() => el.remove(), 1000);
   }
 }
+
+// A merged PR is the terminal Review moment. Show the result in the dialog the
+// person is looking at, then remove that completed review instead of leaving a
+// stale modal behind. The state update arrives in the same SSE event, so render()
+// after close also removes the card from the Review lane.
+function finishOpenReview(goal){
+  const ids = SA.items.flatMap((it) => it.ids || [it.goalId]);
+  if (!SA.open || !ids.includes(goal.id)) { celebrateApprove(); return; }
+  const layer = document.createElement('div');
+  layer.className = 'sa-finish';
+  layer.setAttribute('role', 'status');
+  layer.setAttribute('aria-label', 'Review complete');
+  layer.innerHTML = '<div class="sa-finish-mark"><svg viewBox="0 0 64 64" aria-hidden="true"><path d="M17 33l10 10 21-23"/></svg></div>';
+  const panel = $('seeall').querySelector('.sa-panel')?.getBoundingClientRect();
+  const bounds = panel ?? { left: 0, top: 0, width: innerWidth, height: innerHeight };
+  Object.assign(layer.style, { left: `${bounds.left}px`, top: `${bounds.top}px`, width: `${bounds.width}px`, height: `${bounds.height}px` });
+  // Keep the completion layer outside #seeall: the same SSE schedules a normal
+  // render, which rebuilds the dialog while this short animation is playing.
+  document.body.appendChild(layer);
+  const mark = layer.querySelector('.sa-finish-mark').getBoundingClientRect();
+  const reduce = matchMedia('(prefers-reduced-motion: reduce)').matches;
+  if (!reduce) {
+    confettiBurst(mark.left + mark.width / 2, mark.top + mark.height / 2);
+    celebrateApprove();
+  }
+  const delay = reduce ? 350 : 950;
+  setTimeout(() => { layer.remove(); saClose(); render(); }, delay);
+}
 async function setRequirementStatus(goalId, taskId, status){
   const approvals = (state.reviewApprovals[goalId] ??= {});
   approvals[taskId] = approvals[taskId] === status ? undefined : status; // click again to undo
@@ -5933,16 +6028,22 @@ $('reviewOverlay').addEventListener('click', (e) => { if (e.target === $('review
 // result linked to the goal (What was done), and the existing proof
 // video/screenshot rendering (Proof). Approve/Dismiss and the revision send
 // button are visual-only for now — not wired to any API.
+const REVIEW_DETAIL_STATUSES = new Set(['review', 'done', 'reverted', 'skipped', 'blocked', 'partial', 'failed', 'interrupted']);
 function openGoalDetail(goalId){
+  const g = state.goals.find((x) => x.id === goalId);
+  // Completed and human-attention work always uses the current Review Ledger card.
+  // Keeping this guard at the lowest-level opener prevents Done from falling back to
+  // the legacy overlay when it is opened through a different list/log entry point.
+  if (g && REVIEW_DETAIL_STATUSES.has(g.status) && typeof saOpen === 'function') {
+    saOpen(goalId, true);
+    return;
+  }
   state.goalDetailOpen = goalId;
   renderGoalDetail();
   $('goalDetailOverlay').classList.add('show');
 }
-// "Needs you" (attention) goals open as the SAME review card (Masa 2026-07-24, Option A);
-// any other non-review goal keeps the goal-detail overlay.
+// All detail entry points share the routing in openGoalDetail().
 function openGoalOrCard(goalId){
-  const g = state.goals.find((x) => x.id === goalId);
-  if (g && ['blocked', 'partial', 'failed', 'interrupted'].includes(g.status) && typeof saOpen === 'function') { saOpen(goalId, true); return; }
   openGoalDetail(goalId);
 }
 // List / board 共通の詳細導線。Review は review ledger、Needs you は attention card、
@@ -6223,7 +6324,7 @@ function render(){
 // queueOrder); actions call the SAME endpoints (approve/dismiss/retry/reply…).
 // ============================================================================
 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
+  rv: 1, // approved screenshot-free B Status dot design; Review has one stable view
   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, rejOpen: false, todoMore: false,
@@ -6328,9 +6429,6 @@ function fsActiveContext(){
   const focus = pinnedValid ? pinned : running[0] ?? closing[0] ?? failed[failed.length - 1] ?? null;
   return { tasks, running, failed, focus, goal: state.goals.find((g) => g.id === focus?.goalId) ?? null };
 }
-// Per-project last non-empty center feed — the whiteout guard (see below): keeps
-// what the user was looking at when a render pass momentarily produces no lines.
-const _fsLastFeed = {};
 // H-CENTERLANE decision 1: pure merge-sort of timed HTML blocks (the focused task's
 // activity block + each chat turn) so the center lane renders in the order things
 // actually happened. Stable sort (spec-guaranteed since ES2019) keeps same-ts blocks
@@ -6404,13 +6502,14 @@ function renderFsFeed(){
     // it's continuing, so the ⎿ read as floating/orphaned. Now an independent state line:
     // colored icon + word only, no continuation glyph.
     const isInt = focus.status === 'interrupted';
-    const word = isInt ? 'Interrupted' : 'Failed', icon = isInt ? '⏸' : '✗', label = isInt ? 'Resume' : 'Retry';
+    const word = isInt ? 'Interrupted' : 'Failed', icon = isInt ? '⏸' : '✗';
+    const meta = taskErrorMeta(focus, goal);
     const reason = String(focus.result || '').trim();
     // no separate reason text (or it's just a restatement of the status itself) → don't
     // print "Interrupted — Interrupted"; the word + icon alone already say it
     const reasonSuffix = reason && reason.toLowerCase() !== word.toLowerCase() ? ` — ${esc(reason.replace(/\s+/g, ' ').slice(0, 140))}` : '';
-    html += `<div class="cc-err${isInt ? ' int' : ''}"><div class="msg"><span class="x${isInt ? ' int' : ''}">${icon} ${esc(word)}</span>${reasonSuffix}</div>
-      <div class="acts2"><button class="errbtn" data-fsretry="${focus.id}">${label}</button><button class="errbtn" data-fslog="${focus.id}">View log</button></div></div>`;
+    html += `<div class="cc-err${isInt ? ' int' : ''}"><div class="msg"><span class="x${isInt ? ' int' : ''}">${icon} ${esc(word)}</span> <b>${esc(meta.title)}</b> — ${esc(meta.body)}${reasonSuffix}</div>
+      <div class="acts2">${errorButtonsHtml(meta, { taskId: focus.id, goalId: focus.goalId, interrupted: isInt, agent: focus.agent || goal?.agent })}</div></div>`;
   }
   // AI question — while current it lives in the chat feed (cc-ask, §6.5 dynamic rule / q2).
   // Free-text answer row + delete (trash) restore lost behaviors from the pre-flagship
@@ -6440,15 +6539,9 @@ function renderFsFeed(){
     const app = connectedAppMeta(focus?.agent ?? goal?.agent);
     html = `<div class="cc-who">${app.icon}<span class="cs-n">${esc(app.label)}</span>${meta ? `<span class="cs-d">${esc(meta)}${focus?.status === 'running' ? ' · worktree' : ''}</span>` : ''}</div>` + html;
   }
-  // BUG (whiteout / reset-to-loading): the Clawd HERO ("Claude Code / WAITING FOR
-  // GOALS") is the honest "this project has no work at all" first-run state — it
-  // must NOT appear as a side effect of a transient empty render (SSE reconnect,
-  // a goal finishing before the next starts, a project switch, a refresh() that
-  // briefly reloads state). Gate it PURELY on whether the project has any
-  // goal/task; connection blips never change that, so the giant hero can no
-  // longer flash in and wipe what the user was looking at. While work exists but
-  // this pass produced no lines, keep the last known feed (or a calm one-line
-  // status) instead of blanking to the hero.
+  // The center must describe current state. Keeping the previous task's activity
+  // after it settled made an idle board look 77% active while the server had zero
+  // workers. Empty live output now gets an explicit idle explanation instead.
   // Pattern A (H23): the conversation turns — the user's own messages, Claude
   // Code's replies (typed out with a caret on the streaming frontier), and
   // "→ Added to To Do #NN" markers — rendered from state.chatTurns so the
@@ -6488,8 +6581,12 @@ function renderFsFeed(){
   // end (H18/H19 — a pending question must never be lost mid-scroll).
   const timelineBlocks = html ? [{ ts: focusTs, html }, ...chatBlocks] : chatBlocks;
   let out = fsMergeTimelineBlocks(timelineBlocks) + askHtml;
-  if (out) _fsLastFeed[state.active] = out;
-  else if (hasWork) out = _fsLastFeed[state.active] || `<div class="cc-c">⎿  ${esc(running.length ? 'working…' : 'no active task')}</div>`;
+  if (!out && hasWork) {
+    const laterN = pgoals.filter((g) => g.status === 'pending').length;
+    const queuedN = ptasks.filter((t) => t.status === 'queued').length + pgoals.filter((g) => ['planning', 'stacked'].includes(g.status)).length;
+    const msg = running.length ? 'working…' : queuedN ? `${queuedN} queued · waiting to start` : laterN ? `no active task · ${laterN} saved in Later` : 'no active task';
+    out = `<div class="cc-c">⎿  ${esc(msg)}</div>`;
+  }
   $('fsRoot').classList.toggle('clawdhero', !hasWork);
   const sc = feed.parentNode;
   const nearBottom = sc.scrollHeight - sc.clientHeight - sc.scrollTop <= 80;
@@ -6500,6 +6597,9 @@ function renderFsFeed(){
   window.__fsCineSync?.(); // Cinema dynamic rule: content growth may reach the band region
   for (const b of feed.querySelectorAll('[data-fsretry]')) b.onclick = () => fsRetryTask(b.dataset.fsretry);
   for (const b of feed.querySelectorAll('[data-fslog]')) b.onclick = () => fsToggleLog(Number(b.dataset.fslog));
+  for (const b of feed.querySelectorAll('[data-fscodex]')) b.onclick = () => fsRunWithCodexGoal(b);
+  for (const b of feed.querySelectorAll('[data-fsconnectworker]')) b.onclick = () => fsConnectWorker(b);
+  for (const b of feed.querySelectorAll('[data-fscheckworker]')) b.onclick = () => fsCheckWorker(b);
   for (const b of feed.querySelectorAll('[data-fsanswer]')) b.onclick = () => fsAnswerQuestion(b.dataset.fsanswer, b.dataset.a);
   // Free-text answer (restores 質問カードの自由記述回答欄 — lost in the flagship rewrite,
   // see docs/confirmed-behaviors.md): Enter or the ↑ send button answers with typed text.
@@ -6538,6 +6638,38 @@ async function fsRetryTask(id){
   const r = await fetch(withKey(`/api/tasks/${id}/retry`), { method: 'POST' });
   if (!r.ok) showErr('Retry failed.'); else await refresh();
 }
+async function fsRunWithCodexGoal(b){
+  b.disabled = true; b.textContent = failureLang() === 'ja' ? '開始中…' : 'Starting…';
+  const r = await fetch(withKey(`/api/goals/${b.dataset.fscodex}/run-with-codex`), { method: 'POST' });
+  if (!r.ok) showErr((await r.json().catch(() => ({}))).error || 'Could not start with Codex.');
+  await refresh();
+}
+async function fsConnectWorker(b){
+  b.disabled = true;
+  try {
+    const r = await fetch(withKey('/api/worker-auth/connect'), { method: 'POST' });
+    if (!r.ok) throw new Error();
+    showToast(failureLang() === 'ja' ? '接続画面を開きました。完了後に接続確認してください。' : 'Connection opened. Check connection when finished.');
+  } catch { showErr(failureLang() === 'ja' ? '接続画面を開けませんでした。' : 'Could not open the connection.'); }
+  finally { b.disabled = false; }
+}
+async function fsCheckWorker(b){
+  b.disabled = true;
+  try {
+    const r = await fetch(withKey('/api/worker-auth/retry'), { method: 'POST' });
+    const body = await r.json().catch(() => ({}));
+    if (!r.ok) throw new Error();
+    renderAuthBanner(body.auth);
+    if (body.auth?.ok) showToast(failureLang() === 'ja' ? '接続できました。' : 'Connected.');
+  } catch { showErr(failureLang() === 'ja' ? 'まだ接続できていません。' : 'Not connected yet.'); }
+  finally { b.disabled = false; }
+}
+async function fsRetryPrGoal(b){
+  b.disabled = true; b.textContent = failureLang() === 'ja' ? '再試行中…' : 'Retrying…';
+  const r = await fetch(withKey(`/api/goals/${b.dataset.fsprretry}/retry-pr`), { method: 'POST' });
+  if (!r.ok) { showErr((await r.json().catch(() => ({}))).error || 'PR retry failed.'); b.disabled = false; b.textContent = FAILURE_COPY[failureLang()].actions.pr; }
+  else await refresh();
+}
 function fsToggleLog(taskId){
   const task = state.tasks.find((t) => t.id === taskId);
   if (task?.goalId == null) return;
@@ -6801,12 +6933,8 @@ function renderFsReview(){
   const pgoals = state.goals.filter((g) => g.projectId === state.active);
   const list = state.tasks.filter((t) => t.projectId === state.active);
   const rows = buildReviewDigest({ goals: pgoals, tasks: list });
-  // PRD §6.5 → Masa 2026-07-23: a goal folded onto another review's PR does NOT get its own
-  // row in the Review list (Masa, seeing it live: "ここにはいらない・逆にわかりにくい"). Where
-  // its work went — and the control to restore it — live on the carrier's side only, in the
-  // opened detail's "Also carries" section (see saItemHtml's carriesBody). The list stays
-  // just the reviews; folded goals are explained where they were merged.
-  if (!rows.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
+  const foldedRows = pgoals.filter((g) => g.status === 'folded' && g.foldedInto != null);
+  if (!rows.length && !foldedRows.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
   const green = rows.filter((r) => !r.testResult || r.testResult.ok !== false).length;
   const blockedN = pgoals.filter((g) => g.status === 'blocked').length;
   const pct = rows.length ? Math.round((green / rows.length) * 100) : 0;
@@ -6819,12 +6947,6 @@ function renderFsReview(){
   const RCAP = 3;
   const shown = fsUI.revMore ? rows : rows.slice(0, RCAP);
   const card = (r) => {
-    const imgFile = r.proof?.png ?? r.proof?.gif;
-    // onerror: a broken proof (404 / expired key) removes the <img> so the card's
-    // dark ground shows through cleanly instead of a broken-image icon + "proof" alt
-    // text. Card height is guaranteed by the base rule's min-height, not the img.
-    const img = imgFile && r.proofTaskId != null
-      ? `<img src="${withKey(`/proof/${r.proofTaskId}/${imgFile}`)}" alt="proof" loading="lazy" onerror="this.remove()">` : '';
     const pr = r.pr ? `<a class="pr" href="${esc(r.pr)}" target="_blank">PR #${esc((r.pr.match(/pull\/(\d+)/) ?? [, ''])[1])} ↗</a>` : '';
     // #NN PREFIX on the title (HANDOFF-v45 §11 — same form/number as the To Do rows;
     // goalReviewNumber = goal.id, so a goal keeps the same number in Review and in To
@@ -6835,6 +6957,11 @@ function renderFsReview(){
     // retest ×3 note (v45 §5.3): the goal came back green from a Ledger Dismiss
     const g0 = pgoals.find((g) => g.id === r.goalIds[0]);
     const rnote = g0?.retest?.passed ? `<span class="rnote">✓ ${esc(g0.retest.note)}</span>` : '';
+    const infraNote = r.verificationInfraError?.detail
+      ? `<span class="rnote">検証基盤エラー · <button type="button" class="retrybtn" data-goalreverify="${r.goalIds[0]}">再検証</button></span>`
+      : '';
+    const conflictNote = g0?.conflictsWith?.length
+      ? `<span class="rstat conflict">Potential conflict with ${esc(g0.conflictsWith.map((id) => `#${id}`).join(', '))}</span>` : '<span class="rstat">In review</span>';
     // PRD §6.5 → Masa 2026-07-21: goals folded onto this card's PR no longer get an
     // inline "+ #901 の仕事もここに入っています" note here — same report-in-the-list
     // clutter the old standalone fold row was (Masa: review欄にいらない). It is logged
@@ -6844,9 +6971,16 @@ function renderFsReview(){
     // (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}${pr}</div>
+    return `<div class="rcard noimg" data-fsrev="${r.goalIds[0]}"><div class="rc"><div class="t">${rid}${esc(r.plan ? r.checkLine : saReviewTitle(g0))}</div>${rnote}${infraNote}${pr}${conflictNote}</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>`;
   };
+  const foldCard = (g) => {
+    const target = pgoals.find((x) => x.id === g.foldedInto);
+    const n = goalReviewNumber({ goal: g, tasks: list });
+    const rid = n != null ? `<span class="rid gno" data-n="${n}">#${n}</span>` : '';
+    const targetNo = target ? (goalReviewNumber({ goal: target, tasks: list }) ?? target.id) : g.foldedInto;
+    return `<div class="rcard noimg foldrow" data-fsrev="${g.id}"><div class="rc"><div class="t">${rid}${esc(saReviewTitle(g))}</div><span class="rstat">Merged into #${esc(String(targetNo))}</span></div></div>`;
+  };
   // V3-C (Masa決定 2026-07-07): no collapsed strip — it duplicated the sm2 meter right
   // above. Reviews render directly: meter + Review header + cards (+N more fold, §1.5-8).
   // The meter counts what is reviewable, so it only exists when something is (§1.5-3):
@@ -6856,13 +6990,8 @@ function renderFsReview(){
       <div class="m-top"><span class="num mt">${green} / ${rows.length}</span><span> ready</span><button class="detailbtn" id="fsSeeAll">See all</button></div>
       <div class="m-bar"><i style="width:${pct}%"></i></div>
       <div class="s">${esc(sline)}</div></div>` : ''}
-    <div class="revhd" id="fsRevHd"><span class="hd">Review</span><span class="rnum num">${green} ready</span>
-      <span class="rvbtns">
-        <button class="rvb${fsUI.rv === 3 ? ' on' : ''}" data-fsrv="3" title="Thumbnails"><svg viewBox="0 0 24 24"><rect x="3" y="5" width="18" height="14" rx="2"/><path d="M3 15l5-4 4 3 4-5 5 6"/></svg></button>
-        <button class="rvb${fsUI.rv === 1 ? ' on' : ''}" data-fsrv="1" title="List"><svg viewBox="0 0 24 24"><rect x="3" y="4" width="7" height="7" rx="1.5"/><path d="M13 6h8M13 9h5"/><rect x="3" y="14" width="7" height="7" rx="1.5"/><path d="M13 16h8M13 19h5"/></svg></button>
-        <button class="rvb${fsUI.rv === 2 ? ' on' : ''}" data-fsrv="2" title="Compact"><svg viewBox="0 0 24 24"><path d="M3 6h18M3 12h18M3 18h18"/></svg></button>
-      </span></div>
-    <div class="revlist">${shown.map(card).join('')}
+    <div class="revhd" id="fsRevHd"><span class="hd">Review</span><span class="rnum num">${green} ready</span></div>
+    <div class="revlist">${shown.map(card).join('')}${foldedRows.map(foldCard).join('')}
       ${rows.length > RCAP ? `<div class="morefold" id="fsRevMore">${fsUI.revMore ? 'less' : `+${rows.length - RCAP} more`}<span class="g">›</span></div>` : ''}</div>`;
   // Mirror the ready-review count onto the mobile top-bar "Review N" opener (H23).
   const _hn = document.getElementById('fsHambN'); if (_hn) _hn.textContent = green > 0 ? String(green) : '';
@@ -6876,10 +7005,8 @@ function renderFsReview(){
     saOpen(); };
   const moreEl = el.querySelector('#fsRevMore');
   if (moreEl) moreEl.onclick = () => { fsUI.revMore = !fsUI.revMore; renderFsReview(); };
-  for (const b of el.querySelectorAll('[data-fsrv]')) b.onclick = (e) => { e.stopPropagation();
-    fsUI.rv = Number(b.dataset.fsrv); localStorage.setItem('fsRv', String(fsUI.rv)); $('fsRoot').dataset.rv = String(fsUI.rv); renderFsReview(); };
   for (const c of el.querySelectorAll('[data-fsrev]')) c.onclick = (e) => {
-    if (e.target.closest('a') || e.target.closest('.act')) return;
+    if (e.target.closest('a') || e.target.closest('.act') || e.target.closest('[data-goalreverify]')) return;
     openReviewChecklist(Number(c.dataset.fsrev));
   };
   // Folded goals get no row here (Masa 2026-07-23) — they are shown, and restored, on the
@@ -6926,6 +7053,96 @@ function fsBucketTodo(){
     rejected: pgoals.filter((g) => g.status === 'rejected'), // 07-20c: Reject parks goals here (own fold, like Done)
   };
 }
+const FAILURE_COPY = {
+  ja: {
+    agent: { title: 'Agentエラー', body: 'Claude Code/Codex 側が作業中に止まりました。依頼内容や実装で詰まった可能性があります。' },
+    infra: {
+      title: 'Galda基盤エラー',
+      timeout: 'Galda側の実行上限や待ち時間で止まりました。変更内容の失敗とは限りません。',
+      auth: '接続や認証確認で止まりました。接続を直してから再開できます。',
+      relay: 'relay接続で止まりました。接続状態を確認してから再試行できます。',
+      chrome: 'Chrome/ブラウザ確認で止まりました。画面確認環境の問題で、実装失敗とは限りません。',
+      'test-runner': 'Galdaのtest runnerで止まりました。マシン負荷や起動待ちの可能性があります。',
+      pr: 'PR作成で止まりました。GitHub/gh認証やpush状態を確認してから再試行できます。',
+      'worker-start': 'worker起動で止まりました。Agentコマンドや実行環境を確認してから再開できます。',
+      unknown: 'Galdaの実行基盤で止まりました。ログを確認し、原因に応じて再試行できます。',
+    },
+    actions: {
+      retry: '再試行', resume: '再開', connect: 'Connect', check: '接続確認',
+      other: '別Agentで実行', log: 'ログ確認', tests: 'テスト再実行', pr: 'PR再試行',
+    },
+  },
+  en: {
+    agent: { title: 'Agent error', body: 'Claude Code/Codex stopped while doing the work. The agent may need a revised instruction or another run.' },
+    infra: {
+      title: 'Galda system issue',
+      timeout: 'Galda stopped this at the run limit or a wait timed out. This is not necessarily a problem with the change.',
+      auth: 'Connection or authentication failed. Reconnect, then continue.',
+      relay: 'The relay connection failed. Check the connection, then retry.',
+      chrome: 'Chrome/browser verification failed. The UI check environment stopped, not necessarily the implementation.',
+      'test-runner': 'Galda’s test runner stopped. Machine load or app startup timing may be the cause.',
+      pr: 'PR creation failed. Check GitHub/gh auth or push state, then retry.',
+      'worker-start': 'The worker could not start. Check the agent command or runtime, then continue.',
+      unknown: 'Galda’s execution layer stopped. Check the log and retry based on the cause.',
+    },
+    actions: {
+      retry: 'Retry', resume: 'Resume', connect: 'Connect', check: 'Check connection',
+      other: 'Run with another Agent', log: 'View log', tests: 'Re-run tests', pr: 'Retry PR',
+    },
+  },
+};
+function failureLang(){
+  try { return billingLang(); } catch { return document.documentElement.lang === 'ja' ? 'ja' : 'en'; }
+}
+function inferErrorClass(text, agent){
+  const low = String(text || '').toLowerCase();
+  const infra = (reason, actionIds) => ({ owner: 'galda-infra', reason, actionIds });
+  if (/run limit|実行上限|timed out|timeout|タイムアウト/.test(low)) return infra('timeout', ['retry', 'run-with-codex', 'view-log']);
+  if (/spawn|enoent|eacces|command not found|worker tool exited early|作業ツールが途中で終了/.test(low)) return infra('worker-start', ['retry', 'run-with-codex', 'view-log']);
+  if (/auth probe|preflight|not logged in|logged out|not authenticated|authentication|unauthorized|invalid api key|bad credentials|401\b|403\b|接続が必要|認証/.test(low)) return infra('auth', ['connect', 'check-connection', 'run-with-codex', 'view-log']);
+  if (/relay|websocket|socket|econnreset|econnrefused|billing-api unreachable|cf access|cloudflare access/.test(low)) return infra('relay', ['retry', 'connect', 'view-log']);
+  if (/chrome|chromium|puppeteer|target closed|browser|navigation timeout|waiting failed|screenshot|headless/.test(low)) return infra('chrome', ['retry', 'view-log']);
+  if (/test runner|node --test|npm test|project tests|server exited \(code \d+\) before it was ready|did not report ready in time|test timed out after|tap|not ok \d+/.test(low)) return infra('test-runner', ['retry-tests', 'view-log']);
+  if (/pr step failed|openpr|pull request|github|gh:|gh auth|git push|git fetch|git .*failed|pr作成|pr failed/.test(low)) return infra('pr', ['retry-pr', 'view-log']);
+  return { owner: 'agent', reason: agent === 'codex' ? 'codex' : 'claude-code', actionIds: ['retry', 'run-with-codex', 'view-log'] };
+}
+function taskErrorMeta(t, goal){
+  const meta = t.errorClass || inferErrorClass(t.result, t.agent || goal?.agent);
+  const lang = failureLang(), C = FAILURE_COPY[lang];
+  const isInfra = meta.owner === 'galda-infra';
+  return {
+    ...meta,
+    title: isInfra ? C.infra.title : C.agent.title,
+    body: isInfra ? (C.infra[meta.reason] || C.infra.unknown) : C.agent.body,
+    copy: C,
+  };
+}
+function goalBlockedErrorMeta(g){
+  const raw = g.blocked?.errorClass || (g.blocked?.kind === 'test'
+    ? { owner: 'galda-infra', reason: 'test-runner', actionIds: ['retry-tests', 'view-log'] }
+    : inferErrorClass(g.blocked?.reason, g.agent));
+  const lang = failureLang(), C = FAILURE_COPY[lang];
+  const isInfra = raw.owner === 'galda-infra';
+  return { ...raw, title: isInfra ? C.infra.title : C.agent.title, body: isInfra ? (C.infra[raw.reason] || C.infra.unknown) : C.agent.body, copy: C };
+}
+function errorButtonsHtml(meta, { taskId = null, goalId = null, interrupted = false, agent = null, pr = false } = {}){
+  const C = meta.copy.actions;
+  const canCodex = goalId != null && agent !== 'codex' && (state.agents || []).includes('codex');
+  const out = [];
+  for (const id of meta.actionIds || []) {
+    if (id === 'retry' && taskId != null) out.push(`<button class="errbtn" data-fsretry="${taskId}">${interrupted ? C.resume : C.retry}</button>`);
+    else if (id === 'run-with-codex' && canCodex) out.push(`<button class="errbtn" data-fscodex="${goalId}">${C.other}</button>`);
+    else if (id === 'connect') out.push(`<button class="errbtn" data-fsconnectworker="1">${C.connect}</button>`);
+    else if (id === 'check-connection') out.push(`<button class="errbtn" data-fscheckworker="1">${C.check}</button>`);
+    else if (id === 'retry-tests' && goalId != null) out.push(`<button class="errbtn" data-fsreverify="${goalId}">${C.tests}</button>`);
+    else if (id === 'retry-pr' && goalId != null) out.push(`<button class="errbtn" data-fsprretry="${goalId}">${C.pr}</button>`);
+    else if (id === 'view-log' && taskId != null) out.push(`<button class="errbtn" data-fslog="${taskId}">${C.log}</button>`);
+    else if (id === 'view-log' && goalId != null) out.push(`<button class="errbtn" data-fsglog="${goalId}">${C.log}</button>`);
+  }
+  if (!out.length && taskId != null) out.push(`<button class="errbtn" data-fsretry="${taskId}">${interrupted ? C.resume : C.retry}</button>`);
+  if (pr && !out.some((h) => h.includes('data-fsprretry'))) out.unshift(`<button class="errbtn" data-fsprretry="${goalId}">${C.pr}</button>`);
+  return out.join('');
+}
 // 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(){
@@ -6951,6 +7168,12 @@ function renderFsTodo(){
     && !pausedGoalIds.has(g.id) && !runningTaskGoalIds.has(g.id)
     && list.some((t) => t.goalId === g.id && t.reply && t.status === 'queued')
     && !list.some((t) => t.goalId === g.id && !t.reply && ['running', 'queued'].includes(t.status)));
+  const finalizingGoals = pgoals.filter((g) => g.status === 'running'
+    && !pausedGoalIds.has(g.id)
+    && !running.some((t) => t.goalId === g.id)
+    && !parkedReplyGoals.some((x) => x.id === g.id)
+    && list.some((t) => t.goalId === g.id)
+    && list.filter((t) => t.goalId === g.id).every((t) => ['done', 'skipped'].includes(t.status)));
   const tt = (s, n) => esc(String(s ?? '').replace(/\s+/g, ' ').slice(0, n ?? 70));
   // LATER = deliberately shelved goals (composer "Later" send → server status 'pending';
   // PRD §8.2 top gap — they were invisible in flagship). Staged disclosure: the cap
@@ -6972,9 +7195,10 @@ function renderFsTodo(){
     running.filter((t) => !pausedGoalIds.has(t.goalId)).map((t) => {
       const goal = pgoals.find((g) => g.id === t.goalId);
       const title = t.reply ? (goal?.reviewSummary?.check || goal?.plan?.[0] || goal?.text || t.title) : t.title;
-      return `<div class="drow"><div class="trow now" data-fsgoalrow="${t.goalId}"><span class="st run"></span>${noSpan(t.goalId)}<span class="tt">${tt(title)}</span><span class="pct num">${progressFor(t)}%</span>${fsActs(t.goalId)}</div>
+      return `<div class="drow"><div class="trow now" data-fsgoalrow="${t.goalId}"><span class="st run"></span>${noSpan(t.goalId)}<span class="tt">${tt(title)}</span><span class="stword run">Running</span><span class="pct num">${progressFor(t)}%</span>${fsActs(t.goalId)}</div>
       <div class="tbar"><i style="width:${progressFor(t)}%"></i></div></div>`;
     }).join('')
+    + finalizingGoals.map((g) => `<div class="drow"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword wait">Finalizing</span>${fsActs(g.id)}</div></div>`).join('')
     // 一時停止したゴールは Doing に「Paused」1行(アンバー)で留める＋Resume。走行/中断行は上と needsRows で抑止済み。
     + pgoals.filter((g) => pausedGoalIds.has(g.id)).map((g) => `<div class="drow"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword int">Paused</span><button class="ab txt" data-fspause="1" title="Resume — 再開">Resume</button></div></div>`).join('');
   // NEEDS YOU: stopped/errored work that used to fold into Doing, now under its own caption so
@@ -6994,19 +7218,23 @@ function renderFsTodo(){
     // exists (server-side retry = "resume if possible, else re-run"; there is no separate
     // resume endpoint to call).
     failed.filter((t) => !pausedGoalIds.has(t.goalId) && !resumedGoalIds.has(t.goalId)).map((t) => { const isInt = t.status === 'interrupted';
-      const word = isInt ? 'Interrupted' : 'Failed', icon = isInt ? '⏸' : '✗', label = isInt ? 'Resume' : 'Retry';
+      const goal = pgoals.find((g) => g.id === t.goalId);
+      const meta = taskErrorMeta(t, goal);
+      const word = isInt ? 'Interrupted' : 'Failed', icon = isInt ? '⏸' : '✗';
       // don't restate the state word as the "reason" too (e.g. "Interrupted / Interrupted")
       // when the task has no distinct result text — the coloured word already said it, so
       // the reason line only prints when there's real detail to add.
       const reason = String(t.result || '').trim();
       const reasonLine = reason && reason.toLowerCase() !== word.toLowerCase()
-        ? `<div class="msg"><span class="x ${isInt ? 'int' : ''}">${icon}</span>${tt(reason, 180)}</div>` : '';
+        ? `<div class="msg"><span class="x ${isInt ? 'int' : ''}">${icon}</span><b>${esc(meta.title)}</b> — ${esc(meta.body)} <span class="dim">${tt(reason, 160)}</span></div>`
+        : `<div class="msg"><span class="x ${isInt ? 'int' : ''}">${icon}</span><b>${esc(meta.title)}</b> — ${esc(meta.body)}</div>`;
       return `<div class="drow err${isInt ? ' int' : ''}"><div class="trow now" data-fsgoalrow="${t.goalId}"><span class="st run ${isInt ? 'int' : 'bad'}"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span><span class="stword ${isInt ? 'int' : ''}">${word}</span>${fsActs(t.goalId)}</div>
       <div class="errline">${reasonLine}
-      <div class="acts2"><button class="errbtn" data-fsretry="${t.id}">${label}</button><button class="errbtn" data-fslog="${t.id}">View log</button></div></div></div>`; }).join('')
-    + blocked.map((g) => g.blocked?.kind === 'paused' ? '' : `<div class="drow err"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run bad"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword">Failed</span></div>
-      <div class="errline"><div class="msg"><span class="x">✗</span>${tt(g.blocked?.reason ?? 'blocked', 180)}</div>
-      <div class="acts2"><button class="errbtn" data-fsreverify="${g.id}">Retry</button><button class="errbtn" data-fsglog="${g.id}">View log</button><button class="errbtn" data-fsarchive="${g.id}">Archive</button></div></div></div>`).join('')
+      <div class="acts2">${errorButtonsHtml(meta, { taskId: t.id, goalId: t.goalId, interrupted: isInt, agent: t.agent || goal?.agent })}</div></div></div>`; }).join('')
+    + blocked.map((g) => { if (g.blocked?.kind === 'paused') return ''; const meta = goalBlockedErrorMeta(g);
+      return `<div class="drow err"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run bad"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword">Failed</span></div>
+      <div class="errline"><div class="msg"><span class="x">✗</span><b>${esc(meta.title)}</b> — ${esc(meta.body)} <span class="dim">${tt(g.blocked?.reason ?? 'blocked', 160)}</span></div>
+      <div class="acts2">${errorButtonsHtml(meta, { goalId: g.id, agent: g.agent })}<button class="errbtn" data-fsarchive="${g.id}">Archive</button></div></div></div>`; }).join('')
     + needsInput.map((g) => `<div class="drow err int"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.text || g.plan?.[0], 60)}</span><span class="stword int">Needs input</span></div>
       <div class="errline"><div class="msg"><span class="x int">?</span>${tt(g.question?.text || 'A question is waiting on you', 180)}</div>
       <div class="acts2"><button class="errbtn" data-fsglog="${g.id}">Answer</button></div></div></div>`).join('');
@@ -7033,16 +7261,16 @@ function renderFsTodo(){
     }
     return `<div class="trow up${i >= 2 ? ' dim' : ''}" data-goalid="${t.goalId ?? ''}" data-taskid="${t.id}"${t.goalId != null ? ` data-fsgoalrow="${t.goalId}"` : ''}><span class="st"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span>${codexAction(t.goalId, t.agent)}${fsActs(t.goalId)}</div>${grp}`;
   }).join('');
-  // CDO review 2026-07-08 §7: this header count used to be queued.length alone (the
-  // "Next up" pool only) — so a project sitting in Doing/Later with an empty Next-up
-  // queue showed "To Do 0" directly above visible Doing/Later rows. The header labels
-  // the whole lane ("To Do"), so it now counts everything the lane actually renders
-  // below it: Doing (running) + Needs you (failed/interrupted tasks + stopped/needsInput
-  // goals) + Next up (queued) + Later (pending goals). "· next-up order" stays keyed off
-  // queued.length specifically, since that suffix describes the Next-up sublist's own sort,
-  // not the lane total.
+  // Keep executable work and deliberately-shelved Later work visibly distinct.
+  // "To Do 6" while all six were in Later made an idle queue look broken: Later
+  // never auto-starts by design. The header now tells the operational truth.
   const needsCount = failed.filter((t) => !resumedGoalIds.has(t.goalId)).length + blocked.length + needsInput.length;
-  const todoTotal = running.length + parkedReplyGoals.length + needsCount + queued.length + later.length;
+  const doingCount = running.length + finalizingGoals.length + pausedGoalIds.size;
+  const nextCount = parkedReplyGoals.length + queued.length;
+  const hasPipelineWork = doingCount > 0 || nextCount > 0 || pgoals.some((g) => ['planning', 'stacked'].includes(g.status));
+  const laterIdle = later.length && !hasPipelineWork
+    ? `<div class="lateridle"><span class="msg">${document.documentElement.lang === 'ja' ? `実行待ちはありません。Laterの${later.length}件は自動開始されません。` : `Nothing is queued. ${later.length} Later item${later.length === 1 ? '' : 's'} will not start automatically.`}</span><button data-fsstartnextlater="${later[0].id}">${document.documentElement.lang === 'ja' ? '次を開始' : 'Start next'}</button></div>`
+    : '';
   // Free-tier pending counter (H22): on the free plan the header shows the wall
   // — pending goals out of the 5-slot cap — reddening at the cap and gone once
   // paid. Reads the SAME numbers the gate enforces (state.billing, never a local
@@ -7053,7 +7281,7 @@ function renderFsTodo(){
   const _showFc = _bill.plan !== 'paid' && Number.isFinite(_fp) && Number.isFinite(_fl);
   const _todoNum = _showFc
     ? `<span class="fcount fstdlabel${_fp >= _fl ? ' cap' : ''}">${_fp}<span class="fc-l">/${_fl}</span></span>`
-    : `<span class="num fstdlabel">${todoTotal}${queued.length ? ' · next-up order' : ''}</span>`;
+    : `<span class="num fstdlabel">${nextCount} next · ${doingCount} doing${later.length ? ` · ${later.length} later` : ''}</span>`;
   el.innerHTML = `<div class="lhd sechd" id="fsTodoHd"><span class="hd fstdlabel">To Do</span>${_todoNum}<span class="fold fstdlabel">▾</span></div>
     <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}` : ''}
@@ -7061,8 +7289,11 @@ function renderFsTodo(){
       ${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" data-fsgoalrow="${g.id}"><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('')}` : ''}
       ${(parkedRows || upRows) ? `<span class="tlcap"${(doingRows || paused) || needsRows || rejected.length ? '' : ' style="padding-top:0"'}>Next up</span>${parkedRows}${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>
+      <span class="tlcap">Later</span>
+      <button class="qadd lateradd" data-fslaternew="1" title="New Later goal"><span class="paplus"></span>New</button>
+      ${laterIdle}
+      ${laterRows}
     </div>
     ${doneAll.length ? `<div class="doneline${fsUI.doneOpen ? ' open' : ''}" id="fsDoneLine">✓ Done<span class="num">${doneAll.length}</span><span class="fold">▾</span></div>
       <div id="fsDonelist"${fsUI.doneOpen ? '' : ' hidden'}>${doneAll.map((t) => `<div class="trow up dim done"${t.goalId != null ? ` data-fsgoalrow="${t.goalId}"` : ''}><span class="st ok"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span></div>`).join('')}</div>` : ''}`;
@@ -7070,6 +7301,11 @@ function renderFsTodo(){
   $('fsTodoHd').onclick = () => { fsUI.todoFold = !fsUI.todoFold; el.classList.toggle('folded', fsUI.todoFold); };
   const qadd = el.querySelector('.qadd[data-fsnew]');            // + New → focus the composer (the real create path)
   if (qadd) qadd.onclick = () => $('input')?.focus();
+  const laterAdd = el.querySelector('.qadd[data-fslaternew]');
+  if (laterAdd) laterAdd.onclick = (e) => {
+    e.stopPropagation();
+    fsInlineInput(laterAdd, '', 'Add to Later…', fsCreatePendingGoal);
+  };
   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 r of el.querySelectorAll('[data-fsgoalrow]')) r.onclick = (e) => {
@@ -7096,12 +7332,10 @@ function renderFsTodo(){
   };
   for (const b of el.querySelectorAll('[data-fspause]')) b.onclick = togglePauseActive; // list版 Doing 一時停止/再生（＋Paused行のResume）
   for (const b of el.querySelectorAll('[data-fsretry]')) b.onclick = () => fsRetryTask(b.dataset.fsretry);
-  for (const b of el.querySelectorAll('[data-fscodex]')) b.onclick = async (e) => { e.stopPropagation();
-    b.disabled = true; b.textContent = 'Starting…';
-    const r = await fetch(withKey(`/api/goals/${b.dataset.fscodex}/run-with-codex`), { method: 'POST' });
-    if (!r.ok) showErr((await r.json().catch(() => ({}))).error || 'Could not start with Codex.');
-    await refresh();
-  };
+  for (const b of el.querySelectorAll('[data-fscodex]')) b.onclick = (e) => { e.stopPropagation(); fsRunWithCodexGoal(b); };
+  for (const b of el.querySelectorAll('[data-fsconnectworker]')) b.onclick = (e) => { e.stopPropagation(); fsConnectWorker(b); };
+  for (const b of el.querySelectorAll('[data-fscheckworker]')) b.onclick = (e) => { e.stopPropagation(); fsCheckWorker(b); };
+  for (const b of el.querySelectorAll('[data-fsprretry]')) b.onclick = (e) => { e.stopPropagation(); fsRetryPrGoal(b); };
   for (const b of el.querySelectorAll('[data-fslog]')) b.onclick = () => fsToggleLog(Number(b.dataset.fslog));
   for (const b of el.querySelectorAll('[data-fsglog]')) b.onclick = () => toggleGoalDetail(Number(b.dataset.fsglog));
   for (const b of el.querySelectorAll('[data-fsreverify]')) b.onclick = async () => {
@@ -7118,6 +7352,12 @@ function renderFsTodo(){
   for (const b of el.querySelectorAll('[data-fspstart]')) b.onclick = async (e) => { e.stopPropagation();
     const r = await fetch(withKey(`/api/goals/${b.dataset.fspstart}/activate`), { method: 'POST' });
     if (!r.ok) showErr('Start failed.'); else await refresh(); };
+  const startNextLater = el.querySelector('[data-fsstartnextlater]');
+  if (startNextLater) startNextLater.onclick = async (e) => { e.stopPropagation();
+    startNextLater.disabled = true;
+    const r = await fetch(withKey(`/api/goals/${startNextLater.dataset.fsstartnextlater}/activate`), { method: 'POST' });
+    if (!r.ok) { showErr(document.documentElement.lang === 'ja' ? '開始できませんでした' : 'Could not start the next item.'); startNextLater.disabled = false; }
+    else await refresh(); };
   for (const b of el.querySelectorAll('[data-fspdel]')) b.onclick = async (e) => { e.stopPropagation();
     const preview = b.closest('.trow')?.querySelector('.tt')?.textContent || '';
     if (!(await confirmDelete({ title: 'Delete this shelved goal?', preview }))) return;
@@ -7141,6 +7381,20 @@ function renderFsTodo(){
     const r = await fetch(withKey(`/api/goals/${b.dataset.fsdel}`), { method: 'DELETE' });
     if (!r.ok) showErr('Cannot delete a running/finished goal — reply to append instead'); else await refresh(); };
 }
+async function fsCreatePendingGoal(text){
+  const r = await fetch(withKey('/api/tasks'), { method: 'POST', headers: { 'content-type': 'application/json' },
+    body: JSON.stringify({ projectId: state.active, text, pr: 'auto', model: state.stickyModel, effort: state.stickyEffort, agent: state.connectedApp, mode: 'auto', pending: true }) });
+  if (r.status === 402) {
+    const data = await r.json().catch(() => ({}));
+    showBillingBlocked(data.blocked);
+    return;
+  }
+  if (!r.ok) { showErr('Later add failed.'); return; }
+  clearBillingBlocked();
+  const goal = await r.json();
+  if (goal?.id) upsert(state.goals, goal);
+  render();
+}
 function fsInlineInput(afterEl, value, placeholder, onSubmit){
   if (!afterEl || afterEl.nextElementSibling?.classList.contains('fsinline')) return;
   const wrap = document.createElement('div'); wrap.className = 'fsinline';
@@ -8062,6 +8316,7 @@ async function refresh(){
     renderModelSelect();
     renderEffortSelect();
     state.queueOrder = s.queueOrder ?? {}; state.externalActivity = s.externalActivity ?? [];
+    state.runningCounts = s.runningCounts ?? {}; state.parallelLimits = s.parallelLimits ?? null;
     state.workflowColumns = s.workflowColumns ?? {};
     state.reviewDefinitions = s.reviewDefinitions ?? {};
     checkUiVersion(s.uiVersion);
@@ -8126,7 +8381,7 @@ function connectSSE(){
       // 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 {}
+        try { finishOpenReview(m.goal); } catch { 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`);
       }
@@ -8364,7 +8619,7 @@ async function postOutboxItem(item){
   posting.add(item.oid);
   try {
     const r = await fetch(withKey('/api/tasks'), { method: 'POST', headers: { 'content-type': 'application/json' },
-      body: JSON.stringify({ projectId: item.projectId, text: item.text, pr: item.pr, model: item.model, effort: item.effort, agent: item.agent, mode: item.mode, skill: item.skill, worktree: item.worktree, images: item.images, pending: item.pending, review: item.review }) });
+      body: JSON.stringify({ projectId: item.projectId, text: item.text, pr: item.pr, model: item.model, effort: item.effort, agent: item.agent, mode: item.mode, skill: item.skill, workspaceMode: item.workspaceMode, worktree: item.worktree, images: item.images, pending: item.pending, review: item.review }) });
     if (r.status === 402) {
       const data = await r.json().catch(() => ({}));
       outbox.mark(item.oid, 'unsent'); // same status as any other failed send — the existing 15s auto-flush retries it (and starts succeeding the moment a license activates), the existing queue resend affordance also works
@@ -8624,8 +8879,8 @@ async function send(){
     oid: `o${Date.now()}-${Math.random().toString(36).slice(2, 7)}`,
     projectId: state.active, text, pr: 'auto', model, effort, agent: state.connectedApp,
     mode, skill: skill || null,
-    // Only the OFF case travels: the engine stores an explicit false and leaves every
-    // other goal meaning exactly what it meant (engine #268).
+    workspaceMode: workspaceMode(),
+    // Keep the old wire contract too: only direct sends worktree:false.
     worktree: worktreeOn() ? undefined : false,
     pending: later, review,
     images: attach.map((a) => a.path), imageUrls: attach.map((a) => a.url),
@@ -8816,20 +9071,48 @@ function saRows(){
   const ts = (state.tasks || []).filter((t) => t.projectId === state.active);
   return buildReviewDigest({ goals: gs, tasks: ts }).map((r) => saRowFromDigest(r, gs, ts));
 }
+function latestGoalOutcomeTask(goalId, tasks){
+  return (tasks || []).filter((t) => t.goalId === goalId && t.status === 'done' && String(t.result ?? '').trim())
+    .sort((a, b) => Date.parse(b.finishedAt || b.startedAt || b.createdAt || 0)
+      - Date.parse(a.finishedAt || a.startedAt || a.createdAt || 0))[0] || null;
+}
+function taskAttemptId(t){ return t?.attemptId || (t?.id != null ? `task-${t.id}` : null); }
+function taskSortTime(t){ return Date.parse(t?.finishedAt || t?.startedAt || t?.createdAt || 0) || 0; }
+function latestGoalRunForOutcome(goalId, tasks, outcome){
+  if (outcome?.run) return { taskId: outcome.id, attemptId: taskAttemptId(outcome), inherited: false, ...outcome.run };
+  const runs = (tasks || []).filter((t) => t.goalId === goalId && t.run)
+    .sort((a, b) => taskSortTime(b) - taskSortTime(a));
+  if (!runs.length) return null;
+  const cutoff = outcome ? taskSortTime(outcome) : Infinity;
+  const prev = runs.find((t) => t.id !== outcome?.id && taskSortTime(t) <= cutoff) || (!outcome ? runs[0] : null);
+  if (!prev) return null;
+  const note = '前回のpreviewを継承しています: 最新replyは新しいpreviewを宣言しませんでした。 / Inherited previous preview: the latest reply did not declare a new preview.';
+  return {
+    taskId: prev.id,
+    attemptId: taskAttemptId(outcome) || taskAttemptId(prev),
+    inherited: true,
+    inheritedFromTaskId: prev.id,
+    inheritedForTaskId: outcome?.id ?? null,
+    ...prev.run,
+    note: prev.run?.note ? `${note} ${prev.run.note}` : note,
+  };
+}
 // One digest-row → one See-all card item. Extracted from saRows (2026-07-24) so a single
 // "Needs you" goal can be opened as the SAME review card (saLedgerRows solo mode) — the card's
 // whole shape (Request/Result/Proof/Activity, empty sections auto-hidden) is reused verbatim.
 function saRowFromDigest(r, gs, ts){
     const g = gs.find((x) => x.id === r.goalIds[0]);
+    const outcome = latestGoalOutcomeTask(g?.id, ts);
     const pt = ts.find((t) => r.goalIds.includes(t.goalId) && t.proof && (t.proof.png || t.proof.gif));
     // "What we did" (H23 §2, replaces the old Plan/Review-thread folds): one bullet
     // per finished requirement task's own report; falls back to the goal's plan
     // steps when nothing has finished yet (e.g. a plan awaiting approval — the plan
     // IS "what we're going to do" in that case, which is the honest content to show).
-    const doneTasks = ts.filter((t) => r.goalIds.includes(t.goalId) && !t.reply && t.result)
+    const doneTasks = ts.filter((t) => r.goalIds.includes(t.goalId) && !t.reply && t.result && t.status !== 'skipped')
       .sort((a, b) => (a.num ?? 0) - (b.num ?? 0));
     const did = doneTasks.length
       ? doneTasks.map((t) => String(t.result).replace(/\s+/g, ' ').trim().slice(0, 160))
+      : outcome ? [String(outcome.result).replace(/\s+/g, ' ').trim().slice(0, 160)]
       : (Array.isArray(g?.plan) ? g.plan.filter(Boolean).map((s) => String(s).replace(/\s+/g, ' ').trim()) : []);
     // Sibling goals (H23 §2/§4 "did the AI drop part of what I asked"): buildReviewDigest
     // already collapses goals that share one PR into a single row (goalIds.length > 1)
@@ -8854,6 +9137,7 @@ function saRowFromDigest(r, gs, ts){
       check: String(g?.reviewSummary?.check || r.checkLine || '').replace(/\s+/g, ' ').trim(),
       goalText: String(g?.text ?? '').replace(/\s+/g, ' ').trim(),
       did, siblings, risk: g?.risk ?? null,
+      verificationInfraError: g?.verificationInfraError ?? r.verificationInfraError ?? null,
       note: g?.retest?.passed ? g.retest.note : null,
       pr: r.pr,
       // P0b (Masa 2026-07-21): the AI's own TodoWrite breakdown for the "Steps" section
@@ -8884,7 +9168,7 @@ function saRowFromDigest(r, gs, ts){
       // lines are NOT in state — 1000 of them per task would bloat every page load — so
       // this is just the id to ask for when the reviewer opens Activity.
       logTaskId: (() => {
-        const t = ts.find((x) => x.goalId === g?.id && !x.reply && x.activityLog);
+        const t = [...ts].reverse().find((x) => x.goalId === g?.id && x.activityLog);
         return t?.id ?? null;
       })(),
       // P1 (Masa 2026-07-21): the AI's own final report, verbatim and untrimmed — the
@@ -8892,15 +9176,14 @@ function saRowFromDigest(r, gs, ts){
       // every ask that has no running thing to open ("research this", "explain that"),
       // and the explanation for every ask that does.
       report: (() => {
-        const t = ts.find((x) => x.goalId === g?.id && !x.reply && x.result);
+        const t = outcome || ts.find((x) => x.goalId === g?.id && !x.reply && x.result);
         return String(t?.result ?? '').replace(/^検証(PASS|FAIL)[^\n]*\n+/, '').trim();
       })(),
       // …and the worker's own "here's how you see it running" declaration (task.run,
       // written by the worker into .manager-run.json). Absent for asks with nothing to
       // run — then no button, which is the honest state, not a missing feature.
       run: (() => {
-        const t = ts.find((x) => x.goalId === g?.id && !x.reply && x.run);
-        return t ? { taskId: t.id, ...t.run } : null;
+        return latestGoalRunForOutcome(g?.id, ts, outcome);
       })(),
       // 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
@@ -8955,6 +9238,7 @@ function saSoloDigestRow(g, ts){
   return {
     goalIds: [g.id], reviewNumber: goalReviewNumber({ goal: g, tasks: ts }), checkLine,
     pr: g.pr ?? null, testResult: g.testResult ?? null,
+    verificationInfraError: g.verificationInfraError ?? null,
     proof: proofTask?.proof ?? null, proofTaskId: proofTask?.id ?? null, plan: false, planText: null,
   };
 }
@@ -9330,6 +9614,9 @@ function saItemHtml(it, i){
   const openBody = (it.run?.cmd || it.run?.url)
     ? `<div class="ropen" id="runlocal${i}"><button type="button" class="olink" data-saact="preview:${i}" id="prevlink${i}">${esc(it.run.url || 'Start it')}<span class="ar">↗</span></button><p class="rbody v">${esc(it.run.note || it.run.cmd || 'Starts when you press it.')}</p></div>`
     : '';
+  const prRepairBody = it.goal?.prError
+    ? `<div class="prfail"><b>${esc(it.goal.prRepair?.title || 'PR blocked')}</b> <span class="dim">${esc(it.goal.prError)}</span>${it.goal.prRepair?.steps?.length ? `<ul>${it.goal.prRepair.steps.map((s) => `<li>${esc(s)}</li>`).join('')}</ul>` : ''}${it.goal.prRepair?.dirtyFiles?.length ? `<div class="dim">dirty: ${it.goal.prRepair.dirtyFiles.map(esc).join(' · ')}</div>` : ''}<div class="acts2"><button class="errbtn" data-saact="retrypr:${i}">${failureLang() === 'ja' ? 'PR再試行' : 'Retry PR'}</button><button class="errbtn" data-saact="glog:${i}">${failureLang() === 'ja' ? 'ログ確認' : 'View log'}</button></div></div>`
+    : '';
   // ── Also carries (Masa 2026-07-21 → refined 2026-07-23): goals folded onto this review are
   // logged HERE, inside the review's own content — NOT as loose rows in the Review column
   // (Masa: "ここにはいらない・逆にわかりにくい"). This is the ONE place a folded goal is shown,
@@ -9364,6 +9651,10 @@ function saItemHtml(it, i){
   // change explains itself here, and an image the AI pasted shows up here as an image.
   // We interpret nothing; mdLite only turns Markdown into the shapes it already means. ──
   const reportBody = it.report ? `<div class="rreport">${mdLite(it.report, { images: false })}</div>` : '';
+  const infra = it.verificationInfraError;
+  const infraBody = infra?.detail
+    ? `<div class="rinfra"><p class="rbody">${esc(infra.detail)}</p><button type="button" class="retrybtn" data-saact="reverify:${i}">再検証</button></div>`
+    : '';
   // ── Screenshots (P2, Masa 2026-07-22): the pictures the AI took of its own result.
   // Full width, at their own aspect — a four-variant comparison sheet is unreadable
   // shrunk into a thumbnail, and that is the shape the AI actually produces. The file
@@ -9489,9 +9780,11 @@ function saItemHtml(it, i){
     ${meta}
     ${reqSec}
     ${S('Open it', openBody)}
+    ${S('PR', prRepairBody)}
     ${S('Also carries', carriesBody)}
     ${S('What to check', checkBody)}
     ${S('Result', reportBody)}
+    ${S(infra?.title || '検証基盤エラー', infraBody)}
     ${S('Screenshots', shotsBody)}
     ${S('Steps', stepsBody)}
     ${S('Proof', proofInner)}
@@ -9948,8 +10241,17 @@ $('seeall').addEventListener('click', async (e) => {
   }
   const it = SA.items[i];
   if (!it) return;
+  if (k === 'retrypr') return fsRetryPrGoal({ disabled: false, textContent: '', dataset: { fsprretry: String(it.goalId) } });
+  if (k === 'glog') return toggleGoalDetail(it.goalId);
   // meta-row toggle (H23): tap the token chip to reveal the technique breakdown.
   if (k === 'tok') { b.classList.toggle('open'); $('seeall').querySelector(`#tokdetail${i}`)?.classList.toggle('open'); return; }
+  if (k === 'reverify') {
+    b.disabled = true;
+    b.textContent = '再検証中…';
+    const r = await fetch(withKey(`/api/goals/${it.goalId}/reverify`), { method: 'POST' });
+    if (r.ok) await refresh(); else showErr('再検証に失敗');
+    return;
+  }
   // Open it (P1, Masa 2026-07-21): start the thing the worker said to run, then open it.
   // Booting a real process takes seconds, so the chip says "Starting…" while it waits —
   // and a failure lands in the detail line as a plain reason. It never turns the goal
@@ -10143,16 +10445,30 @@ function renderCtxBar(){
   const openRow = `<button type="button" class="appopt ctxopen" id="ctxopenfolder" title="Open the OS folder chooser"><svg viewBox="0 0 24 24"><path d="M3 7a2 2 0 012-2h4l2 2h8a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><path d="M12 11v6M9 14h6"/></svg><span class="nm">Open folder…</span></button>`;
   menu.innerHTML = `${opts}${openRow}<div class="ctxpath"><input type="text" id="ctxdirin" placeholder="~/path/to/repo" aria-label="Folder path" spellcheck="false"><button type="button" class="appopt" id="ctxdiruse" style="width:auto">Use</button></div><div class="ctxmsg" id="ctxdirmsg"></div>`;
 }
-// The worktree checkbox (engine #268). ON — the default, and what every goal has always
-// done — gives each goal its own copy of the repo, so a run cannot leave this folder
-// half-edited. OFF sends worktree:false and the work happens right here, which is what
-// someone means when they want to watch it happen. Sticky per project, like model and
-// effort, because it is a working habit rather than a per-message thought.
+// Workspace mode. isolated worktree is the default clean copy; direct workspace inherits
+// and edits the current folder. Sticky per project, like model and effort, because it is
+// a working habit rather than a per-message thought.
 function worktreeKey(){ return `sel:worktree:${state.active}`; }
 function worktreeOn(){ return localStorage.getItem(worktreeKey()) !== '0'; }
+function workspaceMode(){ return worktreeOn() ? 'isolated-worktree' : 'direct-workspace'; }
+function goalWorkspaceMode(g){ return (g?.workspaceMode === 'direct-workspace' || g?.worktree === false) ? 'direct-workspace' : 'isolated-worktree'; }
+function workspaceModeText(g){ return goalWorkspaceMode(g) === 'direct-workspace' ? 'direct workspace' : 'isolated worktree'; }
 function renderWorktreeChip(){
   const el = $('ctxwt'); if (!el) return;
-  el.setAttribute('aria-checked', worktreeOn() ? 'true' : 'false');
+  const isolated = worktreeOn();
+  const proj = state.projects.find((p) => p.id === state.active);
+  el.setAttribute('aria-checked', isolated ? 'true' : 'false');
+  const label = $('ctxwtlabel');
+  if (label) label.textContent = isolated ? 'isolated worktree' : 'direct workspace';
+  el.title = isolated
+    ? 'isolated worktree: default clean copy; this folder is not edited.'
+    : 'direct workspace: inherits the current state and edits this folder.';
+  const warn = $('ctxworkwarn');
+  if (warn) {
+    const dirty = !isolated && !!proj?.dirty;
+    warn.hidden = !dirty;
+    warn.textContent = dirty ? `Dirty workspace warning: direct workspace will edit ${folderName(proj?.dir) || 'this folder'} as it is now.` : '';
+  }
 }
 // Asked for once, and only when the menu is first opened — the same "only when you look
 // at it" rule the implementation log and the conversation follow.