@galda/cli 0.10.40 → 0.10.41

package/app/index.html

@@ -267,6 +267,57 @@
   .appmenu{position:absolute;left:0;bottom:calc(100% + 6px);min-width:150px;background:var(--surface);border:1px solid var(--hair2);
     border-radius:10px;padding:4px;display:none;flex-direction:column;gap:1px;box-shadow:0 10px 28px rgba(0,0,0,.5);z-index:50}
   .appmenu.show{display:flex}
+  /* Context row — the Claude app's shape: separate chips above the box. The chips are
+     the composer's OWN control grammar (.appbtn: 26px tall, r8, 1px --hair, transparent,
+     11.5px, --ink2), because one input box must not have two chip languages above and
+     below it (§1.5 器を増やさない／§5.5 面の処理はパネル全体に均一). Strength comes from
+     the TEXT — only the repo name is 600/--ink — never from a louder container.
+     CDO handoff 2026-07-23 §A1. `var(--chipbg)` is gone on purpose: it is declared inside
+     .gearpop{}, so out here it was invalid at computed-value time and fell back to
+     transparent — measured rgba(0,0,0,0). The chips were never filled to begin with. */
+  .ctxbar{display:flex;align-items:center;gap:6px;padding:0 2px 7px;background:none;border:0}
+  .ctxchip{display:inline-flex;align-items:center;height:26px;padding:0;gap:0;border-radius:8px;
+    border:1px solid var(--hair);background:transparent;position:relative;min-width:0}
+  .ctxsel{position:relative}
+  .ctxseg{display:inline-flex;align-items:center;gap:6px;height:24px;padding:0 8px;border-radius:7px;
+    color:var(--ink2);font-size:11.5px;cursor:pointer;transition:color .12s;white-space:nowrap;
+    min-width:0;border:0;background:transparent}
+  .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}
+  /* 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,
+     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)}
+  .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
+     identical (~/agent-manager vs ~/am-wt-kanban/agent-manager), so every row carries the
+     path underneath. Same container as every other menu — .appmenu/.appopt (§A2). */
+  .ctxmenu .appopt{height:auto;flex-direction:column;align-items:stretch;gap:1px;padding:6px 8px;
+    font-family:var(--ui);font-size:12px}
+  .ctxmenu .appopt .nm{color:var(--ink);font-size:12px;line-height:1.35}
+  .ctxmenu .appopt:not(.active) .nm{color:var(--ink2)}
+  /* direction:rtl keeps the END of the path (where repos differ) and drops the head.
+     The row text starts with a LRM — an RLO would render the path itself reversed. */
+  .ctxmenu .appopt .pt{font-family:var(--mono);font-size:10px;color:var(--ink3);line-height:1.4;
+    overflow:hidden;text-overflow:ellipsis;white-space:nowrap;direction:rtl;text-align:left;unicode-bidi:plaintext}
+  .ctxmenu .ctxpath{display:flex;gap:5px;padding:5px 4px 2px;border-top:1px solid var(--hair);margin-top:3px}
+  .ctxmenu .ctxpath input{flex:1;min-width:0;height:26px;padding:0 8px;border-radius:6px;border:1px solid var(--hair2);
+    background:var(--chipbg);color:var(--ink);font-family:var(--mono);font-size:11px;outline:none}
+  .ctxmenu .ctxpath input:focus{border-color:var(--blue)}
+  .ctxmenu .ctxmsg{padding:2px 5px 3px;font-size:11px;color:var(--ink3)}
+  .ctxmenu .ctxmsg:empty{display:none}
+  .ctxmenu .ctxmsg.bad{color:var(--danger)}
   .appopt{display:flex;align-items:center;gap:7px;height:28px;padding:0 8px;border:0;border-radius:6px;background:transparent;
     color:var(--ink2);font:inherit;font-size:12px;cursor:pointer;text-align:left;width:100%}
   .appopt:hover{background:rgba(var(--tint),.06);color:var(--ink)}
