@galda/cli 0.10.72 → 0.10.74

package/app/index.html

@@ -213,7 +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) */
+  .errbar.ok{background:rgba(var(--green-rgb),.12);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}
@@ -296,21 +296,6 @@
   .ctxseg:hover{color:var(--ink)}   /* glyph colour only — no surface (§5.5) */
   .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}
-  /* 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)}
-  .ctxwt .ctxbox{width:11px;height:11px;flex:0 0 11px;border-radius:3px;border:1px solid var(--ink3);
-    display:inline-block;position:relative;transition:background .12s,border-color .12s}
-  .ctxwt[aria-checked="true"]{color:var(--ink2)}
-  .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
@@ -591,7 +576,8 @@
   .riskfiles{font-family:var(--mono);font-size:10px;color:var(--ink3)}
   /* task 161/162: Review-row quick actions — aligned to the right of the row,
      vertically centered; icon (no emoji) reply; subtle inline reply box. */
-  .revquick{display:flex;gap:4px;flex:0 0 auto;align-items:center;align-self:center;margin-left:8px}
+  .revquick{display:flex;gap:2px;flex:0 0 auto;align-items:center;align-self:center;margin-left:8px;opacity:0;transition:opacity .15s}
+  .task:hover .revquick,.digestrow:hover .revquick,.revquick:focus-within{opacity:1}
   .qbtn{width:26px;height:26px;flex:0 0 26px;border:1px solid var(--hair2);border-radius:7px;background:transparent;cursor:pointer;font-size:12px;line-height:0;display:grid;place-items:center;color:var(--ink2);padding:0}
   .qbtn svg{width:14px;height:14px}
   .qbtn.ok{color:var(--green);border-color:rgba(var(--green-rgb),.4)}
@@ -599,6 +585,15 @@
   .qbtn.no{color:var(--danger);border-color:rgba(var(--danger-rgb),.4)}
   .qbtn.no:hover{background:rgba(var(--danger-rgb),.12)}
   .qbtn:hover{color:var(--ink)}
+  /* Review行だけ: flagshipの .act/.b パターン(枠なし・ホバーで出現・面を塗らずグリフ色のみ) */
+  .revquick .qbtn{border:0;border-radius:6px}
+  .revquick .qbtn.ok{color:var(--ink3);border-color:transparent;background:transparent}
+  .revquick .qbtn.ok:hover{color:var(--green);background:transparent}
+  .revquick .qbtn.no{color:var(--ink3);border-color:transparent;background:transparent}
+  .revquick .qbtn.no:hover{color:var(--danger);background:transparent}
+  .revquick .qbtn.reply{color:var(--ink3)}
+  .revquick .qbtn.reply:hover{color:var(--ink)}
+  .revquick .qbtn:active{transform:scale(.92)}
   .qreplyrow{display:flex;gap:6px;margin-top:8px;width:100%}
   .qreplyrow[hidden]{display:none}
   .qreplyrow input{flex:1;min-width:0;height:30px;border:1px solid var(--hair);border-radius:8px;background:transparent;color:var(--ink);padding:0 10px;font:inherit;font-size:12px}
@@ -1507,15 +1502,6 @@
     background:var(--ink);animation:ccblink 1.05s steps(1) infinite}
   @keyframes ccblink{50%{opacity:0}}
   @media (prefers-reduced-motion:reduce){#fsRoot .cc-caret{animation:none}}
-  /* "→ Added to To Do #NN" — shown quietly in the flow when a turn became a task.
-     Undo appears on hover only (§1.5-10). No filled surface. */
-  #fsRoot .cc-mark{display:flex;align-items:center;gap:8px;font-family:var(--mono);font-size:11px;color:var(--ink3);padding:1px 0}
-  #fsRoot .cc-mark .cm-ar{color:var(--ink2);font-size:12.5px;line-height:1}
-  #fsRoot .cc-mark .cm-t{color:var(--ink2)}
-  #fsRoot .cc-mark .cm-no{color:var(--ink3);font-variant-numeric:tabular-nums}
-  #fsRoot .cc-mark .cm-undo{margin-left:2px;padding:0;border:0;background:none;font:inherit;color:var(--ink3);cursor:pointer;opacity:0;transition:opacity .15s,color .15s}
-  #fsRoot .cc-mark:hover .cm-undo{opacity:1}
-  #fsRoot .cc-mark .cm-undo:hover{color:var(--blue)}
   /* Claude Code CLI language (HANDOFF-v45 §12, flagship .cc-t port): gap:0 — the bullet's
      own margin-right does the spacing, not a flex gap (keeps ⏺ tight against the tool name
      the way the real CLI reads). */
@@ -2134,6 +2120,10 @@
   /* 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}
+  /* Request text is the human's own free-form message (goal #431): it can contain blank
+     lines and numbered lists. esc() already neutralizes HTML, so pre-wrap just keeps the
+     line breaks the person actually typed instead of HTML collapsing them into one line. */
+  .redesign .rbody.rask{white-space:pre-wrap}
   .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}
@@ -2982,13 +2972,8 @@
           <div class="ctxchip ctxbrgrp" id="ctxbrgrp">
             <span class="ctxseg ctxbranch" id="ctxbranch" title="Branch this folder is on">
               <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="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
@@ -3375,8 +3360,20 @@ const savedTheme = (() => {
 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.
+  // Scoped per project (msgByProject) so a skill/mode picked in one project can't leak
+  // into another one just switched to — state.msg is always the CURRENT project's slot;
+  // switching projects must go through setActiveProject(), never a bare state.active = .
   msg: { mode: null, model: null, effort: null, skill: null, later: false, review: false },
+  msgByProject: {},
   stickyModel: localStorage.getItem('sel:model') || 'sonnet', stickyEffort: localStorage.getItem('sel:effort') || 'medium', palette: null };
+state.msgByProject[state.active] = state.msg;
+function emptyMsg(){ return { mode: null, model: null, effort: null, skill: null, later: false, review: false }; }
+function setActiveProject(id){
+  if (id === state.active) return;
+  state.msgByProject[state.active] = state.msg;
+  state.active = id;
+  state.msg = state.msgByProject[id] || (state.msgByProject[id] = emptyMsg());
+}
 window.state = state; // top-level const isn't a window property; external checks probe window.state
 const $ = (id) => document.getElementById(id);
 
@@ -3431,6 +3428,8 @@ const FINISHED = (s) => ['done', 'partial', 'failed', 'interrupted'].includes(s)
 const ICONS = {
   pencil: '<svg viewBox="0 0 24 24"><path d="M4 20l1-4L16.5 4.5a2.1 2.1 0 013 3L8 19l-4 1z"/></svg>',
   reply: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 17l-5-5 5-5"/><path d="M4 12h11a4 4 0 0 1 4 4v3"/></svg>',
+  check: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M5 12.5l4.2 4.2L19 7"/></svg>',
+  close: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round"><path d="M6 6l12 12M18 6L6 18"/></svg>',
   up: '<svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg>',
   down: '<svg viewBox="0 0 24 24"><path d="M12 5v14M5 12l7 7 7-7"/></svg>',
   trash: '<svg viewBox="0 0 24 24"><path d="M4 7h16M9 7V5a1 1 0 011-1h4a1 1 0 011 1v2M6.5 7l1 13h9l1-13M10 11v6M14 11v6"/></svg>',
@@ -3901,10 +3900,13 @@ function tokenBaselinePerRequirementLocal(history){
   return samples.reduce((a, b) => a + b, 0) / samples.length;
 }
 // Mirrors engine/lib.mjs estimateTokenOptimization() — see the comment there
-// for why "saved X%" now compares against a real per-project baseline
-// (basis: 'baseline') instead of always reusing this goal's own cache-hit
-// ratio as a stand-in for "cheaper than usual" (basis: 'cache-weight',
-// used only until there's enough finished-goal history).
+// for why a positive `baseline` percent is only labeled "saved" (basis:
+// 'baseline') when a real technique fired this run (cache reuse, a fresh
+// handoff, /compact, /clear). Without one, the same comparison ships as
+// basis: 'baseline-untied' — a true fact (smaller/larger than usual) but
+// not a claim that anything the user did caused it (Masa 2026-07-26; a
+// small goal right after big ones scored a huge "saved" purely from the
+// size mix). With no history at all it's basis: 'no-baseline' (no number).
 function estimateTokenOptimizationLocal({ usage = null, weightedTokens = null, cacheReadWeight = 0.1, sessionMode = null, usedHandoff = false, usedCompact = false, usedClear = false, agentModel = null, requirementCount = 1, history = [] } = {}){
   const u = usage ?? {};
   const raw = (u.input_tokens ?? 0) + (u.output_tokens ?? 0) + (u.cache_creation_input_tokens ?? 0) + (u.cache_read_input_tokens ?? 0);
@@ -3913,15 +3915,11 @@ function estimateTokenOptimizationLocal({ usage = null, weightedTokens = null, c
   const reqN = Math.max(1, Number(requirementCount) || 1);
   const perReq = weighted / reqN;
   const baseline = tokenBaselinePerRequirementLocal(history);
-  let percent, basis, savedTokens;
+  let percent = null, basis = 'no-baseline', savedTokens = null;
   if (baseline != null) {
     percent = Math.max(-100, Math.min(100, Math.round(((baseline - perReq) / baseline) * 100)));
     basis = 'baseline';
     savedTokens = Math.max(0, Math.round((baseline - perReq) * reqN));
-  } else {
-    savedTokens = Math.max(0, raw - weighted);
-    percent = Math.round((savedTokens / raw) * 100);
-    basis = 'cache-weight';
   }
   const techniques = [];
   const cacheRatio = Math.round(((u.cache_read_input_tokens ?? 0) / raw) * 100);
@@ -3929,8 +3927,10 @@ function estimateTokenOptimizationLocal({ usage = null, weightedTokens = null, c
   if (usedHandoff || sessionMode === 'cold-handoff') techniques.push('fresh handoff instead of a bloated session');
   if (usedCompact || sessionMode === 'compact') techniques.push('/compact before continuing');
   if (usedClear) techniques.push('/clear between unrelated goals');
-  if (agentModel) techniques.push(`${agentModel} for this run`);
+  const techniqueDriven = cacheRatio > 0 || usedHandoff || sessionMode === 'cold-handoff' || usedCompact || sessionMode === 'compact' || usedClear;
+  if (basis === 'baseline' && !techniqueDriven) basis = 'baseline-untied';
   if (basis === 'baseline' && percent > 0) techniques.push(`${Math.round(perReq / 1000)}k tokens/requirement vs your ${Math.round(baseline / 1000)}k average`);
+  if (basis === 'baseline-untied') techniques.push(`${Math.round(perReq / 1000)}k tokens/requirement vs your ${Math.round(baseline / 1000)}k average`);
   if (!techniques.length) techniques.push(`${Math.round(raw / 1000)}k tokens this run (no cache reuse yet)`);
   return { rawTokens: raw, weightedTokens: weighted, savedTokens, percent, basis, techniques: [...new Set(techniques)] };
 }
@@ -3938,6 +3938,10 @@ function tokenOptimizationHtml(opt){
   if (!opt) return '';
   const techniques = opt.techniques?.length ? opt.techniques.slice(0, 4).join(' / ') : 'this run';
   const pct = Number(opt.percent);
+  if (opt.basis === 'baseline-untied') {
+    const dir = pct > 0 ? 'smaller' : 'larger';
+    return `<div class="rvtokenopt">${esc(`Token usage: this run was ${dir} than your recent average (${techniques}) — no cache/compact/handoff technique behind it`)}</div>`;
+  }
   const cmp = opt.basis === 'baseline' ? 'vs your recent average' : 'from prompt caching';
   const text = pct > 0
     ? `Token optimized: saved about ${pct}% ${cmp} (${techniques})`
@@ -3949,7 +3953,7 @@ function renderProjects(){
     const busy = state.tasks.filter((t) => t.projectId === p.id && ['running','queued'].includes(t.status)).length;
     return `<button class="proj ${p.id === state.active ? 'active' : ''}" data-id="${p.id}">${esc(p.name)}${busy ? `<span class="n">${busy}</span>` : ''}</button>`;
   }).join('');
-  for (const b of document.querySelectorAll('.proj')) b.onclick = () => { state.active = b.dataset.id; render(); };
+  for (const b of document.querySelectorAll('.proj')) b.onclick = () => { setActiveProject(b.dataset.id); render(); };
 }
 
 function proofMediaHtml(taskId, proof, altLabel){
@@ -4105,8 +4109,8 @@ function reviewDigestHtml(rows){
         <div class="digestmeta">${testBadge}${prLink}</div>
       </div>
       <div class="revquick">
-        <button type="button" class="qbtn ok" data-qapprove="${ids}" title="Approve">✓</button>
-        <button type="button" class="qbtn no" data-qdismiss="${ids}" title="Send back">✕</button>
+        <button type="button" class="qbtn ok" data-qapprove="${ids}" title="Approve">${ICONS.check}</button>
+        <button type="button" class="qbtn no" data-qdismiss="${ids}" title="Send back">${ICONS.close}</button>
       </div>
     </div>`;
   };
@@ -4372,8 +4376,9 @@ function renderStream(){
     inp.addEventListener('keydown', async (e) => {
       if (e.key !== 'Enter' || e.isComposing || !inp.value.trim()) return;
       const text = inp.value.trim(); inp.value = ''; inp.disabled = true;
-      const r = await fetch(withKey(`/api/goals/${inp.dataset.goal}/reply`), { method: 'POST',
-        headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) });
+      let r; try { r = await fetch(withKey(`/api/goals/${inp.dataset.goal}/reply`), { method: 'POST',
+        headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) }); }
+      catch { showErr('Reply failed — the goal may not have started yet.'); inp.disabled = false; return; }
       if (!r.ok) showErr('Reply failed — the goal may not have started yet.');
       inp.disabled = false;
     });
@@ -4498,18 +4503,22 @@ function renderQueue(){
     const text = document.getElementById(`qedit-${id}`).value.trim();
     const pr = document.getElementById(`qedit-pr-${id}`).dataset.val;
     if (text) {
-      const r = await fetch(withKey(`/api/goals/${id}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text, pr }) });
-      if (r.ok) upsert(state.goals, await r.json());
+      try {
+        const r = await fetch(withKey(`/api/goals/${id}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text, pr }) });
+        if (r.ok) upsert(state.goals, await r.json()); else showErr('Save failed.');
+      } catch { showErr('Save failed.'); }
     }
     state.editing = null; render();
   };
   for (const b of q.querySelectorAll('.qp')) b.onclick = async () => {
-    const r = await fetch(withKey(`/api/goals/${b.dataset.id}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ promote: true }) });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.id}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ promote: true }) }); }
+    catch { showErr('Too late — this goal already started.'); render(); return; }
     if (r.ok) upsert(state.goals, await r.json()); else showErr('Too late — this goal already started.');
     render();
   };
   for (const b of q.querySelectorAll('.qd')) b.onclick = async () => {
-    const r = await fetch(withKey(`/api/goals/${b.dataset.id}`), { method: 'DELETE' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.id}`), { method: 'DELETE' }); }
+    catch { showErr('Too late — this goal already started.'); await refresh(); render(); return; }
     if (r.ok) state.goals = state.goals.filter((g) => g.id !== Number(b.dataset.id));
     else { showErr('Too late — this goal already started.'); await refresh(); }
     render();
@@ -4689,8 +4698,8 @@ function renderTasks(){
      <div class="cond">${g.pr ? `<a class="prbig" href="${esc(g.pr)}" target="_blank">PR #${esc((g.pr.match(/pull\/(\d+)/) ?? [,''])[1])} ↗</a>` : ''}</div>
      <div class="qreplyrow" data-qreplyrow="${g.id}"${state.qreplyOpen.has(g.id) ? '' : ' hidden'}><input type="text" data-qreplyinput="${g.id}" placeholder="直したい点を書いて送信（Todoに戻して再作業）"><button type="button" class="qreplysend" data-qreplysend="${g.id}" aria-label="Send">${ICONS.up}</button></div></div>
      <div class="revquick">
-       <button type="button" class="qbtn ok" data-qapprove="${g.id}" title="Approve">✓</button>
-       <button type="button" class="qbtn no" data-qdismiss="${g.id}" title="Send back">✕</button>
+       <button type="button" class="qbtn ok" data-qapprove="${g.id}" title="Approve">${ICONS.check}</button>
+       <button type="button" class="qbtn no" data-qdismiss="${g.id}" title="Send back">${ICONS.close}</button>
        <button type="button" class="qbtn reply" data-qreply="${g.id}" title="Reply">${ICONS.reply}</button>
      </div></div>`;
   }).join('')
@@ -4724,15 +4733,19 @@ function renderTasks(){
       const id = Number(el.dataset.task);
       const rb = e.target.closest('[data-retrybtn]');
       if (rb) {
-        const r = await fetch(withKey(`/api/tasks/${rb.dataset.retrybtn}/retry`), { method: 'POST' });
-        if (!r.ok) showErr('Retry failed.'); else await refresh();
+        try {
+          const r = await fetch(withKey(`/api/tasks/${rb.dataset.retrybtn}/retry`), { method: 'POST' });
+          if (!r.ok) showErr('Retry failed.'); else await refresh();
+        } catch { showErr('Retry failed.'); }
         return;
       }
       const sb = e.target.closest('[data-skipbtn]');
       if (sb) {
-        const r = await fetch(withKey(`/api/tasks/${sb.dataset.skipbtn}/skip`), { method: 'POST',
-          headers: { 'content-type': 'application/json' }, body: JSON.stringify({ reason: 'Dismissed from Attention.' }) });
-        if (!r.ok) showErr('Dismiss failed.'); else await refresh();
+        try {
+          const r = await fetch(withKey(`/api/tasks/${sb.dataset.skipbtn}/skip`), { method: 'POST',
+            headers: { 'content-type': 'application/json' }, body: JSON.stringify({ reason: 'Dismissed from Attention.' }) });
+          if (!r.ok) showErr('Dismiss failed.'); else await refresh();
+        } catch { showErr('Dismiss failed.'); }
         return;
       }
       // Attention rows open the same detail dialog as Review (tap anywhere but
@@ -4776,11 +4789,13 @@ function renderTasks(){
     b.onclick = async (e) => { e.stopPropagation();
       const bx = b.getBoundingClientRect(); // capture before await/re-render — burst FROM the ✓ button
       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
-      }
+      try {
+        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
+        }
+      } catch { ok = false; }
       if (!ok){ showErr('Approve failed.'); return; }
       await refresh();
       if (mergeGoal){ confirmMerge(mergeGoal); return; } // merge instead of confetti
@@ -4790,19 +4805,24 @@ function renderTasks(){
     // 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}/reject`), { method: 'POST' });