@@ -408,6 +459,14 @@
   .qansrow{display:flex;gap:7px;align-items:center;margin-top:8px}
   .qansrow input{flex:1;background:var(--glass);border:1px solid var(--hair2);border-radius:8px;color:var(--ink);font-size:12.5px;padding:6px 10px;outline:none}
   .qsub{font-size:10.5px;color:var(--ink3);margin-top:7px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+  /* The one line under a reply box: what the AI asked back, or the answer it gave.
+     Same part as .qsub, but an answer is a sentence — it must wrap, not ellipsis. */
+  /* The reply box's own short thread (CDO HANDOFF-REPLY-CONVERSATION §2/§5). It uses
+     the card's .txr You/Claude rows, so it needs .qsub's single-line truncation OFF —
+     scoped here, since every other .qsub stays a one-liner. */
+  .replynote{white-space:normal;overflow:visible;margin-top:14px;padding-top:12px;border-top:1px solid var(--hair)}
+  .replynote .qchips{margin-top:6px}
+  .replynote .txr.note .m{color:var(--ink3)}
   .ob-unsent{color:rgb(var(--danger-rgb));cursor:pointer}
   [data-oresend]{cursor:pointer}
   .chip2{font-family:var(--mono);font-size:9.5px;letter-spacing:.05em;padding:2px 7px;border-radius:6px;border:1px solid var(--hair2);color:var(--ink3);flex:0 0 auto}
@@ -2133,6 +2192,23 @@
   /* Manager's own progress notes inside the implementation log: commentary, not results.
      Green would read as "passed" (§5.5 UIクロームは薄く・優しく・主張しない). */
   .redesign .txr.note .m{font-family:var(--mono);font-size:12px;color:var(--ink3)}
+  /* Conversation (ONE-CONVERSATION §1.1): the same transcript rows, so several
+     entrances read as ONE column — no second box, no bubbles (§1.5-1 器を増やさない).
+     Where a line was said is a hairline-quiet label, never a chip: it is context for
+     the sentence, not a category of its own (§5.5 薄い要素も見えるが騒がない). */
+  /* The entrance is CONTEXT for a sentence, not a category of it — so it is not a column
+     (CDO handoff 2026-07-23 §B1). As a column it repeated 'chat' three times in five rows
+     and pushed the body 116px right, so the same card had two left edges for the same kind
+     of row. At the end of the line, only when it changed, the body lines up with Activity
+     and the one thing worth knowing survives. */
+  .redesign .txr .cvia{flex:0 0 auto;font-size:11px;color:var(--ink3);white-space:nowrap;padding-top:1px}
+  /* "+N more" borrows the log's own quiet row (mono, --ink3) rather than inventing a
+     control: nothing was summarised away, so pressing it only stops hiding (§B3). */
+  .redesign .txr.convmore{cursor:pointer}
+  .redesign .txr.convmore .m{font-family:var(--mono);font-size:12px;color:var(--ink3)}
+  .redesign .txr.convmore:hover .m{color:var(--ink2)}
+  .redesign .rconv .lbody .rtx{max-width:760px}
+  .redesign .txr.mgr .m{color:var(--ink3)}
   /* Discussion (review back-and-forth) folded at the bottom of Activity's body */
   .redesign .lbody .rthread{display:flex;flex-direction:column;gap:16px;margin:0}
   .redesign .lbody .rmsg .who{font-size:12px;font-weight:600;color:var(--ink);margin-bottom:4px}
@@ -2800,6 +2876,26 @@
       <div class="errbar" id="errbar"></div>
       <div class="composer-wrap" id="composerWrap">
         <div class="queue" id="queue"></div>
+        <!-- Context row (Masa 2026-07-22: 「claude の表記に合わせて」). The Claude app
+             puts separate rounded chips above the box — repo · branch|worktree · add —
+             rather than one continuous strip, and the words are its words. `Local` is
+             deliberately absent: Claude offers it because it also runs in the cloud,
+             and a chip that cannot be switched is decoration (§1.5-3). -->
+        <div class="ctxbar" id="ctxbar">
+          <div class="ctxsel ctxchip" id="ctxdirsel">
+            <button type="button" class="ctxseg" id="ctxdirbtn" title="Folder this project works in">
+              <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-2V7z"/></svg><b id="ctxdirnow"></b></button>
+            <div class="appmenu ctxmenu" id="ctxdirmenu"></div>
+          </div>
+          <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="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>
+          </div>
+        </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
@@ -3180,7 +3276,7 @@ const savedTheme = (() => {
   if (v !== s) localStorage.setItem('theme', v);
   return v;
 })();
-const state = { projects: [], goals: [], tasks: [], act: {}, actAt: {}, todos: {}, chatTurns: {}, active: 'default', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], expanded: new Set(), openThreads: new Set(), queueOrder: {}, externalActivity: [], selectedGoal: null, workflowColumns: {}, wfDraft: null, reviewDefinitions: {}, rdDraft: null, connectedApp: localStorage.getItem('sel:agent') || 'claude-code', reviewOpenGoal: null, reviewApprovals: {}, goalDetailOpen: null, qreplyOpen: new Set(), logCollapsed: localStorage.getItem('logCollapsed') !== '0', logEntries: [], layout: localStorage.getItem('layout') || 'flagship', theme: savedTheme, boardskin: localStorage.getItem('boardskin') || 'auto', summaryPattern: Number(localStorage.getItem('summaryPattern')) || 3, peraSpot: 0, skill: null, skillsCache: null,
+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: 'default', editing: null, attach: [], connectCommand: '', models: ['sonnet'], agentModels: null, agentEfforts: null, agents: ['claude-code', 'codex'], expanded: new Set(), openThreads: new Set(), queueOrder: {}, externalActivity: [], selectedGoal: null, workflowColumns: {}, wfDraft: null, reviewDefinitions: {}, rdDraft: null, connectedApp: localStorage.getItem('sel:agent') || 'claude-code', reviewOpenGoal: null, reviewApprovals: {}, goalDetailOpen: null, qreplyOpen: new Set(), logCollapsed: localStorage.getItem('logCollapsed') !== '0', logEntries: [], layout: localStorage.getItem('layout') || 'flagship', theme: savedTheme, boardskin: localStorage.getItem('boardskin') || 'auto', summaryPattern: Number(localStorage.getItem('summaryPattern')) || 3, peraSpot: 0, skill: null, skillsCache: null,
   // per-message send overrides set via slash-commands (reset after each send,
   // except model which is sticky in localStorage). palette = open command list.
   msg: { mode: null, model: null, effort: null, skill: null, later: false, review: false },
@@ -3370,9 +3466,12 @@ function prioBadge(t){
 
 // Mirrors engine/lib.mjs DEFAULT_REVIEW_DEFINITION — kept in sync manually,
 // see the comment on DEFAULT_WORKFLOW_COLUMNS above.
+// `requirePR` and `prSections` are deliberately absent: the engine stores them
+// but no code has ever read them, so the switches that wrote them are gone
+// (2026-07-22). The engine-side fields go in a follow-up; nothing here reads
+// them in the meantime.
 const DEFAULT_REVIEW_DEFINITION = {
-  requirePR: true, requireVerifyPass: false, description: '', defaultWantsPR: false, language: 'auto',
-  prSections: { summary: true, whatChanged: true, howToReview: true, tests: true, screenshots: true, risk: true },
+  requireVerifyPass: false, description: '', defaultWantsPR: false, language: 'auto',
   reviewCard: { screenshots: true, beforeAfter: false },
 };
 // Shown (faint) under Review when no definition is set yet, so it's obvious the
@@ -4602,9 +4701,14 @@ function renderTasks(){
   // the rework task ("reworking: <goal>").
   const sendQReply = async (gid, inp) => {
     const text = inp.value.trim(); if (!text) return;
-    const r = await fetch(withKey(`/api/goals/${gid}/dismiss`), { method: 'POST',
-      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
-    if (!r.ok) showErr('送信に失敗しました'); else { inp.value = ''; state.qreplyOpen.delete(Number(gid)); await refresh(); }
+    try {
+      const body = await replyToGoal(gid, text, `[data-qreplyinput="${gid}"]`);
+      if (!body) return;                                   // asked, and nobody chose — leave the words in the box
+      inp.value = '';
+      // A question keeps the row open: the answer lands under this very box.
+      if (body.outcome !== 'answer') state.qreplyOpen.delete(Number(gid));
+      await refresh();
+    } catch { showErr('送信に失敗しました'); }
   };
   for (const b of $('tasklist').querySelectorAll('[data-qreplysend]')) {
     b.onclick = (e) => { e.stopPropagation(); sendQReply(b.dataset.qreplysend, $('tasklist').querySelector(`[data-qreplyinput="${b.dataset.qreplysend}"]`)); };
@@ -4893,13 +4997,12 @@ function renderAttach(){
 function openWfEditor(){
   state.wfDraft = columnsFor(state.active).map((c) => ({ ...c }));
   const def = reviewDefinitionFor(state.active);
-  // prSections/reviewCard are nested objects — a shallow `{ ...def }` would
-  // share them by reference, so toggling one checkbox here would mutate
+  // reviewCard is a nested object — a shallow `{ ...def }` would share it by
+  // reference, so toggling one checkbox here would mutate
   // DEFAULT_REVIEW_DEFINITION (or another project's cached definition)
-  // instead of just this draft. Copy them one level deeper.
+  // instead of just this draft. Copy it one level deeper.
   state.rdDraft = {
     ...def,
-    prSections: { ...DEFAULT_REVIEW_DEFINITION.prSections, ...(def.prSections ?? {}) },
     reviewCard: reviewCardConfigFor(state.active),
   };
   $('wferr').style.display = 'none';
@@ -4912,35 +5015,12 @@ function renderRdEditor(){
     <label class="rdrow"><input type="checkbox" id="rdDefaultWantsPR"${state.rdDraft.defaultWantsPR ? ' checked' : ''}>
       <span><span class="rdlabel">Open a GitHub pull request by default</span>
       <span class="rdhint">New goals left on "Auto" open a PR unless their text says otherwise. Per-goal PR/No PR always overrides this.</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdRequirePR"${state.rdDraft.requirePR ? ' checked' : ''}>
-      <span><span class="rdlabel">Requires a pull request</span>
-      <span class="rdhint">A goal that asked for a PR always lands in Review, even if PR creation failed.</span></span></label>
     <label class="rdrow"><input type="checkbox" id="rdRequireVerify"${state.rdDraft.requireVerifyPass ? ' checked' : ''}>
       <span><span class="rdlabel">Requires an independent verify pass</span>
       <span class="rdhint">Any task whose headless-browser check didn't pass (or never ran) forces Review too.</span></span></label>
     <label class="rdrow rddesc"><span><span class="rdlabel">Review instructions</span>
-      <span class="rdhint">Read and followed by the worker when a goal reaches Review — e.g. tell it to open a PR here instead of using a separate PR toggle.</span>
-      <textarea class="rdtext" id="rdDescription" maxlength="500" rows="2" placeholder="例：「英語でプルリクエストを作成して」など、ゴールの完了定義を書く">${esc(state.rdDraft.description ?? '')}</textarea></span></label>
-
-    <div class="rdsub">PR本文に含める項目 / PR body sections</div>
-    <label class="rdrow"><input type="checkbox" id="rdPrSummary"${state.rdDraft.prSections.summary ? ' checked' : ''}>
-      <span><span class="rdlabel">Summary</span>
-      <span class="rdhint">ゴールの目的(Goal本文)をPRに含める。</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdPrWhatChanged"${state.rdDraft.prSections.whatChanged ? ' checked' : ''}>
-      <span><span class="rdlabel">What changed</span>
-      <span class="rdhint">変更ファイルの一覧をPRに含める。</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdPrHowToReview"${state.rdDraft.prSections.howToReview ? ' checked' : ''}>
-      <span><span class="rdlabel">How to review</span>
-      <span class="rdhint">上のレビュー指示(Review instructions)をPR本文にも載せる。</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdPrTests"${state.rdDraft.prSections.tests ? ' checked' : ''}>
-      <span><span class="rdlabel">Tests</span>
-      <span class="rdhint">Managerが実行したテスト結果をPRに含める。</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdPrScreenshots"${state.rdDraft.prSections.screenshots ? ' checked' : ''}>
-      <span><span class="rdlabel">Screenshots</span>
-      <span class="rdhint">証跡(スクショ/GIF)へのリンクをPRに含める。</span></span></label>
-    <label class="rdrow"><input type="checkbox" id="rdPrRisk"${state.rdDraft.prSections.risk ? ' checked' : ''}>
-      <span><span class="rdlabel">Risk</span>
-      <span class="rdhint">注意が必要そうな変更範囲を一言添える。</span></span></label>
+      <span class="rdhint">Goes into the pull request body, so whoever reviews it knows what to look for. The worker doesn't read this while it works — instructions for the AI belong in your project's CLAUDE.md / AGENTS.md.</span>
+      <textarea class="rdtext" id="rdDescription" maxlength="500" rows="2" placeholder="例：「変更前後のスクショを見比べて、余白が揃っているか確認してください」など、レビューする人に伝えたいこと">${esc(state.rdDraft.description ?? '')}</textarea></span></label>
 
     <div class="rdsub">レビューカードに出す項目 / Review card fields</div>
     <label class="rdrow"><input type="checkbox" id="rdCardScreenshots"${state.rdDraft.reviewCard.screenshots ? ' checked' : ''}>
@@ -4956,15 +5036,8 @@ function renderRdEditor(){
       <span><span class="rdlabel">Review language</span>
       <span class="rdhint">レビュー要約(確認/変更)などManagerが生成する文言の言語。</span></span></label>`;
   $('rdDefaultWantsPR').addEventListener('change', (e) => { state.rdDraft.defaultWantsPR = e.target.checked; });
-  $('rdRequirePR').addEventListener('change', (e) => { state.rdDraft.requirePR = e.target.checked; });
   $('rdRequireVerify').addEventListener('change', (e) => { state.rdDraft.requireVerifyPass = e.target.checked; });
   $('rdDescription').addEventListener('input', (e) => { state.rdDraft.description = e.target.value; });
-  $('rdPrSummary').addEventListener('change', (e) => { state.rdDraft.prSections.summary = e.target.checked; });
-  $('rdPrWhatChanged').addEventListener('change', (e) => { state.rdDraft.prSections.whatChanged = e.target.checked; });
-  $('rdPrHowToReview').addEventListener('change', (e) => { state.rdDraft.prSections.howToReview = e.target.checked; });
-  $('rdPrTests').addEventListener('change', (e) => { state.rdDraft.prSections.tests = e.target.checked; });
-  $('rdPrScreenshots').addEventListener('change', (e) => { state.rdDraft.prSections.screenshots = e.target.checked; });
-  $('rdPrRisk').addEventListener('change', (e) => { state.rdDraft.prSections.risk = e.target.checked; });
   $('rdCardScreenshots').addEventListener('change', (e) => { state.rdDraft.reviewCard.screenshots = e.target.checked; });
   $('rdLanguage').addEventListener('change', (e) => { state.rdDraft.language = e.target.value; });
 }
@@ -5456,6 +5529,171 @@ function renderReviewAttach(){
   bar.innerHTML = reviewAttach.map((a, i) => `<span class="reqthumb"><img src="${esc(a.url)}" alt=""><button type="button" class="rm" data-ri="${i}" aria-label="Remove">×</button></span>`).join('');
   for (const b of bar.querySelectorAll('.rm')) b.onclick = () => { reviewAttach.splice(Number(b.dataset.ri), 1); renderReviewAttach(); };
 }
+// 返事は "auto" で送る (ONE-CONVERSATION §1.3/§1.4)。
+//
+// 行き先を決めるのは AI 本人で、この層は言われたとおりに配線するだけ。今までは中身に
+// 関わらず全部「直して」で、「なんでこうしたの？」と聞いただけでゴールが Doing に戻り
+// ワーカーが走っていた。人はモードを普段選ばない——AI が迷った時だけ選ぶ。
+const REPLY_CHOICE_LABEL = { continue: 'Fix this', rescope: 'Rethink it', split: 'Separate ticket', answer: 'Just a question' };
+// The one waiting line's two labels. Local to the reply note on purpose — STATUS_LABEL
+// is the task/workflow vocabulary and this is neither (CDO §5).
+const REPLY_WAIT_ROUTING = 'Thinking…';
+const REPLY_WAIT_ANSWERING = 'Answering…';
+async function postReply(goalId, text, outcome = 'auto'){
+  const r = await fetch(withKey(`/api/goals/${goalId}/dismiss`), { method: 'POST',
+    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text, outcome }) });
+  if (!r.ok) throw new Error();
+  return r.json();
+}
+// One line under whichever reply box was used. It is held in a variable and
+// PAINTED after every render, because a reply writes to the goal, which arrives
+// back over SSE, which rebuilds the list — a node appended straight to the DOM
+// disappears a second later (and an answer nobody sees is the same as no answer).
+let replyNoteState = null;      // { anchorSel, you, phase, html, resolve? }
+function paintReplyNote(){
+  for (const stale of document.querySelectorAll('.replynote')) stale.remove();
+  paintSettledThreads();
+  if (!replyNoteState) return;
+  const anchor = document.querySelector(replyNoteState.anchorSel);
+  if (!anchor) return;
+  for (const stale of document.querySelectorAll('.replynote')) stale.remove();
+  const el = document.createElement('div');
+  el.className = 'qsub replynote';
+  el.innerHTML = replyNoteState.html;
+  // BELOW the reply box, never beside it (§1.4). The review card's box lives in a
+  // flex row of buttons — appending inside it puts the choices next to the send
+  // arrow, on top of it at narrow widths.
+  const row = anchor.closest('.sa-act') ?? anchor.parentElement;
+  if (row?.parentElement) row.after(el); else row?.appendChild(el);
+  for (const b of el.querySelectorAll('[data-rc]')) b.onclick = () => {
+    const pick = b.dataset.rc, done = replyNoteState?.resolve;
+    replyNoteState = null; paintReplyNote(); done?.(pick);
+  };
+}
+// Every open card with past review turns shows them, whether or not a reply is in
+// flight — this is what makes "close it, come back tomorrow" work (CDO §3.1).
+function paintSettledThreads(){
+  for (const inp of document.querySelectorAll('#seeall .sa-chat[data-goal]')) {
+    const goalId = Number(inp.dataset.goal);
+    loadReplyThread(goalId);
+    if (replyNoteState?.goalId === goalId) continue;     // the live note draws its own history
+    const html = replyPastHtmlFor(goalId);
+    if (!html) continue;
+    const row = inp.closest('.sa-act') ?? inp.parentElement;
+    if (!row?.parentElement) continue;
+    const el = document.createElement('div');
+    el.className = 'qsub replynote';
+    el.innerHTML = html;
+    row.after(el);
+  }
+}
+function setReplyNote(anchorSel, html, resolve){
+  replyNoteState = anchorSel ? { ...replyNoteState, anchorSel, html, resolve } : null;
+  paintReplyNote();
+}
+// Past turns of this card's reply thread, by goal id. The exchange is not a session
+// thing: every message this flow writes is on the goal (`goal.messages`, via:'review'),
+// so reopening the card next week must show it exactly as it settled (CDO §3.1).
+// Fetched once per goal when the card renders; the live state machine in
+// replyNoteState only ever covers a reply that is still in flight right now.
+const replyThread = {};          // goalId -> [{from, via, text}]
+const replyThreadLoading = new Set();
+function loadReplyThread(goalId){
+  if (replyThread[goalId] || replyThreadLoading.has(goalId)) return;
+  replyThreadLoading.add(goalId);
+  fetch(withKey(`/api/goals/${goalId}/messages`))
+    .then((r) => (r.ok ? r.json() : { messages: [] }))
+    .then((b) => {
+      replyThread[goalId] = (b.messages ?? []).filter((m) => m.via === 'review');
+      if (replyThread[goalId].length) saRender();
+    })
+    .catch(() => { replyThread[goalId] = []; })
+    .finally(() => replyThreadLoading.delete(goalId));
+}
+// Settled history: no shimmer, nothing pending — this already happened.
+function replyPastHtml(){
+  const goalId = replyNoteState?.goalId;
+  return replyPastHtmlFor(goalId);
+}
+function replyPastHtmlFor(goalId){
+  const msgs = goalId == null ? [] : (replyThread[goalId] ?? []);
+  return msgs.map((m) => (m.from === 'you' ? replySaidHtml(m.text)
+    : m.from === 'ai' ? replyAnsweredHtml(m.text)
+    : replyNoteRowHtml(esc(m.text)))).join('');
+}
+
+// The reply box's thread rows. NOT the centre feed's .cc-you/.cc-say: every rule for
+// that vocabulary is scoped to #fsRoot, and the review card lives in #seeall — the
+// markup rendered there came out as unstyled black text (CDO decision §1). The card
+// already draws You/Claude rows for Activity with `.txr`, correctly scoped and
+// weighted, so this reuses those instead of defining anything new.
+function replySaidHtml(you){
+  return `<div class="txr you"><span class="w">You</span><span class="m">${esc(you)}</span></div>`;
+}
+// One indicator that changes its label — never a second spinner (CDO decision §2, Q2).
+function replyWaitHtml(label){
+  return `<div class="txr note"><span class="w"></span><span class="m"><span class="shimmer">${esc(label)}</span></span></div>`;
+}
+function replyNoteRowHtml(body){
+  return `<div class="txr note"><span class="w"></span><span class="m">${body}</span></div>`;
+}
+function replyAnsweredHtml(text){
+  return `<div class="txr cl"><span class="w">Claude</span><span class="m">${esc(text)}</span></div>`;
+}
+// Sent, and nothing decided yet. Shown immediately — the wait is real (a routing
+// call, then the answer), so the honest thing is to say it is thinking, not to
+// pretend the reply landed somewhere it has not.
+function showReplySent(anchorSel, you, goalId){
+  replyNoteState = { anchorSel, you, goalId, phase: 'sent' };
+  setReplyNote(anchorSel, replyPastHtml() + replySaidHtml(you) + replyWaitHtml(REPLY_WAIT_ROUTING));
+}
+// AI said it cannot tell (§1.4): the goal has NOT been touched, so this asks and
+// sends again with the chosen destination. Leaving it unanswered changes nothing.
+function askReplyDestination(anchorSel, choices){
+  return new Promise((resolve) => {
+    const said = replyNoteState?.you ? replySaidHtml(replyNoteState.you) : '';
+    // The You row stays above the chips so "this" has something to point at (CDO Q5).
+    setReplyNote(anchorSel, replyPastHtml() + said + replyNoteRowHtml('Which one is this?')
+      + `<div class="qchips">${(choices || []).map((c) =>
+        `<button type="button" class="qchip" data-rc="${esc(c)}">${esc(REPLY_CHOICE_LABEL[c] ?? c)}</button>`).join('')}</div>`, resolve);
+  });
+}
+// answer (§1.3): nothing was built, so there is no task to watch — the reply comes
+// back as a message on the goal. Show it where the question was asked, so an answer
+// cannot arrive somewhere nobody is looking.
+async function showAnswerWhenItArrives(anchorSel, goalId, seen){
+  const mine = () => replyPastHtml() + (replyNoteState?.you ? replySaidHtml(replyNoteState.you) : '');
+  setReplyNote(anchorSel, mine() + replyWaitHtml(REPLY_WAIT_ANSWERING));
+  for (let i = 0; i < 120; i++) {
+    await new Promise((r) => setTimeout(r, 1000));
+    let msgs = [];
+    try { msgs = (await (await fetch(withKey(`/api/goals/${goalId}/messages`))).json()).messages ?? []; } catch { continue; }
+    const said = msgs.slice(seen).find((m) => m.from === 'ai' || m.from === 'manager');
+    if (said) {
+      // It is history now — render it exactly as a reopened card will (CDO §3.1), and
+      // keep it anchored where it was asked, so this works in the list's reply box too
+      // (that one is not inside #seeall and would otherwise lose the answer).
+      replyThread[goalId] = msgs.filter((m) => m.via === 'review');
+      return setReplyNote(anchorSel, replyPastHtmlFor(goalId));
+    }
+  }
+  setReplyNote(anchorSel, mine() + replyNoteRowHtml('No answer came back.'));
+}
+// The whole reply flow in one place: send as auto, ask if the AI was unsure, and
+// keep an answer visible. Returns the settled body, or null if the person cancelled.
+async function replyToGoal(goalId, text, anchorSel){
+  const seen = state.goals.find((g) => g.id === Number(goalId))?.messageCount ?? 0;
+  showReplySent(anchorSel, text, Number(goalId));   // before the round trip: the words stay, and it says it is thinking
+  let body = await postReply(goalId, text, 'auto');
+  if (body.outcome === 'unsure') {
+    const picked = await askReplyDestination(anchorSel, body.choices);
+    if (!picked) return null;
+    body = await postReply(goalId, text, picked);
+  }
+  // seen + 1: the question itself was just recorded; the answer is the one after it.
+  if (body.outcome === 'answer') showAnswerWhenItArrives(anchorSel, goalId, seen + 1);
+  return body;
+}
 async function sendReviewDismiss(text){
   const goal = state.goals.find((g) => g.id === state.reviewOpenGoal);
   if (!goal) return;
@@ -5466,15 +5704,15 @@ async function sendReviewDismiss(text){
     ? `${text}${text ? '\n\n' : ''}添付画像（workerはこのパスをReadで確認できます）: ${imgs.map((a) => a.path).join(', ')}`
     : text;
   try {
-    const r = await fetch(withKey(`/api/goals/${goal.id}/dismiss`), { method: 'POST',
-      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: fullText }) });
-    if (!r.ok) throw new Error();
-    const body = await r.json();
+    const body = await replyToGoal(goal.id, fullText, '#reviewFixInput');
+    if (!body) return;                                     // unsure, and nobody chose
     upsert(state.goals, body.goal);
     if (body.task) upsert(state.tasks, body.task);
     $('reviewFixInput').value = '';
     reviewAttach = []; renderReviewAttach();
-    closeReviewChecklist();
+    // A question changed nothing, so closing the card would hide the answer that is
+    // on its way. Only a reply that actually moved the goal closes it.
+    if (body.outcome !== 'answer') closeReviewChecklist();
     render();
   } catch { showErr('Dismiss failed.'); }
 }
@@ -5696,14 +5934,12 @@ async function sendReject(goalId){
 async function sendDismiss(goalId, text){
   $('gdApprove').disabled = true; $('gdDismiss').disabled = true; $('gdSend').disabled = true;
   try {
-    const r = await fetch(withKey(`/api/goals/${goalId}/dismiss`), { method: 'POST',
-      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
-    if (!r.ok) throw new Error();
-    const body = await r.json();
+    const body = await replyToGoal(goalId, text, '#gdRevisionInput');
+    if (!body) { $('gdApprove').disabled = false; $('gdDismiss').disabled = false; $('gdSend').disabled = false; return; }
     upsert(state.goals, body.goal);
     upsert(state.tasks, body.task);
     $('gdRevisionInput').value = '';
-    closeGoalDetail();
+    if (body.outcome !== 'answer') closeGoalDetail();      // a question leaves the card open for its answer
     render();
   } catch { showErr('Dismiss failed.'); }
   $('gdApprove').disabled = false; $('gdDismiss').disabled = false; $('gdSend').disabled = false;
@@ -5759,11 +5995,13 @@ $('gdRevisionInput').addEventListener('keydown', (e) => {
 
 function render(){
   renderProjects(); renderStream(); renderQueue(); renderTasks(); renderActPanel(); wireWfEditButtons();
+  renderCtxBar();   // the folder above the composer follows the active project
   renderFlagship();
   if (state.reviewOpenGoal != null) renderReviewChecklist();
   if (state.goalDetailOpen != null) renderGoalDetail();
   if (typeof SA !== 'undefined' && SA.open) saSync(); // keep the open See all Ledger live
   const bv = $('botver'); if (bv && state.uiVersion) bv.textContent = 'build ' + String(state.uiVersion).slice(0, 8);
+  paintReplyNote();   // a reply's answer/question survives the re-render it caused
 }
 
 // ============================================================================
@@ -6093,8 +6331,9 @@ function fsBoardBucket(goal, tasks){
   if (s === 'needsInput') return 'needs';                       // a clarifying question is waiting on the user
   if (s === 'blocked' && goal?.blocked?.kind === 'paused') return 'doing'; // paused by user — stays in Doing, shown amber "Paused" (Masa 2026-07-19: 1カードのまま黄色に・Needs youへ移動しない)
   if (['blocked', 'failed', 'partial', 'interrupted'].includes(s)) return 'needs'; // stopped/errored — needs YOUR action (retry), like the flagship board which puts .drow.err in Needs you. Not "Doing" — Doing is only what's actively moving (Masa 2026-07-18)
-  if (s === 'review') return 'review';
+  if (s === 'review' || s === 'folded') return 'review'; // folded (PR filed for review) reads as Review, not Doing — goalGroupStatus parity (Masa 2026-07-21)
   if (s === 'done' || s === 'reverted' || s === 'skipped') return 'done'; // terminal; skipped is finished, not in flight (it used to fall through to the doing default)
+  if (s === 'rejected') return 'rejected'; // Reject = closed. Parked in the list's own Dismissed fold; the board drops it entirely (a closed todo must not linger in Doing — Masa 2026-07-21). Both 'folded' and 'rejected' used to fall through to the doing default.
   if (s === 'stacked' || s === 'sending') return 'todo';
   if (s === 'running' && !goal?.startedAt) return 'todo';       // goalChip: planned, nothing started yet
   // Otherwise the goal is in flight (planning / retesting / running-and-started). BUT a
@@ -6217,8 +6456,8 @@ function renderFsBoard(){
     return `<div class="lbc${quiet ? ' is-quiet' : ''}">${h}</div>`;
   };
   const no = (g) => goalNo.get(g.id) ?? Infinity;
-  const bucket = { todo: [], doing: [], needs: [], review: [], done: [], later: [] };
-  for (const g of pgoals) bucket[fsBoardBucket(g, list)].push(g);
+  const bucket = { todo: [], doing: [], needs: [], review: [], done: [], later: [], rejected: [] };
+  for (const g of pgoals) bucket[fsBoardBucket(g, list)].push(g); // 'rejected' is collected but never rendered as a column below — closed goals disappear from the board
   for (const k of Object.keys(bucket)) bucket[k].sort((a, b) => k === 'done' ? no(b) - no(a) : no(a) - no(b));
   // To Do / Doing / Needs you / Review / Done / Later — the original design's columns
   // (Masa 2026-07-16). "Needs you" = a clarifying question is waiting on the user —
@@ -6403,6 +6642,10 @@ function fsBucketTodo(){
   const list = state.tasks.filter((t) => t.projectId === state.active);
   const order = state.queueOrder[state.active] ?? [];
   const byQueue = (a, b) => { const ia = order.indexOf(a.id), ib = order.indexOf(b.id); return (ia < 0 ? 1e9 : ia) - (ib < 0 ? 1e9 : ib) || a.num - b.num; };
+  // A closed (rejected) goal's tasks stay 'done' after Reject, so they used to leak into the
+  // "✓ Done" fold below AND show in the Dismissed fold — the same closed todo listed twice.
+  // Its home is the Dismissed fold; keep its done tasks out of Done (Masa 2026-07-21).
+  const closedGoalIds = new Set(pgoals.filter((g) => g.status === 'rejected').map((g) => g.id));
   return {
     pgoals, list,
     running: list.filter((t) => t.status === 'running'),
@@ -6411,7 +6654,7 @@ function fsBucketTodo(){
     needsInput: pgoals.filter((g) => g.status === 'needsInput'), // a clarifying question is waiting on the user (board's "Needs you")
     reviewGoals: pgoals.filter((g) => g.status === 'review'),
     queued: list.filter((t) => t.status === 'queued' && !t.reply).sort(byQueue),
-    doneAll: list.filter((t) => ['done', 'skipped'].includes(t.status)).sort((a, b) => b.num - a.num),
+    doneAll: list.filter((t) => ['done', 'skipped'].includes(t.status) && !closedGoalIds.has(t.goalId)).sort((a, b) => b.num - a.num),
     later: pgoals.filter((g) => g.status === 'pending'),
     rejected: pgoals.filter((g) => g.status === 'rejected'), // 07-20c: Reject parks goals here (own fold, like Done)
   };
@@ -7730,6 +7973,12 @@ async function boot(){
   if (window.__GALDA_DISCONNECTED) return bootDisconnected(window.__GALDA_DISCONNECTED);
   $('input').value = localStorage.getItem('draft') ?? '';
   await refresh();
+  // The folder sits above the composer and is read on every screen, so its list is
+  // fetched once at boot rather than on first open: without HOME the bar can only
+  // print the absolute path (measured — it read "/var/folders/…/agent-manager"
+  // instead of "~/agent-manager" until the menu had been opened once). One read of
+  // one directory, not the 500KB-per-task class the on-open rule exists for.
+  loadRepos();
   flushOutbox();
   connectSSE();
   startHealthPoll();
@@ -7770,7 +8019,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, 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, 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
@@ -7942,6 +8191,9 @@ 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).
+    worktree: worktreeOn() ? undefined : false,
     pending: later, review,
     images: attach.map((a) => a.path), imageUrls: attach.map((a) => a.url),
     status: 'sending', ts: Date.now(),
@@ -8103,7 +8355,7 @@ function closeSummaryPera(){ $('summaryOverlay').classList.remove('show'); }
 // 4 archived / 5 reverted — session-local; the server round-trip is what
 // settles it (see saSync's "returned to review" reset).
 // ============================================================================
-const SA = { open: false, items: [], diffs: {}, actLog: {}, shotBox: {}, detOpen: new Set(), focusGid: null, focusScrolled: false, focusTimer: null, cur: null };
+const SA = { open: false, items: [], diffs: {}, actLog: {}, msgs: {}, convOpen: new Set(), shotBox: {}, detOpen: new Set(), focusGid: null, focusScrolled: false, focusTimer: null, cur: null };
 window.SA = SA; // top-level const isn't a window property; external checks probe window.SA (same convention as window.state above)
 const SA_SVG = {
   ok: '<svg viewBox="0 0 24 24"><path d="M4 12l5 5L20 6"/></svg>',
@@ -8169,6 +8421,11 @@ function saRows(){
         const ids = [...r.goalIds, ...folded.map((f) => f.id)];
         return ts.filter((t) => ids.includes(t.goalId)).flatMap((t) => t.shots ?? []);
       })(),
+      // How many messages this goal's conversation holds (§1.1). A COUNT, not the
+      // conversation: state carries every card on every tick, and 100 cards dragging
+      // 100 threads is what the engine deliberately avoided. 0/undefined means the
+      // section is not rendered at all (§1.5-3: no container for something absent).
+      messageCount: Number(g?.messageCount) || 0,
       // The task whose implementation log the engine froze at completion (P1.5). The
       // 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.
@@ -8243,10 +8500,18 @@ function saRows(){
 // has called it since the review-card redesign; Request and Result carry that ground now.)
 // Unified-diff → GitHub two-gutter model (REVIEW-CARD-SPEC §7 "GitHub diff = Bright"):
 // walk the @@ hunk headers to recover the old/new line numbers, emit one row per line
-// {o:oldNo|null, n:newNo|null, t:'add'|'del'|'ctx', c:text}. Word-level highlight is
-// NOT fabricated from a raw diff (the product never invents evidence) — the Bright
-// line+gutter tint carries the change and .gh-hi simply stays absent. Pure, so it is
-// extracted and unit-tested in engine/test/review-card-diff.test.mjs.
+// {o:oldNo|null, n:newNo|null, t:'add'|'del'|'ctx', c:text}. Pure, so it is extracted
+// and unit-tested in engine/test/review-card-diff.test.mjs.
+//
+// Word-level highlight (§7 "変わった単語だけ濃くハイライト", Masa 2026-07-22): the span
+// is MEASURED between the two lines the reviewer is already looking at — a common
+// prefix and suffix, with what is left over marked — never guessed. The earlier note
+// here said the highlight would be "fabricated evidence"; a character comparison of two
+// shown lines invents nothing. What WOULD be a guess is pairing the wrong removed line
+// with the wrong added one, so only an unambiguous pair is marked: a run of removals
+// immediately followed by a run of additions of the SAME length, paired in order. A
+// 3-for-2 replacement, an add with no matching del, a rewritten line where almost
+// nothing survives — all keep today's behaviour exactly (tint only, no span).
 // How many body rows the diff really has, ignoring the display cap. A big change used
 // to be cut at 80 rows with nothing said (SPEC §7 asks for "…+N 行 · GitHub で開く ↗"
 // precisely so a reviewer is never shown a slice that looks like the whole thing).
@@ -8277,8 +8542,61 @@ function saUnifiedToGh(diff, max){
   }
   return out;
 }
+// The changed span between one removed line and the line that replaced it: skip the
+// common head, skip the common tail, and what is left in the middle is what changed.
+// Returns the two offset pairs plus `kept` — how much of the longer line survived —
+// which is the evidence that these two lines ARE the same line. Null only when the
+// lines are identical (nothing to point at).
+function saWordSpan(delText, addText){
+  const a = String(delText ?? ''), b = String(addText ?? '');
+  if (a === b) return null;
+  const max = Math.min(a.length, b.length);
+  let p = 0;
+  while (p < max && a[p] === b[p]) p++;
+  let sfx = 0;
+  while (sfx < max - p && a[a.length - 1 - sfx] === b[b.length - 1 - sfx]) sfx++;
+  return { del: [p, a.length - sfx], add: [p, b.length - sfx], kept: (p + sfx) / Math.max(a.length, b.length, 1) };
+}
+// How much of a line must survive before two lines count as the same line. Below this
+// the "change" is a rewrite: marking almost the whole line says less than the Bright
+// tint already does, and a low score is also how an unrelated pair gets rejected.
+const SA_WORD_KEEP = 0.34;
+// Mark the changed span on removed/added pairs, in place.
+//
+// Pairing is the only place a guess could enter, so it is decided by measurement: each
+// removed line takes the added line it shares the most text with, and the pair is only
+// marked when that shared text clears SA_WORD_KEEP. Everything else — a pure addition,
+// a pure removal, a rewrite, an unrelated neighbour — is left exactly as it renders
+// today (tint only, no span).
+//
+// Measured on this product's own history (2026-07-22): the first rule written here
+// paired blocks in order and required equal lengths, and lit up NOTHING, because the
+// common shape is "one line replaced, plus a comment added above it" — in-order pairing
+// matched the replaced line against the comment.
+function saMarkWordSpans(rows){
+  for (let i = 0; i < rows.length; i++) {
+    if (rows[i].t !== 'del') continue;
+    let d = i; while (d < rows.length && rows[d].t === 'del') d++;
+    let a = d; while (a < rows.length && rows[a].t === 'add') a++;
+    const used = new Set();
+    for (let k = i; k < d; k++) {
+      let best = null, bestIdx = -1;
+      for (let j = d; j < a; j++) {
+        if (used.has(j)) continue;
+        const span = saWordSpan(rows[k].c, rows[j].c);
+        if (span && (!best || span.kept > best.kept)) { best = span; bestIdx = j; }
+      }
+      if (!best || best.kept < SA_WORD_KEEP) continue;
+      used.add(bestIdx);
+      rows[k].hi = best.del;
+      rows[bestIdx].hi = best.add;
+    }
+    i = a - 1;
+  }
+  return rows;
+}
 function saGhDiffHtml(diff, pr){
-  const rows = saUnifiedToGh(diff);
+  const rows = saMarkWordSpans(saUnifiedToGh(diff));
   if (!rows.length) return '';
   // Say what was left out. Before this, a 5000-line change rendered its first 80 rows
   // and stopped — a quiet lie, and the one thing SPEC §7 names as forbidden.
@@ -8305,6 +8623,52 @@ function saLogRowHtml(line){
     ? `<div class="txr tool"><span class="w">tool</span><span class="m"><b>${esc(m[1])}</b> ${esc(m[2])}</span></div>`
     : `<div class="txr cl"><span class="w"></span><span class="m">${esc(s)}</span></div>`;
 }
+// One line of the goal's conversation (ONE-CONVERSATION §1.1). Several entrances —
+// the composer, a review reply, a thread reply — are one column here, because to the
+// person who wrote them they were one conversation. `via` says which door a line came
+// through and nothing else: no per-entrance box, no grouping, no summarising. The text
+// is whatever was actually said (§ "会話を要約・分類・整形しない").
+const MSG_WHO = { you: 'You', ai: 'AI', manager: 'Manager' };
+// `thread` is our word for a reply that came in on the goal's own thread; a person reads
+// it as 'note'. The label is only shown when the entrance CHANGED from the line above —
+// five rows do not need to say 'chat' three times.
+const MSG_VIA = { composer: 'chat', review: 'review', thread: 'note' };
+function saMsgRowHtml(m, prevVia){
+  const who = MSG_WHO[m?.from] ?? 'AI';
+  const cls = m?.from === 'you' ? 'you' : m?.from === 'manager' ? 'mgr' : 'cl';
+  // Manager rows carry no entrance: `who` already says this line is automatic.
+  const via = m?.from === 'manager' ? '' : (MSG_VIA[m?.via] ?? '');
+  const show = via && via !== prevVia;
+  return `<div class="txr ${cls}"><span class="w">${who}</span><span class="m">${esc(String(m?.text ?? ''))}</span>`
+    + (show ? `<span class="cvia">${via}</span>` : '') + '</div>';
+}
+// The rows of a conversation, with each entrance shown only where it changes. A Manager
+// line never updates `prevVia` — a note in the middle must not make the chat that
+// continues after it look like a new entrance.
+//
+// Long ones fold in the MIDDLE (§B3): the first ask and the latest exchange are what get
+// read, the middle is what you go back for. From the 9th message: first 2 · +N more ·
+// last 4. Nothing is summarised and nothing is dropped — pressing it shows everything.
+// The row right after a fold always prints its entrance, because the change may be
+// inside what was folded away.
+const CONV_FOLD_FROM = 9, CONV_HEAD = 2, CONV_TAIL = 4;
+function saMsgRowsHtml(msgs, expanded){
+  const list = msgs ?? [];
+  const fold = !expanded && list.length >= CONV_FOLD_FROM;
+  const shown = fold ? [...list.slice(0, CONV_HEAD), null, ...list.slice(-CONV_TAIL)] : list;
+  const hidden = list.length - CONV_HEAD - CONV_TAIL;
+  let prevVia = null;
+  return shown.map((m) => {
+    if (m === null) {
+      prevVia = null;
+      return `<div class="txr res convmore"><span class="w"></span><span class="m">+${hidden} more</span></div>`;
+    }
+    const html = saMsgRowHtml(m, prevVia);
+    if (m?.from !== 'manager') prevVia = MSG_VIA[m?.via] ?? prevVia;
+    return html;
+  }).join('');
+}
+
 // Structured GitHub diff (REVIEW-CARD-SPEC §7): renders {o,n,t,c,h} rows with a
 // word-level highlight (h) and, for a huge change, a "…+N 行 · GitHub で開く ↗"
 // footer (only linking to GitHub when a PR exists). Mirrors the flagship artifact's
@@ -8315,7 +8679,12 @@ function saGhDiffRowsHtml(rows, more, pr){
     const cls = l.t === 'add' ? 'gh-add' : l.t === 'del' ? 'gh-del' : 'gh-ctx';
     const mk = l.t === 'add' ? '+' : l.t === 'del' ? '−' : '';
     let code = esc(l.c);
-    if (l.h) { const h = esc(l.h); code = code.replace(h, `<span class="gh-hi">${h}</span>`); }
+    if (Array.isArray(l.hi)) {
+      // Offsets, not a substring search: a word that appears twice on the line must be
+      // marked where it actually changed, not at its first occurrence.
+      const [a, b] = l.hi;
+      code = `${esc(l.c.slice(0, a))}<span class="gh-hi">${esc(l.c.slice(a, b))}</span>${esc(l.c.slice(b))}`;
+    } else if (l.h) { const h = esc(l.h); code = code.replace(h, `<span class="gh-hi">${h}</span>`); }
     return `<div class="ghl ${cls}"><span class="gho">${l.o ?? ''}</span><span class="ghn">${l.n ?? ''}</span><span class="ghm">${mk}</span><span class="ghc">${code}</span></div>`;
   }).join('') + '</div>';
   const foot = more ? `<div class="ghfoot"><span>…+${more} 行</span>${pr ? ` · <a class="ghopen" href="${esc(pr)}" target="_blank" rel="noopener">GitHub で開く ↗</a>` : ''}</div>` : '';
@@ -8442,7 +8811,9 @@ function saItemHtml(it, i){
   // address the worker declared IS the control (press it → the process starts on demand →
   // it opens); its own note sits under it, and that note is where the status and any
   // failure reason land after the press. Nothing declared → no section (§1.5-3). ──
-  const openBody = it.run
+  // it.run?.compare/title alone (no cmd/url) has nothing a press can start — a
+  // compare-only or title-only declaration must not draw the "Start it" button.
+  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>`
     : '';
   // ── Also carries (Masa 2026-07-21): goals folded onto this review are logged HERE, inside
@@ -8556,6 +8927,26 @@ function saItemHtml(it, i){
     : it.logTaskId != null
       ? `<section class="rsec ract"><div class="rsec-h">Activity</div><details class="lacc" data-detkey="${gk}:act" data-actlog="${it.logTaskId}"${actOpen}><summary><i class="ltog">›</i><div class="rtx lfirst">${saTxRowHtml(['user', it.goalText || it.title])}</div></summary><div class="lbody"><div class="rtx" data-actbody="${it.logTaskId}">${logHtml}</div>${discInner}</div></details></section>`
       : '';
+  // ── Conversation (ONE-CONVERSATION §1.1) ─────────────────────────────────────
+  // Everything said about this ticket, in the order it was said, whichever door it
+  // came through. Rendered ABOVE Activity: Activity is what the AI did, and what was
+  // SAID comes before what was done. Fetched on open only — state carries a count,
+  // never the thread (100 cards would drag 100 threads on every tick). A goal nobody
+  // has talked to has no section at all (§1.5-3 存在しないものの器を先に見せない).
+  const msgs = SA.msgs[it.goalId];
+  const msgOpen = SA.detOpen.has(`${gk}:msg`) ? ' open' : '';
+  const msgLast = Array.isArray(msgs) && msgs.length ? msgs[msgs.length - 1] : null;
+  const msgSummary = msgLast
+    ? saMsgRowHtml(msgLast, null)
+    : `<div class="txr"><span class="w"></span><span class="m">${it.messageCount} message${it.messageCount === 1 ? '' : 's'}</span></div>`;
+  const msgBody = Array.isArray(msgs)
+    ? (msgs.length
+      ? saMsgRowsHtml(msgs, SA.convOpen.has(it.goalId))
+      : '<div class="txr res"><span class="w"></span><span class="m">Nothing was said on this one.</span></div>')
+    : '<div class="txr res"><span class="w"></span><span class="m">Loading…</span></div>';
+  const conversationSec = it.messageCount > 0
+    ? `<section class="rsec rconv"><div class="rsec-h">Conversation</div><details class="lacc" data-detkey="${gk}:msg" data-msgs="${it.goalId}"${msgOpen}><summary><i class="ltog">›</i><div class="rtx lfirst">${msgSummary}</div></summary><div class="lbody"><div class="rtx" data-msgbody="${it.goalId}">${msgBody}</div></div></details></section>`
+    : '';
   const S = (label, body) => body ? `<section class="rsec"><div class="rsec-h">${label}</div>${body}</section>` : '';
   return `<div class="sa-item lg redesign${it.goalId === SA.cur ? ' cur' : ''}" data-gid="${it.goalId}">
     <div class="rhead"><span class="rtag">${it.no != null ? `#${it.no}` : ''}</span><span class="rst"><span class="rdot"></span>In review</span></div>
@@ -8571,9 +8962,10 @@ function saItemHtml(it, i){
     ${S('Proof', proofInner)}
     ${S('What changed', changedBody)}
     ${riskHtml}
+    ${conversationSec}
     ${activitySec}
     ${S('Workflow', saWorkflowHtml(it))}
-    <div class="sa-act"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button><button class="sa-dis" data-saact="dis:${i}">Dismiss</button><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" placeholder="Reply, ask, or send back to the AI…"><button class="sa-send" data-saact="send:${i}" title="Send"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
+    <div class="sa-act"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button><button class="sa-dis" data-saact="dis:${i}">Dismiss</button><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" data-goal="${it.goalId}" placeholder="Reply, ask, or send back to the AI…"><button class="sa-send" data-saact="send:${i}" title="Send"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
   </div>`;
 }
 // Scroll the See-all body so a card's top edge (.rhead) sits at the top of the visible
@@ -8603,6 +8995,25 @@ async function saLoadActivityLog(taskId){
     ? lines.map((l) => saLogRowHtml(l)).join('')
     : '<div class="txr res"><span class="w"></span><span class="m">Nothing was logged for this one.</span></div>';
 }
+// Fetch one goal's conversation and paint it into the open card. Cached in SA.msgs
+// (an empty result included) so opening and closing a card doesn't ask twice. A failed
+// request writes an honest line instead of an empty box — the same rule the
+// implementation log follows.
+async function saLoadMessages(goalId){
+  if (!Number.isFinite(goalId) || SA.msgs[goalId] !== undefined) return;
+  SA.msgs[goalId] = null; // in flight — a second toggle must not re-fetch
+  let msgs = [];
+  try {
+    const r = await fetch(withKey(`/api/goals/${goalId}/messages`));
+    msgs = r.ok ? ((await r.json()).messages ?? []) : [];
+  } catch { msgs = []; }
+  SA.msgs[goalId] = msgs;
+  const body = document.querySelector(`#seeall [data-msgbody="${goalId}"]`);
+  if (!body) return;
+  body.innerHTML = msgs.length
+    ? saMsgRowsHtml(msgs, SA.convOpen.has(goalId))
+    : '<div class="txr res"><span class="w"></span><span class="m">Nothing was said on this one.</span></div>';
+}
 // After first paint, compute the red box for any card showing a before/after pair and
 // patch that card's node directly — a full re-render here would close every open
 // pulldown just to draw a box. Cached per goal (null included) so it runs once.
@@ -8630,6 +9041,7 @@ function saRender(){
   // Native <details> would collapse on every rebuild (SSE tick, approve, etc.) —
   // track what's open per goal+section in SA.detOpen (persists across re-renders)
   // and wire each one's toggle to keep that set current.
+  paintReplyNote();   // the answer/question under a card's reply box survives its rebuild
   for (const det of S.querySelectorAll('[data-detkey]')) {
     det.addEventListener('toggle', () => {
       const k = det.dataset.detkey;
@@ -8638,10 +9050,12 @@ function saRender(){
       // "開いた時だけ取りに行く"). Closed cards cost nothing; a reopened one is served
       // from SA.actLog.
       if (det.open && det.dataset.actlog) saLoadActivityLog(Number(det.dataset.actlog));
+      if (det.open && det.dataset.msgs) saLoadMessages(Number(det.dataset.msgs));
     });
     // A card re-rendered while its Activity was already open (SSE tick) keeps the log
     // it had — the fetch below no-ops once SA.actLog holds the answer.
     if (det.open && det.dataset.actlog) saLoadActivityLog(Number(det.dataset.actlog));
+    if (det.open && det.dataset.msgs) saLoadMessages(Number(det.dataset.msgs));
   }
   // "ないものは載せない" (Masa): a Proof <img> whose file is missing/broken must never
   // show a broken-image placeholder. proofImg is only a stored filename, so a file that
@@ -8760,6 +9174,49 @@ async function saCall(ids, path, body){
   }
   return r;
 }
+// The review card's reply box (§1.3/§1.4). It says "Reply, ask, or send back" —
+// until now all three did the same thing: sent the goal back to be redone.
+//
+// Unlike saAct this does NOT show its outcome first. "Feedback sent — returned to
+// To Do" is a lie when the reply was a question, and an optimistic lie is worse
+// than a moment of waiting: the card would say the work was sent back while the
+// goal sat untouched in review.
+async function saReplyCall(it, text, outcome){
+  const r = await saCall(it.ids, 'dismiss', { text, outcome });
+  if (!r?.ok) throw new Error('reply failed');
+  return r.json().catch(() => null);
+}
+async function saSendReply(it, i, text){
+  const goalId = it.goalId;
+  // By goal, not by row index: the list re-sorts while the AI is thinking, and an
+  // index-based anchor then points at someone else's card (or nothing).
+  const sel = `.sa-chat[data-goal="${goalId}"]`;
+  const seen = state.goals.find((g) => g.id === goalId)?.messageCount ?? 0;
+  it.inflight = true; saRender();
+  showReplySent(sel, text, goalId);   // BEFORE the round trip — this is the ~7s that felt broken
+  try {
+    let body = await saReplyCall(it, text, 'auto');
+    if (body?.outcome === 'unsure') {
+      it.inflight = false; saRender();
+      const picked = await askReplyDestination(sel, body.choices);
+      if (!picked) return;                       // nothing was touched; the words stay in the box
+      it.inflight = true; saRender();
+      body = await saReplyCall(it, text, picked);
+    }
+    it.inflight = false;
+    if (body?.outcome === 'answer') {
+      // The goal never moved, so the card stays exactly where it is — and the
+      // answer appears under the box that asked for it.
+      saRender();
+      showAnswerWhenItArrives(sel, goalId, seen + 1);
+      return;
+    }
+    it.st = 3; saSync(); saAdvanceFocus(goalId);
+  } catch {
+    it.inflight = false; saRender();
+    showErr('Action failed.');
+  }
+}
 // one action round-trip: optimistic one-liner → endpoint → settle or roll back
 async function saAct(it, st, path, body){
   it.st = st; it.inflight = true; saRender();
@@ -8776,6 +9233,18 @@ async function saAct(it, st, path, body){
 const SA_UNDO = { 1: 'revert-review', 2: 'reopen', 3: 'undismiss', 4: 'unarchive' }; // 07-20c: st 2 = Reject, undo = reopen
 $('seeall').addEventListener('mousedown', (e) => { if (e.target === $('seeall')) saClose(); }); // no-dim dialog: outside = close
 $('seeall').addEventListener('click', async (e) => {
+  // "+N more" in a conversation: show the whole thing, in place. Nothing was summarised
+  // away, so this only has to stop hiding it (§B3).
+  const more = e.target.closest('.convmore');
+  if (more) {
+    const gid = Number(more.closest('[data-msgbody]')?.dataset.msgbody);
+    if (Number.isFinite(gid)) {
+      SA.convOpen.add(gid);
+      const body = document.querySelector(`#seeall [data-msgbody="${gid}"]`);
+      if (body) body.innerHTML = saMsgRowsHtml(SA.msgs[gid], true);
+    }
+    return;
+  }
   const b = e.target.closest('[data-saact]');
   if (!b) return;
   const [k, v] = b.dataset.saact.split(':'); const i = Number(v);
@@ -8826,7 +9295,7 @@ $('seeall').addEventListener('click', async (e) => {
     const inp = $('seeall').querySelector(`.sa-chat[data-i="${i}"]`);
     const text = inp?.value.trim();
     if (!text) { inp?.focus(); return; }
-    return saAct(it, 3, 'dismiss', { text }).then((ok) => { if (ok) saAdvanceFocus(it.goalId); });
+    return saSendReply(it, i, text);
   }
   if (k === 'undo') {
     const path = SA_UNDO[it.st];
@@ -8844,7 +9313,7 @@ $('seeall').addEventListener('keydown', (e) => {
   if (!text) return;
   e.preventDefault();
   const it = SA.items[Number(e.target.dataset.i)];
-  if (it) saAct(it, 3, 'dismiss', { text }).then((ok) => { if (ok) saAdvanceFocus(it.goalId); }); // no extra confirm (PRD §5.1): Enter = sent back
+  if (it) saSendReply(it, Number(e.target.dataset.i), text); // no extra confirm (PRD §5.1): Enter = sent
 });
 document.addEventListener('keydown', (e) => {
   if (!SA.open || ['INPUT', 'TEXTAREA'].includes(e.target.tagName)) return;
@@ -8921,6 +9390,115 @@ setAgentEffort(state.connectedApp);
 renderAppSelect();
 renderModelSelect();
 renderEffortSelect();
+// ---- Context Bar: the folder this project works in --------------------------
+// A browser cannot open an OS folder dialog that returns a real path, so the choice is
+// the repos the engine detected (GET /api/repos) plus a typed path — the same two-part
+// shape the "which folder?" question card has always used. Rendered with the composer's
+// own dropdown vocabulary (.appmenu/.appopt); no new component.
+// Mirrors engine/lib.mjs folderName() — the browser cannot import it, and the engine
+// test pins them to the same answers so the two can't drift apart.
+function folderName(dir){
+  const d = String(dir ?? '').replace(/\/+$/, '');
+  return d ? d.split('/').pop() : '';
+}
+function folderShort(dir){
+  const home = String(state.repoHome || '');
+  const d = String(dir || '');
+  return home && d.startsWith(home) ? `~${d.slice(home.length)}` : d;
+}
+function renderCtxBar(){
+  const btn = $('ctxdirnow'); if (!btn) return;
+  const proj = state.projects.find((p) => p.id === state.active);
+  const dir = String(proj?.dir ?? '');
+  // The repo's NAME, the way Claude prints it — the full path lives in the menu and the
+  // tooltip. No folder yet is a real state, not a blank: say so rather than render empty.
+  // folderName is shared with the menu rows below (engine/lib.mjs): two copies of "take
+  // the last segment" is how a chip and its own menu start disagreeing.
+  btn.textContent = dir ? (folderName(dir) || folderShort(dir)) : 'choose a folder';
+  $('ctxdirbtn').title = dir || 'Choose the folder this project works in';
+  // Branch: only when the engine actually read one off the folder (a folder that is not
+  // a repo has none, and an invented branch would be worse than no chip at all).
+  const branch = String(proj?.branch ?? '');
+  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 ?? [])
+    .map((r) => `<button type="button" class="appopt${r.dir === cur ? ' active' : ''}" data-ctxdir="${esc(r.dir)}"`
+      + ` title="${esc(r.dir)}"><span class="nm">${esc(folderName(r.dir))}</span>`
+      // LRM, so the rtl clipping trims the HEAD of the path without reversing the text
+      + `<span class="pt">\u200e${esc(folderShort(r.dir))}</span></button>`)
+    .join('');
+  menu.innerHTML = `${opts}<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.
+function worktreeKey(){ return `sel:worktree:${state.active}`; }
+function worktreeOn(){ return localStorage.getItem(worktreeKey()) !== '0'; }
+function renderWorktreeChip(){
+  const el = $('ctxwt'); if (!el) return;
+  el.setAttribute('aria-checked', worktreeOn() ? 'true' : 'false');
+}
+// 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(){
+  if (state.repos !== null) return;
+  state.repos = [];
+  try {
+    const r = await fetch(withKey('/api/repos'));
+    const body = r.ok ? await r.json() : {};
+    state.repos = Array.isArray(body.repos) ? body.repos : [];
+    state.repoHome = String(body.home ?? '');
+  } catch { /* no list — the typed path still works, which is the honest fallback */ }
+  renderCtxBar();
+}
+// Move this project. The engine refuses a folder where work cannot happen and says
+// which; that sentence is shown as-is, because "it didn't work" without the reason is
+// the failure this control exists to prevent.
+async function setProjectFolder(dir){
+  const want = String(dir ?? '').trim();
+  const msg = $('ctxdirmsg');
+  const say = (t, bad) => { if (msg) { msg.textContent = t; msg.classList.toggle('bad', Boolean(bad)); } };
+  if (!want) { say('Type a path, or pick one above.', true); return; }
+  say('');
+  try {
+    const r = await fetch(withKey(`/api/projects/${encodeURIComponent(state.active)}`), {
+      method: 'PUT', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ dir: want }),
+    });
+    const body = await r.json().catch(() => ({}));
+    if (!r.ok) { say(body.error || 'That folder cannot be used.', true); return; }
+    if (Array.isArray(body.projects)) state.projects = body.projects;
+    $('ctxdirmenu').classList.remove('show');
+    render();
+  } catch { say('Could not reach the engine.', true); }
+}
+$('ctxdirbtn').onclick = (e) => {
+  e.stopPropagation();
+  const menu = $('ctxdirmenu');
+  const opening = !menu.classList.contains('show');
+  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();
+  const opt = e.target.closest('[data-ctxdir]');
+  if (opt) { setProjectFolder(opt.dataset.ctxdir); return; }
+  if (e.target.closest('#ctxdiruse')) setProjectFolder($('ctxdirin')?.value ?? '');
+});
+$('ctxdirmenu').addEventListener('keydown', (e) => {
+  e.stopPropagation();
+  if (e.key === 'Enter' && e.target.id === 'ctxdirin') { e.preventDefault(); setProjectFolder(e.target.value); }
+});
 $('appbtn').onclick = (e) => { e.stopPropagation(); $('appmenu').classList.toggle('show'); };
 $('appmenu').addEventListener('click', (e) => {
   const opt = e.target.closest('.appopt');
@@ -8940,6 +9518,10 @@ $('appmenu').addEventListener('click', (e) => {
 });
 document.addEventListener('click', (e) => {
   if (!e.target.closest('.appsel')) $('appmenu').classList.remove('show');
+  // Same rule for the folder menu: a click anywhere else closes it (§: settings-style
+  // popovers close on outside tap — measured against composedPath, not target alone,
+  // so a click inside the menu's own input never closes it).
+  if (!e.composedPath().some((n) => n?.id === 'ctxdirsel')) $('ctxdirmenu').classList.remove('show');
 });
 $('modelbtn').onclick = (e) => { e.stopPropagation(); $('modelmenu').classList.toggle('show'); };
 $('modelmenu').addEventListener('click', (e) => {