+      let r; try { for (const id of b.dataset.qdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/reject`), { method: 'POST' }); }
+      catch { showErr('Dismiss failed.'); return; }
       qrefresh(r, 'Dismiss failed.'); };
   }
   // Archive: retire an unfinished goal cleanly (no rework spawned). The escape
   // hatch for half-finished (partial/blocked) items so Attention stays drainable.
   for (const b of $('tasklist').querySelectorAll('[data-archivegoal]')) {
     b.onclick = async (e) => { e.stopPropagation();
-      qrefresh(await fetch(withKey(`/api/goals/${b.dataset.archivegoal}/archive`), { method: 'POST' }), 'Archive failed.'); };
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.archivegoal}/archive`), { method: 'POST' }); }
+      catch { showErr('Archive failed.'); return; }
+      qrefresh(r, 'Archive failed.'); };
   }
   // Manager-verified gate: re-run tests + re-capture proof for a blocked goal.
   for (const b of $('tasklist').querySelectorAll('[data-goalreverify]')) {
     b.onclick = async (e) => { e.stopPropagation(); b.disabled = true; b.textContent = '再検証中…';
-      qrefresh(await fetch(withKey(`/api/goals/${b.dataset.goalreverify}/reverify`), { method: 'POST' }), '再検証に失敗'); };
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.goalreverify}/reverify`), { method: 'POST' }); }
+      catch { showErr('再検証に失敗'); return; }
+      qrefresh(r, '再検証に失敗'); };
   }
   for (const b of $('tasklist').querySelectorAll('[data-qreply]')) {
     b.onclick = (e) => { e.stopPropagation();
@@ -4845,14 +4865,16 @@ function renderTasks(){
   for (const b of $('tasklist').querySelectorAll('[data-pstart]')) {
     b.onclick = async (e) => {
       e.stopPropagation();
-      const r = await fetch(withKey(`/api/goals/${b.dataset.pstart}/activate`), { method: 'POST' });
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.pstart}/activate`), { method: 'POST' }); }
+      catch { showErr('Start failed.'); return; }
       if (!r.ok) showErr('Start failed.'); else await refresh();
     };
   }
   for (const b of $('tasklist').querySelectorAll('[data-pdel]')) {
     b.onclick = async (e) => {
       e.stopPropagation();
-      const r = await fetch(withKey(`/api/goals/${b.dataset.pdel}`), { method: 'DELETE' });
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.pdel}`), { method: 'DELETE' }); }
+      catch { showErr('Delete failed.'); return; }
       if (!r.ok) showErr('Delete failed.'); else await refresh();
     };
   }
@@ -4864,13 +4886,15 @@ function renderTasks(){
     e.stopPropagation();
     const preview = b.closest('.goalhead')?.querySelector('.gt')?.textContent || '';
     if (!(await confirmDelete({ title: 'Delete this goal?', preview }))) return;
-    const r = await fetch(withKey(`/api/goals/${b.dataset.ghdel}`), { method: 'DELETE' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.ghdel}`), { method: 'DELETE' }); }
+    catch { showErr('Cannot delete a running/finished goal — reply to append instead'); return; }
     if (!r.ok) showErr('Cannot delete a running/finished goal — reply to append instead'); else await refresh();
   };
   // Smart intake: answer a planner clarifying question (chip or free text) → re-plan.
   const answerQ = async (id, answer) => {
     if (!answer) return;
-    const r = await fetch(withKey(`/api/goals/${id}/answer`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ answer }) });
+    let r; try { r = await fetch(withKey(`/api/goals/${id}/answer`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ answer }) }); }
+    catch { showErr('Failed to send answer'); return; }
     if (!r.ok) showErr('Failed to send answer'); else await refresh();
   };
   for (const b of $('tasklist').querySelectorAll('[data-qanswer]')) b.onclick = (e) => { e.stopPropagation(); answerQ(Number(b.dataset.qanswer), b.dataset.answer); };
@@ -4967,7 +4991,8 @@ function openGoalheadReply(id, btn){
   const snd = document.createElement('button'); snd.className = 'qbtn ok'; snd.textContent = '↑';
   wrap.appendChild(inp); wrap.appendChild(snd); head.insertAdjacentElement('afterend', wrap); inp.focus();
   const send = async () => { const t = inp.value.trim(); if (!t) return;
-    const r = await fetch(withKey(`/api/goals/${id}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text: t })) });
+    let r; try { r = await fetch(withKey(`/api/goals/${id}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text: t })) }); }
+    catch { showErr('未開始のゴールは編集を使ってください'); return; }
     if (!r.ok) showErr('未開始のゴールは編集を使ってください'); await refresh(); };
   inp.onkeydown = (e) => { if (e.key === 'Enter' && !e.isComposing) { e.preventDefault(); send(); } if (e.key === 'Escape') wrap.remove(); };
   snd.onclick = send;
@@ -4990,9 +5015,11 @@ function wirePriority(){
     b.onclick = async (e) => {
       e.stopPropagation();
       b.closest('.priomenu')?.classList.remove('show');
-      const r = await fetch(withKey(`/api/tasks/${b.dataset.priotask}/priority`), { method: 'PUT',
-        headers: { 'content-type': 'application/json' }, body: JSON.stringify({ priority: b.dataset.val }) });
-      if (!r.ok) showErr('優先度の変更に失敗しました。'); else await refresh();
+      try {
+        const r = await fetch(withKey(`/api/tasks/${b.dataset.priotask}/priority`), { method: 'PUT',
+          headers: { 'content-type': 'application/json' }, body: JSON.stringify({ priority: b.dataset.val }) });
+        if (!r.ok) showErr('優先度の変更に失敗しました。'); else await refresh();
+      } catch { showErr('優先度の変更に失敗しました。'); }
     };
   }
 }
@@ -5188,26 +5215,31 @@ $('wfHeaderEdit').onclick = (e) => { e.stopPropagation(); openWfEditor(); };
 $('wfoverlay').addEventListener('click', (e) => { if (e.target === $('wfoverlay')) $('wfoverlay').classList.remove('show'); });
 $('wfsave').onclick = async () => {
   const columns = state.wfDraft.map((c) => ({ key: c.key, label: c.label.trim(), bucket: c.bucket }));
-  const r = await fetch(withKey(`/api/projects/${state.active}/columns`), { method: 'PUT',
-    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ columns }) });
-  const data = await r.json().catch(() => ({}));
-  if (!r.ok) {
-    $('wferr').textContent = data.error || 'Save failed.';
-    $('wferr').style.display = 'block';
-    return;
-  }
-  const rdr = await fetch(withKey(`/api/projects/${state.active}/review-definition`), { method: 'PUT',
-    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ reviewDefinition: state.rdDraft }) });
-  const rdData = await rdr.json().catch(() => ({}));
-  if (!rdr.ok) {
-    $('wferr').textContent = rdData.error || 'Save failed.';
+  try {
+    const r = await fetch(withKey(`/api/projects/${state.active}/columns`), { method: 'PUT',
+      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ columns }) });
+    const data = await r.json().catch(() => ({}));
+    if (!r.ok) {
+      $('wferr').textContent = data.error || 'Save failed.';
+      $('wferr').style.display = 'block';
+      return;
+    }
+    const rdr = await fetch(withKey(`/api/projects/${state.active}/review-definition`), { method: 'PUT',
+      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ reviewDefinition: state.rdDraft }) });
+    const rdData = await rdr.json().catch(() => ({}));
+    if (!rdr.ok) {
+      $('wferr').textContent = rdData.error || 'Save failed.';
+      $('wferr').style.display = 'block';
+      return;
+    }
+    state.workflowColumns[state.active] = data.columns;
+    state.reviewDefinitions[state.active] = rdData.reviewDefinition;
+    $('wfoverlay').classList.remove('show');
+    render();
+  } catch {
+    $('wferr').textContent = 'Save failed.';
     $('wferr').style.display = 'block';
-    return;
   }
-  state.workflowColumns[state.active] = data.columns;
-  state.reviewDefinitions[state.active] = rdData.reviewDefinition;
-  $('wfoverlay').classList.remove('show');
-  render();
 };
 
 function wireWfEditButtons(){
@@ -5432,7 +5464,8 @@ function renderReviewChecklist(){
       e.stopPropagation();
       b.disabled = true;
       b.textContent = '再検証中…';
-      const r = await fetch(withKey(`/api/goals/${b.dataset.goalreverify}/reverify`), { method: 'POST' });
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.goalreverify}/reverify`), { method: 'POST' }); }
+      catch { showErr('再検証に失敗'); b.disabled = false; return; }
       if (r.ok) await refresh(); else showErr('再検証に失敗');
     };
   }
@@ -5444,9 +5477,10 @@ function renderReviewChecklist(){
       if (!text) return;
       const t = reqs.find((r) => r.id === taskId);
       b.disabled = true; input.disabled = true;
-      const r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST',
+      let r; try { r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST',
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify(replyWorkerPayload({ text: `[Fix request for requirement #${t?.num ?? ''} "${t?.title ?? ''}"] ${text}` })) });
+        body: JSON.stringify(replyWorkerPayload({ text: `[Fix request for requirement #${t?.num ?? ''} "${t?.title ?? ''}"] ${text}` })) }); }
+      catch { showErr('Failed to send the fix request.'); b.disabled = false; input.disabled = false; return; }
       if (r.ok) { input.value = ''; input.placeholder = 'Sent — the worker will pick it up'; }
       else showErr('Failed to send the fix request.');
       b.disabled = false; input.disabled = false;
@@ -6367,7 +6401,7 @@ function renderFsRail(){
   el.innerHTML = html;
   for (const b of el.querySelectorAll('[data-fsproj]')) b.onclick = (e) => {
     if (e.target.closest('.pname.editing') || b.querySelector('.pname.editing')) return;
-    state.active = b.dataset.fsproj; document.body.classList.remove('projectsopen'); render();
+    setActiveProject(b.dataset.fsproj); document.body.classList.remove('projectsopen'); render();
   };
   const add = $('fsProjAdd'); if (add) add.onclick = createProject;
 }
@@ -6538,11 +6572,6 @@ function renderFsFeed(){
     let t = '';
     if (turn.role === 'you') {
       t += `<div class="cc-you"><span class="cy-n">You</span><div class="cy-t">${esc(turn.text)}</div></div>`;
-      if (turn.markGoalId != null && !turn.undone) {
-        const mg = state.goals.find((x) => x.id === turn.markGoalId);
-        const n = mg ? goalReviewNumber({ goal: mg, tasks: state.tasks }) : turn.markGoalId;
-        t += `<div class="cc-mark"><span class="cm-ar">→</span><span class="cm-t">Added to To Do</span><span class="cm-no">#${n}</span><button class="cm-undo" type="button" data-ccundo="${turn.markGoalId}">Undo</button></div>`;
-      }
     } else { // Claude Code reply — speaker line first (You → speaker → reply), then the text
       const app = connectedAppMeta(turn.agent);
       t += `<div class="cc-who">${app.icon}<span class="cs-n">${esc(app.label)}</span></div>`;
@@ -6595,24 +6624,12 @@ function renderFsFeed(){
   // Delete a "needs your answer" card outright (restores 「Needs your answer」カードを削除
   // できるように — a question you don't want to answer had no discard path in flagship).
   for (const b of feed.querySelectorAll('[data-fsanswerdel]')) b.onclick = (e) => { e.stopPropagation(); fsTaskDelete(Number(b.dataset.fsanswerdel)); };
-  // Pattern A (H23): Undo a "→ Added to To Do" marker — cancel the created goal
-  // and drop the mark. A just-created (planning) goal is deletable; if it already
-  // started the server returns non-OK (canDeleteGoal) and we say so quietly.
-  for (const b of feed.querySelectorAll('[data-ccundo]')) b.onclick = async (e) => {
-    e.stopPropagation();
-    const gid = Number(b.dataset.ccundo);
-    const r = await fetch(withKey(`/api/goals/${gid}`), { method: 'DELETE' });
-    if (!r.ok) { showErr('Could not undo — the task may already be running'); return; }
-    const turn = (state.chatTurns[state.active] || []).find((t) => t.markGoalId === gid);
-    if (turn) turn.undone = true;
-    state.goals = state.goals.filter((g) => g.id !== gid);
-    render();
-  };
 }
 async function fsAnswerQuestion(goalId, answer){
   if (!answer) return;
-  const r = await fetch(withKey(`/api/goals/${goalId}/answer`), { method: 'POST',
-    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ answer }) });
+  let r; try { r = await fetch(withKey(`/api/goals/${goalId}/answer`), { method: 'POST',
+    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ answer }) }); }
+  catch { showErr('Failed to send answer'); return; }
   if (!r.ok) showErr('Failed to send answer'); else await refresh();
 }
 async function fsRetryTask(id){
@@ -6989,17 +7006,20 @@ function renderFsReview(){
   // "Also carries" section (saItemHtml + the seeall handler).
   for (const b of el.querySelectorAll('[data-fsapprove]')) b.onclick = async (e) => { e.stopPropagation();
     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
-    }
+    try {
+      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
+      }
+    } catch { ok = false; }
     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();
     // 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' });
+    let r; try { for (const id of b.dataset.fsdismiss.split(',')) r = await fetch(withKey(`/api/goals/${id}/reject`), { method: 'POST' }); }
+    catch { showErr('Dismiss failed.'); return; }
     if (r && r.ok) await refresh(); else showErr('Dismiss failed.'); };
 }
 // Shared To Do bucketing (list rows AND the kanban board read the same groups —
@@ -7290,14 +7310,16 @@ function renderFsTodo(){
     if (Number.isFinite(id)) fsOpenGoalDetail(id);
   };
   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' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsreopen}/reopen`), { method: 'POST' }); }
+    catch { showErr('Reopen failed.'); return; }
     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' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsrejdel}/revert`), { method: 'POST' }); }
+    catch { showErr('Delete failed.'); return; }
     if (!r.ok) showErr('Delete failed.'); else await refresh(); };
   const more = el.querySelector('#fsTodoMore');
   if (more) more.onclick = () => { fsUI.todoMore = !fsUI.todoMore; renderFsTodo(); };
@@ -7316,45 +7338,53 @@ function renderFsTodo(){
   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 () => {
     b.disabled = true; b.textContent = 'Starting…';
-    const r = await fetch(withKey(`/api/goals/${b.dataset.fsreverify}/reverify`), { method: 'POST' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsreverify}/reverify`), { method: 'POST' }); }
+    catch { showErr(document.documentElement.lang === 'ja' ? 'Retryに失敗しました' : 'Retry failed.'); b.disabled = false; b.textContent = 'Retry'; return; }
     if (!r.ok) { showErr(document.documentElement.lang === 'ja' ? 'Retryに失敗しました' : 'Retry failed.'); b.disabled = false; b.textContent = 'Retry'; }
     else await refresh();
   };
   for (const b of el.querySelectorAll('[data-fsarchive]')) b.onclick = async () => {
-    const r = await fetch(withKey(`/api/goals/${b.dataset.fsarchive}/archive`), { method: 'POST' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsarchive}/archive`), { method: 'POST' }); }
+    catch { showErr('Archive failed.'); return; }
     if (!r.ok) showErr('Archive failed.'); else await refresh();
   };
   // LATER row actions (PRD §8.2): Start queues the shelved goal, Delete discards it.
   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' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fspstart}/activate`), { method: 'POST' }); }
+    catch { showErr('Start failed.'); return; }
     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' });
+    let r; try { r = await fetch(withKey(`/api/goals/${startNextLater.dataset.fsstartnextlater}/activate`), { method: 'POST' }); }
+    catch { showErr(document.documentElement.lang === 'ja' ? '開始できませんでした' : 'Could not start the next item.'); startNextLater.disabled = false; return; }
     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;
-    const r = await fetch(withKey(`/api/goals/${b.dataset.fspdel}`), { method: 'DELETE' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fspdel}`), { method: 'DELETE' }); }
+    catch { showErr('Delete failed.'); return; }
     if (!r.ok) showErr('Delete failed.'); else await refresh(); };
   // hover-toolbar actions → same endpoints as the SL1 goalhead toolbar
   for (const b of el.querySelectorAll('[data-fsreply]')) b.onclick = (e) => { e.stopPropagation();
     fsInlineInput(b.closest('.trow'), '', 'Reply to this goal…', async (text) => {
-      const r = await fetch(withKey(`/api/goals/${b.dataset.fsreply}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) });
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsreply}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) }); }
+      catch { showErr('未開始のゴールは編集を使ってください'); return; }
       if (!r.ok) showErr('未開始のゴールは編集を使ってください'); await refresh();
     }); };
   for (const b of el.querySelectorAll('[data-fsedit]')) b.onclick = (e) => { e.stopPropagation();
     const g = state.goals.find((x) => x.id === Number(b.dataset.fsedit));
     fsInlineInput(b.closest('.trow'), g?.text ?? '', 'Edit the goal…', async (text) => {
-      const r = await fetch(withKey(`/api/goals/${b.dataset.fsedit}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
+      let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsedit}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) }); }
+      catch { showErr('Cannot edit a running/finished goal — reply to append instead'); return; }
       if (!r.ok) showErr('Cannot edit a running/finished goal — reply to append instead'); await refresh();
     }); };
   for (const b of el.querySelectorAll('[data-fsdel]')) b.onclick = async (e) => { e.stopPropagation();
     const preview = b.closest('.trow')?.querySelector('.tt')?.textContent || '';
     if (!(await confirmDelete({ title: 'Delete this goal?', preview }))) return;
-    const r = await fetch(withKey(`/api/goals/${b.dataset.fsdel}`), { method: 'DELETE' });
+    let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fsdel}`), { method: 'DELETE' }); }
+    catch { showErr('Cannot delete a running/finished goal — reply to append instead'); return; }
     if (!r.ok) showErr('Cannot delete a running/finished goal — reply to append instead'); else await refresh(); };
 }
 async function fsCreateGoal(text, pending){
@@ -7472,7 +7502,7 @@ async function createProject(){
     if (!r.ok) throw new Error();
     const body = await r.json();
     state.projects = body.projects ?? [...state.projects, body.project].filter(Boolean);
-    state.active = body.project.id;
+    setActiveProject(body.project.id);
     document.body.classList.remove('projectsopen');
     render();
   } catch { showErr('New project failed.'); }
@@ -7504,7 +7534,7 @@ async function deleteProject(p){
     const body = await r.json().catch(() => ({}));
     if (!r.ok) throw new Error(body.error || 'Delete project failed.');
     state.projects = body.projects ?? state.projects.filter((x) => x.id !== p.id);
-    if (state.active === p.id) state.active = state.projects[0]?.id ?? state.active;
+    if (state.active === p.id) setActiveProject(state.projects[0]?.id ?? state.active);
     document.body.classList.remove('projectsopen');
     render();
   } catch (err) {
@@ -7539,21 +7569,24 @@ $('fsProjects').addEventListener('dblclick', (e) => {
 async function fsTaskRename(span, goalId){
   if (!goalId) return;
   inlineFsRename(span, async (v) => {
-    const r = await fetch(withKey(`/api/goals/${goalId}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: v }) });
+    let r; try { r = await fetch(withKey(`/api/goals/${goalId}`), { method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: v }) }); }
+    catch { showErr('Cannot rename a running/finished goal — reply to append instead'); return; }
     if (!r.ok) showErr('Cannot rename a running/finished goal — reply to append instead');
     await refresh();
   });
 }
 async function fsTaskArchive(goalId){
   if (!goalId) return;
-  const r = await fetch(withKey(`/api/goals/${goalId}/archive`), { method: 'POST' });
+  let r; try { r = await fetch(withKey(`/api/goals/${goalId}/archive`), { method: 'POST' }); }
+  catch { showErr('Archive failed.'); return; }
   if (!r.ok) showErr('Archive failed.'); else await refresh();
 }
 async function fsTaskDelete(goalId){
   if (!goalId) return;
   const preview = state.goals.find((x) => x.id === goalId)?.text || '';
   if (!(await confirmDelete({ title: 'Delete this goal?', preview }))) return;
-  const r = await fetch(withKey(`/api/goals/${goalId}`), { method: 'DELETE' });
+  let r; try { r = await fetch(withKey(`/api/goals/${goalId}`), { method: 'DELETE' }); }
+  catch { showErr('Cannot delete a running/finished goal — reply to append instead'); return; }
   if (!r.ok) showErr('Cannot delete a running/finished goal — reply to append instead'); else await refresh();
 }
 $('fsTodoSec').addEventListener('contextmenu', (e) => {
@@ -7587,7 +7620,7 @@ function fsSwitcherOpen(){
 function fsSwitcherHi(){ [...fsCtx.querySelectorAll('button')].forEach((b, i) => b.classList.toggle('hi', i === fsCtxSel)); }
 function fsSelectProjByIndex(idx){
   const rows = [...document.querySelectorAll('#fsProjects .fsproj')]; if (idx < 0 || idx >= rows.length) return;
-  state.active = rows[idx].dataset.fsproj; render();
+  setActiveProject(rows[idx].dataset.fsproj); render();
 }
 document.addEventListener('keydown', (e) => {
   if (fsCtx.classList.contains('open') && fsCtxSwitcher) {
@@ -8327,7 +8360,7 @@ async function refresh(){
     state.workflowColumns = s.workflowColumns ?? {};
     state.reviewDefinitions = s.reviewDefinitions ?? {};
     checkUiVersion(s.uiVersion);
-    if (!state.projects.some((p) => p.id === state.active)) state.active = state.projects[0]?.id;
+    if (!state.projects.some((p) => p.id === state.active)) setActiveProject(state.projects[0]?.id);
     render();
   } catch { /* server briefly down; SSE reconnect will retry */ }
 }
@@ -8337,9 +8370,12 @@ async function refresh(){
 // events — especially worker activity — don't saturate the main thread and drop
 // keystrokes while typing.
 let _renderT = null, _renderP = false;
-function scheduleRender(){ if (_renderT) { _renderP = true; return; } render(); _renderT = setTimeout(() => { _renderT = null; if (_renderP) { _renderP = false; scheduleRender(); } }, 120); }
+// A thrown render() must not stall the throttle loop for good (live feed freeze,
+// e.g. on review reply) — catch it, log it, and keep scheduling so the next SSE
+// event still gets a paint attempt.
+function scheduleRender(){ if (_renderT) { _renderP = true; return; } try { render(); } catch (e) { console.error('[render]', e); } _renderT = setTimeout(() => { _renderT = null; if (_renderP) { _renderP = false; scheduleRender(); } }, 120); }
 let _actT = null, _actP = false;
-function scheduleActRender(){ if (_actT) { _actP = true; return; } renderActPanel(); if (state.layout === 'flagship') renderFsFeed(); _actT = setTimeout(() => { _actT = null; if (_actP) { _actP = false; scheduleActRender(); } }, 200); }
+function scheduleActRender(){ if (_actT) { _actP = true; return; } try { renderActPanel(); if (state.layout === 'flagship') renderFsFeed(); } catch (e) { console.error('[actRender]', e); } _actT = setTimeout(() => { _actT = null; if (_actP) { _actP = false; scheduleActRender(); } }, 200); }
 // (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)
@@ -8412,7 +8448,7 @@ function connectSSE(){
     else if (m.ev === 'review-definition') state.reviewDefinitions[m.projectId] = m.reviewDefinition;
     else if (m.ev === 'projects') {
       state.projects = m.projects ?? state.projects;
-      if (!state.projects.some((p) => p.id === state.active)) state.active = state.projects[0]?.id;
+      if (!state.projects.some((p) => p.id === state.active)) setActiveProject(state.projects[0]?.id);
     }
     else if (m.ev === 'ping') { checkUiVersion(m.uiVersion); return; }
     else if (m.ev === 'auth') { renderAuthBanner(m.auth); return; } // selected worker's sign-in preflight result
@@ -8448,7 +8484,7 @@ function bootDisconnected(info){
   applyTheme(); applyCust();
   // seed a minimal board so it renders like the real empty state
   state.projects = [{ id: '__onboard', name: 'Your project' }];
-  state.active = '__onboard';
+  setActiveProject('__onboard');
   state.billing = { licensed: false, email };
   try { render(); } catch (e) { console.warn('disconnected render', e); }
   const heroSpan = document.querySelector('#fsClawdHero .hstat');
@@ -8664,15 +8700,6 @@ async function postOutboxItem(item){
     outbox.land(item.oid, goal.id);
     upsert(state.goals, goal);
     if (recentlySignedOut && !state.billing?.licensed) { recentlySignedOut = false; showSignInNudge(); }
-    // Pattern A (H23): this send became a real To-Do — mark the most recent
-    // unmarked user turn "→ Added to To Do #NN" in the feed. Skip a needsInput
-    // goal (it's still asking; shown as the question card at the feed bottom).
-    if (goal.status !== 'needsInput') {
-      const turns = state.chatTurns[item.projectId] || [];
-      for (let k = turns.length - 1; k >= 0; k--) {
-        if (turns[k].role === 'you' && turns[k].markGoalId == null) { turns[k].markGoalId = goal.id; break; }
-      }
-    }
   } catch {
     outbox.mark(item.oid, 'unsent');
   } finally {
@@ -8887,16 +8914,13 @@ async function send(){
     projectId: state.active, text, pr: 'auto', model, effort, agent: state.connectedApp,
     mode, skill: skill || null,
     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),
     status: 'sending', ts: Date.now(),
   };
   outbox.add(item); // saved locally BEFORE any network call
   // Pattern A (H23): the user's own turn enters the center feed immediately, so
-  // the composer reads like a conversation. If this send becomes a To-Do, a
-  // .cc-mark is attached to this turn later; if it's chat, a reply turn follows.
+  // the composer reads like a conversation; if it's chat, a reply turn follows.
   (state.chatTurns[state.active] ||= []).push({ role: 'you', text, ts: Date.now() });
   state.attach = [];
   // mode/skill/later/review are per-message → clear after send (model stays sticky).
@@ -9025,9 +9049,12 @@ function renderSummaryPera(){
   body.querySelector('[data-peradetail]') && (body.querySelector('[data-peradetail]').onclick = () => { state.peraDetailOpen = !state.peraDetailOpen; renderSummaryPera(); });
 }
 async function peraAct(ids, kind){
-  for (const id of String(ids).split(',')) {
-    await fetch(withKey(`/api/goals/${id}/${kind}`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: kind === 'dismiss' ? JSON.stringify({ text: '' }) : undefined });
-  }
+  try {
+    for (const id of String(ids).split(',')) {
+      const r = await fetch(withKey(`/api/goals/${id}/${kind}`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: kind === 'dismiss' ? JSON.stringify({ text: '' }) : undefined });
+      if (!r.ok) throw new Error();
+    }
+  } catch { showErr(kind === 'approve' ? 'Approve failed.' : 'Dismiss failed.'); return; }
   if (kind === 'approve') celebrateApprove(); // confetti from the ペライチ too
   state.peraSpot = 0;
   await refresh();
@@ -9145,6 +9172,7 @@ function saRowFromDigest(r, gs, ts){
       goalText: String(g?.text ?? '').replace(/\s+/g, ' ').trim(),
       did, siblings, risk: g?.risk ?? null,
       verificationInfraError: g?.verificationInfraError ?? r.verificationInfraError ?? null,
+      prNote: g?.prNote ?? 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
@@ -9593,7 +9621,8 @@ function saItemHtml(it, i){
   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>`);
+  const tokUntied = it.tokenOpt?.basis === 'baseline-untied';
+  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">${tokUntied ? 'smaller' : '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>`);
@@ -9609,7 +9638,7 @@ function saItemHtml(it, i){
   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 tokCmp = tokUntied ? 'vs your recent average (no technique behind it)' : 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>` : '';
   // §1.5-3: with Open it moved into the body, a card with no PR / tokens / tests has no
@@ -9726,6 +9755,15 @@ function saItemHtml(it, i){
   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>`
     : '';
+  // ── PR-requested-but-no-code note (goal #751, Masa 2026-07-26): a wantsPR goal whose
+  // worker ended with zero changed files and no proof — most often a lane-conflict
+  // report ("空き次第自動再開します") that could not actually resume, since a `claude -p`
+  // run is one-shot. Advisory only (isNothingVerifiableForPR never blocks — Failedを作ら
+  // ない方針を尊重), so the reviewer sees it and decides instead of it silently reading
+  // as a normal completed PR review. ──
+  const prNoteHtml = it.prNote
+    ? `<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>${esc(it.prNote)}</div>`
+    : '';
   // ── 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
@@ -9817,6 +9855,7 @@ function saItemHtml(it, i){
     ${S('Proof', proofInner)}
     ${S('What changed', changedBody)}
     ${riskHtml}
+    ${prNoteHtml}
     ${conversationSec}
     ${activitySec}
     ${S('Workflow', saWorkflowHtml(it))}
@@ -10072,13 +10111,32 @@ function saMoveFeedbackOutOfReview(it, body){
   if (task?.id) upsert(state.tasks, task);
   const at = SA.items.findIndex((row) => row.goalId === it.goalId);
   const next = at >= 0 ? (SA.items[at + 1] || SA.items[at - 1]) : null;
+  // Was the reviewer actually looking at the card that just left Review (vs having already
+  // scrolled past it to read another one)? If it's fully above the visible scroll area, the
+  // reviewer is reading something else — snapping the view to the next card's top would yank
+  // it out from under them (Masa 2026-07-26: replying to the card above and having the one
+  // you're reading jump to the top was reported as stressful).
+  const bodyEl = document.querySelector('#seeall .sa-body');
+  const cardEl = saCardEl(it.goalId);
+  const priorScrollTop = bodyEl?.scrollTop ?? 0;
+  const removedHeight = cardEl ? cardEl.getBoundingClientRect().height : 0;
+  const cardAboveViewport = !!(cardEl && bodyEl && cardEl.getBoundingClientRect().bottom <= bodyEl.getBoundingClientRect().top + 1);
   if (at >= 0) SA.items.splice(at, 1);
   render();
   if (SA.solo === it.goalId || !SA.items.length) { saRender(); saClose(); return; }
   SA.cur = next?.goalId ?? SA.items[0]?.goalId ?? null;
-  SA.focusGid = SA.cur;
-  SA.focusScrolled = false;
-  saRender();
+  if (cardAboveViewport) {
+    // Keep reading where we were: compensate for the removed card's height instead of
+    // forcing a scroll-to-top of whatever is now "current".
+    SA.focusGid = null;
+    saRender();
+    const newBody = document.querySelector('#seeall .sa-body');
+    if (newBody) newBody.scrollTop = Math.max(0, priorScrollTop - removedHeight);
+  } else {
+    SA.focusGid = SA.cur;
+    SA.focusScrolled = false;
+    saRender();
+  }
 }
 function saCardEl(goalId){ return document.querySelector(`#seeall .sa-item[data-gid="${goalId}"]`); }
 // Flip one card to its "Working on it" head without redrawing anything else (決定2).
@@ -10262,7 +10320,8 @@ $('seeall').addEventListener('click', async (e) => {
   // SA.items[i] lookup below.
   if (k === 'foldopen') return openReviewChecklist(Number(v));
   if (k === 'foldundo') {
-    const r = await fetch(withKey(`/api/goals/${v}/unfold`), { method: 'POST' });
+    let r; try { r = await fetch(withKey(`/api/goals/${v}/unfold`), { method: 'POST' }); }
+    catch { showErr('Undo failed.'); return; }
     if (r && r.ok) await refresh(); else showErr('Undo failed.');
     return;
   }
@@ -10275,7 +10334,8 @@ $('seeall').addEventListener('click', async (e) => {
   if (k === 'reverify') {
     b.disabled = true;
     b.textContent = '再検証中…';
-    const r = await fetch(withKey(`/api/goals/${it.goalId}/reverify`), { method: 'POST' });
+    let r; try { r = await fetch(withKey(`/api/goals/${it.goalId}/reverify`), { method: 'POST' }); }
+    catch { showErr('再検証に失敗'); b.disabled = false; return; }
     if (r.ok) await refresh(); else showErr('再検証に失敗');
     return;
   }
@@ -10460,7 +10520,6 @@ function renderCtxBar(){
   const grp = $('ctxbrgrp');
   if (grp) grp.style.display = branch ? '' : 'none';
   const bn = $('ctxbranchname'); if (bn) bn.textContent = branch;
-  renderWorktreeChip();
   const menu = $('ctxdirmenu'); if (!menu) return;
   const cur = dir;
   const opts = (state.repos ?? [])
@@ -10472,31 +10531,12 @@ 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>`;
 }
-// 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;
-  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.` : '';
-  }
-}
+// Workspace mode is fixed to the isolated worktree (clean separate checkout). The
+// direct-workspace escape hatch was removed after two accidents where a stray click
+// edited a shared checkout directly; there was no real upside to keep it around for.
+function workspaceMode(){ return 'isolated-worktree'; }
+function goalWorkspaceMode(){ return 'isolated-worktree'; }
+function workspaceModeText(){ return 'isolated worktree'; }
 // 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.
 async function loadRepos(){
@@ -10557,11 +10597,6 @@ $('ctxdirbtn').onclick = (e) => {
   menu.classList.toggle('show');
   if (opening) { renderCtxBar(); loadRepos(); }   // no-op once boot's fetch has landed
 };
-$('ctxwt').onclick = (e) => {
-  e.stopPropagation();
-  localStorage.setItem(worktreeKey(), worktreeOn() ? '0' : '1');
-  renderWorktreeChip();
-};
 $('ctxdirmenu').addEventListener('click', (e) => {
   e.stopPropagation();
   if (e.target.closest('#ctxopenfolder')) { openFolderNative(); return; }
@@ -11710,6 +11745,7 @@ function buildGearPop(){
       if (!(await confirmDelete({ title: 'Log out of Google?', body: 'You can sign back in anytime.', confirmLabel: 'Log out', confirmDanger: false }))) return;
       signOutBtn.disabled = true;
       try { await fetch(withKey('/api/signout'), { method: 'POST' }); recentlySignedOut = true; }
+      catch {}
       finally { await refresh(); if ($('gearPop')) buildGearPop(); }
     };
     const rulesBtn = pop.querySelector('[data-grules]');