@galda/cli 0.10.24 → 0.10.27

package/CLAUDE.md

@@ -31,7 +31,18 @@
 ## 実装規律
 
 - 変更は最小限。周辺コードの流儀に合わせる。
-- `コミットしない`（git 操作は Manager 側の仕事。workerは編集のみ）。
+- **git は「行為」でなく「場所」で縛る**（Masa決定 2026-07-17・再議論しない）。
+  **commit＝保存 / PR＝主張 / merge＝採用（Masaだけ）**。旧文言 `コミットしない` は**保存と主張を混ぜていた**上に、
+  worker には `WORKER_TOOLS`（`engine/lib.mjs`）に git が1文字も無く**権限で既に不可**＝
+  **縛りたくない相手にだけ効き、PRを出すのにコミットが必須の CTO/engineer だけを縛っていた**ので削除。
+  - 🔴 **共有チェックアウト `~/agent-manager` で git を触らない**。ここは Masa の作業場所で、
+    全 worktree の親（実測135本）で、4401 の常駐 manager の起動元。HEAD が勝手に動く事故の出どころ
+    （2026-07-16 実発生）。`lane verify|pr|finish` が**ここで落ちる**。
+  - ✅ **自分のレーンの worktree（`~/am-wt-<topic>`）では、こまめにコミットする**。Masa の視界に入らない＝
+    タダで、戻せる。Masa の言葉＝「**あの時のあのバージョンがマジで失われて、もう一回作り直す**ことがある」。
+    「捨てる前提の3方向」も自分の worktree なら好きなだけコミットしてよい（嫌なのは**Masaの場所に置かれること**）。
+  - **Masa の視界に入るのは PR から**。`lane verify` は**汚れたツリーで落ち**、`lane pr` は**検証したコミット以外を
+    出荷させない**＝「コミットせずに PR」「A を検証して B を出荷」は原理的に作れない。
 - 報告は日本語で短く：何を変えたか・どのファイルか・人間が確認すべき点。
 
 ## 並行開発（Masa指示 2026-07-16・必須）

package/app/index.html

@@ -592,6 +592,10 @@
   .task .name{font-size:13px;color:var(--ink);line-height:1.35;overflow:hidden;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
   .task.done .name{color:var(--ink)}
   .task .cond{font-family:var(--mono);font-size:10.5px;color:var(--ink3);margin-top:3px}
+  /* PRD §6.5: a folded goal is settled, not failed — its title sinks to --ink2 like
+     any other settled row. No red, no painted surface, no badge (§1.5 art.8/art.9);
+     the pointer is the text itself, which reads as "the work is over there". */
+  .task.revrow.foldrow .name{color:var(--ink2)}
   .replyctx{color:var(--ink2)}
   .replyctx svg{width:11px;height:11px;vertical-align:-1px;stroke:currentColor;stroke-width:2;fill:none}
   .side-foot{flex:0 0 auto;padding:11px 14px;border-top:1px solid var(--hair);font-size:11.5px;color:var(--ink3);display:flex;align-items:center;gap:7px}
@@ -1438,6 +1442,33 @@
   /* review row number — #NN PREFIX on the title (HANDOFF-v45 §11), same form as the To Do
      rows (PRD §5: numbering matches the sidebar) */
   #fsRoot .rcard .rid{font-size:10.5px;font-weight:600;color:var(--ink3);margin:0 5px 0 0;display:inline-block;font-variant-numeric:tabular-nums}
+  /* PRD §6.5 fold note — on the carrier ("also carries #13") and on the folded card
+     ("merged into #12"). Deliberately NOT the .pr treatment: no tinted ground, no
+     badge (§1.5-9), no red — folding is not a failure. Mono + --ink3 = the same quiet
+     meta tone the rest of the lane uses (§5.5「品は罫線とトーン差・monoで出す」). */
+  /* display:block, not inline-block: it shares .rc with the PR pill, which is itself
+     inline-block — side by side the pill sat on top of the last "#NN" and ate it. */
+  #fsRoot .rcard .fnote{font-family:var(--mono);font-size:9.5px;color:var(--ink3);margin-top:3px;display:block}
+  /* In rv3 the meta sits on the near-black photo scrim whatever the theme, where --ink3
+     is effectively invisible (§5.5「見えるが騒がない」— near-invisible is a fail). Match
+     .rid's white-on-scrim treatment. The folded card opts out of the scrim (rule above),
+     so it keeps --ink3 on the panel where that tone is correct. */
+  #fsRoot[data-rv="3"] .rcard:not(.fold) .fnote{color:rgba(255,255,255,.66);text-shadow:0 1px 3px rgba(0,0,0,.55)}
+  /* A folded card is settled, not failed: title sinks to the settled tone, and it
+     keeps no ✓/✕ because the thing to approve lives on the goal it was folded into. */
+  #fsRoot .rcard.fold .t{color:var(--ink2)}
+  /* A folded card is a pointer, not a review item: no proof to show, nothing to approve.
+     So it opts OUT of the rv3 thumbnail treatment (whose .rc is absolutely positioned
+     over an 84px photo ground) and stays the same quiet line in every view — the form
+     Masa drew. Giving it a fake dark thumbnail would claim it has something to look at. */
+  /* .fold.noimg, not .fold: the placeholder-ground rule below is `.rcard.noimg`, which
+     ties this on specificity and would win on order — a folded card would keep the fake
+     dark thumbnail ground. Matching both classes settles it regardless of order. */
+  #fsRoot[data-rv="3"] .rcard.fold.noimg{display:flex;position:static;align-items:center;gap:10px;
+    padding:9px 10px;min-height:0;border:1px solid var(--hair);border-radius:11px;background:none;box-shadow:none}
+  #fsRoot[data-rv="3"] .rcard.fold.noimg .rc{position:static;padding:0;background:none}
+  #fsRoot[data-rv="3"] .rcard.fold.noimg .t{color:var(--ink2);font-size:12.5px;text-shadow:none}
+  #fsRoot[data-rv="3"] .rcard.fold.noimg .rid{color:var(--ink3)}
   /* reference numbers everywhere else (HANDOFF-v45 §11): a leading #NN prefix on every
      To Do item's name — same goal = same number (goalReviewNumber), distinct from the
      PR's own #id shown separately. */
@@ -2545,11 +2576,18 @@ const STATUS_LABEL = {
 // chip too; omitting it reproduces the original hardcoded labels. `startedAt`
 // (goal.startedAt) disambiguates 'running': planning finishes with every
 // task still 'queued', so it reads QUEUED until startedAt is set, then DOING.
+// Mirrors engine/lib.mjs goalChip() — this inline script can't import that
+// module. Had drifted out of sync (missing 'retesting'/'reverted'/'folded',
+// all silently falling to FAIL) until Masa caught a reverted goal reading as
+// FAIL (2026-07-17); keep this in lockstep with goalChip() by hand.
 const GOAL_CHIP = (s, columns, startedAt) => s === 'stacked' || s === 'sending' ? [pickColumnLabel(columns, 'todo', 'QUEUED'), ''] :
   s === 'running' && !startedAt ? [pickColumnLabel(columns, 'todo', 'QUEUED'), ''] :
   ['planning', 'running'].includes(s) ? [pickColumnLabel(columns, 'doing', 'DOING'), 'doing'] :
   s === 'review' ? [pickColumnLabel(columns, 'review', 'REVIEW'), 'review'] :
   s === 'done' ? [pickColumnLabel(columns, 'done', 'DONE'), ''] :
+  s === 'retesting' ? ['RE-TESTING', 'doing'] :
+  s === 'reverted' ? ['REVERTED', ''] :
+  s === 'folded' ? ['FOLDED', ''] :
   s === 'blocked' ? ['BLOCKED', 'blocked'] : s === 'needsInput' ? ['NEEDS INPUT', 'blocked'] : ['FAIL', ''];
 const FINISHED = (s) => ['done', 'partial', 'failed', 'interrupted'].includes(s);
 const ICONS = {
@@ -2703,6 +2741,16 @@ function reviewCardConfigFor(projectId){ return { ...DEFAULT_REVIEW_DEFINITION.r
 // goal's own request language, same as the planner/worker; ja/en pin the
 // project to one language regardless of what a given goal was typed in.
 function reviewLangFor(projectId){ const l = reviewDefinitionFor(projectId).language; return (l === 'en' || l === 'ja') ? l : 'auto'; }
+// PRD §6.5 fold note language (Masa 2026-07-17: "ユーザーの言語に合わせて" — not
+// hardcoded English). Mirrors the server's own 'auto' resolution exactly
+// (reviewDefinition.language === 'auto' ? detectRequestLanguage(goal.text) : ...,
+// engine/server.mjs) so this note reads in the same language as the review
+// headline/PR body for the same goal: the project's fixed override wins if set,
+// otherwise match the language the goal's own request was written in.
+function foldLangFor(goal){
+  const l = reviewLangFor(state.active);
+  return (l === 'ja' || l === 'en') ? l : (/[぀-ヿ㐀-鿿]/.test(goal?.text || '') ? 'ja' : 'en');
+}
 
 function esc(s){ const d = document.createElement('div'); d.textContent = s ?? ''; return d.innerHTML; }
 
@@ -3609,7 +3657,16 @@ function renderTasks(){
     // Feedback 3: the row carries only the check-line + PR link. Tests/proof are
     // internal gate checks (they still block), NOT list clutter; the Review number
     // is redundant with the title; tapping the row opens the detail (no button).
+    // PRD §6.5: goals that landed on the same files were folded onto this one, so
+    // they ride this PR instead of opening a second one editing the same lines.
+    // Whoever opens this review must know it answers more than one request.
+    // Only rendered when it actually happened (§1.5 art.3 — no empty container).
+    const carried = pgoals.filter((x) => x.foldedInto === g.id);
+    const carryNote = carried.length ? (foldLangFor(g) === 'ja'
+      ? `+ ${carried.map((x) => `#${x.id}`).join(', ')} の仕事もここに入っています`
+      : `also carries ${carried.map((x) => `#${x.id}`).join(', ')}`) : '';
     return `<div class="task revrow" data-goal="${g.id}"><div class="ic pending"></div><div class="tx"><div class="name">${esc(checkLine)} ${goalSourceBadge(g.source)}</div>
+     ${carryNote ? `<div class="cond carries">${carryNote}</div>` : ''}
      <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">
@@ -3619,6 +3676,16 @@ function renderTasks(){
      </div></div>`;
   }).join('')
     + (reviewGoalsAll.length > REVIEW_LIMIT ? `<div class="more" data-reviewmore="1">${state.showAllReview ? 'show less' : `more · +${reviewGoalsAll.length - REVIEW_LIMIT}`}</div>` : '');
+  // PRD §3.5: a folded goal is never deleted — deleting it just moves the question
+  // from "why is my finished work stuck" to "where did #13 go". It keeps its row and
+  // says where its work went. Not a failure: no red, no painted surface (§1.5 art.8);
+  // no ✓/✕ either, because the thing to approve lives on the goal it was folded into.
+  const foldedRows = pgoals.filter((g) => g.status === 'folded').map((g) => {
+    const checkLine = (g.reviewSummary?.check || g.plan?.[0] || g.text || '').replace(/\s+/g, ' ').slice(0, 66);
+    const mergedNote = foldLangFor(g) === 'ja' ? `→ #${esc(String(g.foldedInto))} にまとめました` : `merged into #${esc(String(g.foldedInto))}`;
+    return `<div class="task revrow foldrow" data-goal="${g.id}"><div class="ic pending"></div><div class="tx"><div class="name">${esc(checkLine)} ${goalSourceBadge(g.source)}</div>
+     <div class="cond">${mergedNote}</div></div></div>`;
+  }).join('');
   const doneRows = grouped(list.filter((t) => ['done', 'skipped'].includes(t.status)).sort((a, b) => b.num - a.num), (t) => row(t));
   // Pending = deliberately shelved goals (e.g. "npm公開はPhase 2"): never
   // planned or queued until Start is pressed. Parked below To do on purpose.
@@ -3630,7 +3697,7 @@ function renderTasks(){
   const savedQAns = captureFocusedAnswerInput($('tasklist'), 'data-qansinput');
   $('tasklist').innerHTML =
     sec('Attention', attention, 'attn')
-    + sec(pickColumnLabel(cols, 'review', 'Review'), reviewDigest + review, 'reviewsec', reviewDefinitionFor(state.active).description, REVIEW_DEF_HINT)
+    + sec(pickColumnLabel(cols, 'review', 'Review'), reviewDigest + review + foldedRows, 'reviewsec', reviewDefinitionFor(state.active).description, REVIEW_DEF_HINT)
     + sec(pickColumnLabel(cols, 'doing', 'Doing'), doing)
     + sec(pickColumnLabel(cols, 'todo', 'To do'), todo, 'todosec')
     + sec('Pending', pendingRows, 'dim')
@@ -3673,9 +3740,16 @@ function renderTasks(){
           || e.target.closest('.revquick') || e.target.closest('.qreplyrow')) return;
       const goalId = Number(el.dataset.goal);
       const goal = state.goals.find((g) => g.id === goalId);
-      goToGoalInChat(goalId);
-      if (goal?.status === 'review') openReviewChecklist(goalId);
-      else openGoalDetail(goalId);
+      // A folded goal has nothing of its own to open — its work is in the goal it
+      // was folded into. Send the click there. The target briefly goes back to
+      // 'running' while it re-runs this goal's request, so resolve what to open
+      // from the target's own status rather than assuming it is still in Review.
+      const opened = goal?.status === 'folded' && goal.foldedInto != null
+        ? state.goals.find((x) => x.id === goal.foldedInto) ?? goal
+        : goal;
+      goToGoalInChat(opened.id);
+      if (opened.status === 'review') openReviewChecklist(opened.id);
+      else openGoalDetail(opened.id);
     });
   }
   for (const b of $('tasklist').querySelectorAll('.reqopen')) {
@@ -5140,11 +5214,18 @@ function renderFsReview(){
   const pgoals = state.goals.filter((g) => g.projectId === state.active);
   const list = state.tasks.filter((t) => t.projectId === state.active);
   const rows = buildReviewDigest({ goals: pgoals, tasks: list });
-  if (!rows.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
+  // PRD §3.5/§6.5: folded goals still have a row — they were never deleted, their work
+  // just went somewhere else. They must be able to hold this section up ALONE: the goal
+  // they were folded into flips back to 'running' while it re-runs their request, so
+  // there is a window where `rows` is empty and only the folded ones remain. Returning
+  // early there would make #13 vanish for the length of the re-run — exactly the "where
+  // did my finished work go" this feature exists to prevent.
+  const foldedGoals = pgoals.filter((g) => g.status === 'folded');
+  if (!rows.length && !foldedGoals.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
   const green = rows.filter((r) => !r.testResult || r.testResult.ok !== false).length;
   const proofN = rows.filter((r) => r.proof).length;
   const blockedN = pgoals.filter((g) => g.status === 'blocked').length;
-  const pct = Math.round((green / rows.length) * 100);
+  const pct = rows.length ? Math.round((green / rows.length) * 100) : 0;
   // CDO review 2026-07-08 §6: same fix as the s5sum digest above — green/rows.length
   // already exclude blocked goals (different status, never enters `rows`), so the
   // ratio was already correct; "all green" is the line that used to fire regardless
@@ -5170,26 +5251,49 @@ function renderFsReview(){
     // retest ×3 note (v45 §5.3): the goal came back green from a Ledger Dismiss
     const g0 = pgoals.find((g) => g.id === r.goalIds[0]);
     const rnote = g0?.retest?.passed ? `<span class="rnote">✓ ${esc(g0.retest.note)}</span>` : '';
-    return `<div class="rcard${img ? '' : ' noimg'}" data-fsrev="${r.goalIds[0]}">${img}<div class="rc"><div class="t">${rid}${esc(r.checkLine)}</div>${rnote}${pr}</div>
+    // PRD §6.5: goals that landed on the same files ride this card's PR instead of
+    // opening a second one that edits the same lines. Whoever opens this review has
+    // to know it answers more than one request. Only when it happened (§1.5-3).
+    const carried = pgoals.filter((x) => r.goalIds.includes(x.foldedInto));
+    const cnote = carried.length ? `<span class="fnote">${foldLangFor(g0) === 'ja'
+      ? `+ ${carried.map((x) => `#${x.id}`).join(', ')} の仕事もここに入っています`
+      : `also carries ${carried.map((x) => `#${x.id}`).join(', ')}`}</span>` : '';
+    return `<div class="rcard${img ? '' : ' noimg'}" data-fsrev="${r.goalIds[0]}">${img}<div class="rc"><div class="t">${rid}${esc(r.checkLine)}</div>${rnote}${cnote}${pr}</div>
       <div class="act"><button class="b" data-fsapprove="${ids}" title="Approve">✓</button><button class="b no" data-fsdismiss="${ids}" title="Send back">✕</button></div></div>`;
   };
+  // A folded goal is settled, not failed: no ✓/✕ (the thing to approve lives on the goal
+  // it was folded into), no red, no painted surface (§1.5-8) — just its own number, what
+  // it asked for, and where the work went. Tapping it opens that goal (§1.5-9 wording).
+  const foldCard = (g) => {
+    const line = String(g.reviewSummary?.check || g.plan?.[0] || g.text || '').replace(/\s+/g, ' ').slice(0, 60);
+    const mergedNote = foldLangFor(g) === 'ja' ? `→ #${esc(String(g.foldedInto))} にまとめました` : `merged into #${esc(String(g.foldedInto))}`;
+    return `<div class="rcard noimg fold" data-fsfold="${g.id}">
+      <div class="rc"><div class="t"><span class="rid gno" data-n="${g.id}">#${g.id}</span>${esc(line)}</div>
+      <span class="fnote">${mergedNote}</span></div></div>`;
+  };
   // V3-C (Masa決定 2026-07-07): no collapsed strip — it duplicated the sm2 meter right
   // above. Reviews render directly: meter + Review header + cards (+N more fold, §1.5-8).
-  el.innerHTML = `<div class="sm2">
+  // The meter counts what is reviewable, so it only exists when something is (§1.5-3):
+  // during the re-run window the section can be folded-rows-only, and "0 / 0 ready" is
+  // a claim about nothing.
+  el.innerHTML = `${rows.length ? `<div class="sm2">
       <div class="m-top"><span class="num mt">${green} / ${rows.length}</span><span> ready</span><button class="detailbtn" id="fsSeeAll">See all</button></div>
       <div class="m-bar"><i style="width:${pct}%"></i></div>
-      <div class="s">${esc(sline)}</div></div>
+      <div class="s">${esc(sline)}</div></div>` : ''}
     <div class="revhd" id="fsRevHd"><span class="hd">Review</span><span class="rnum num">${green} ready</span>
       <span class="rvbtns">
         <button class="rvb${fsUI.rv === 3 ? ' on' : ''}" data-fsrv="3" title="Thumbnails"><svg viewBox="0 0 24 24"><rect x="3" y="5" width="18" height="14" rx="2"/><path d="M3 15l5-4 4 3 4-5 5 6"/></svg></button>
         <button class="rvb${fsUI.rv === 1 ? ' on' : ''}" data-fsrv="1" title="List"><svg viewBox="0 0 24 24"><rect x="3" y="4" width="7" height="7" rx="1.5"/><path d="M13 6h8M13 9h5"/><rect x="3" y="14" width="7" height="7" rx="1.5"/><path d="M13 16h8M13 19h5"/></svg></button>
         <button class="rvb${fsUI.rv === 2 ? ' on' : ''}" data-fsrv="2" title="Compact"><svg viewBox="0 0 24 24"><path d="M3 6h18M3 12h18M3 18h18"/></svg></button>
       </span></div>
-    <div class="revlist">${shown.map(card).join('')}
+    <div class="revlist">${shown.map(card).join('')}${foldedGoals.map(foldCard).join('')}
       ${rows.length > RCAP ? `<div class="morefold" id="fsRevMore">${fsUI.revMore ? 'less' : `+${rows.length - RCAP} more`}<span class="g">›</span></div>` : ''}</div>`;
   // See all = the Ledger dialog (HANDOFF-v45 §5, replacing the ペライチ);
   // Cmd/Ctrl+click = standalone full-page view in a new tab (#seeall route).
-  $('fsSeeAll').onclick = (e) => { e.stopPropagation();
+  // guarded: the meter (and with it See all) is absent while the section holds only
+  // folded rows — see the §1.5-3 note above.
+  const seeAll = $('fsSeeAll');
+  if (seeAll) seeAll.onclick = (e) => { e.stopPropagation();
     if (e.metaKey || e.ctrlKey) { window.open(saStandaloneUrl(), '_blank'); return; }
     saOpen(); };
   const moreEl = el.querySelector('#fsRevMore');
@@ -5200,6 +5304,19 @@ function renderFsReview(){
     if (e.target.closest('a') || e.target.closest('.act')) return;
     openReviewChecklist(Number(c.dataset.fsrev));
   };
+  // A folded goal has nothing of its own to review — its work is in the goal it was
+  // folded into, so the tap goes there. That goal is only in Review once its re-run
+  // finishes, so resolve from its live status instead of assuming (openReviewChecklist
+  // on a running goal would present an empty checklist).
+  for (const c of el.querySelectorAll('[data-fsfold]')) c.onclick = (e) => {
+    if (e.target.closest('a')) return;
+    const g = state.goals.find((x) => x.id === Number(c.dataset.fsfold));
+    const target = state.goals.find((x) => x.id === g?.foldedInto);
+    if (!target) return;
+    goToGoalInChat(target.id);
+    if (target.status === 'review') openReviewChecklist(target.id);
+    else openGoalDetail(target.id);
+  };
   for (const b of el.querySelectorAll('[data-fsapprove]')) b.onclick = async (e) => { e.stopPropagation();
     let r; for (const id of b.dataset.fsapprove.split(',')) r = await fetch(withKey(`/api/goals/${id}/approve`), { method: 'POST' });
     if (r && r.ok) { celebrateApprove(); await refresh(); } else showErr('Approve failed.'); };
@@ -6061,12 +6178,13 @@ function bootDisconnected(info){
     #connectGate .cg-switch a{color:var(--blue,#8fb0ff);text-decoration:none}
     /* A long wait (15s+) almost always means an account mismatch, not a slow
        first connect (Masa 2026-07-17: kept re-running npx, kept landing back
-       here — the always-on caption below was too easy to miss). Escalate to
-       the existing warning tone (--amber, same as failed-step/review chips)
-       — color only, no filled box, per the hover/attention convention used
-       everywhere else in this app. */
-    #connectGate .cg-switch.escalated{color:var(--amber);font-weight:600}
-    #connectGate .cg-switch.escalated a{color:var(--amber);text-decoration:underline}
+       here — the always-on caption below was too easy to miss). At this point
+       the board is unusable until the user acts, so this reads as an error
+       state, not a caution — --danger, same tone as failed steps/review chips
+       (Masa 2026-07-17: escalated hint should be red, not amber) — color only,
+       no filled box, per the hover/attention convention used everywhere else. */
+    #connectGate .cg-switch.escalated{color:var(--danger);font-weight:600}
+    #connectGate .cg-switch.escalated a{color:var(--danger);text-decoration:underline}
     #connectGate .cg-x{position:absolute;top:14px;right:16px;width:28px;height:28px;border:0;background:transparent;color:var(--ink3,#6b6862);font-size:20px;line-height:1;cursor:pointer}
     #connectGate .cg-wait{display:inline-flex;align-items:center;gap:7px;font:500 10.5px/1 var(--mono,monospace);letter-spacing:.08em;color:var(--ink3,#6b6862);margin-top:16px}
     #connectGate .cg-wait i{width:6px;height:6px;border-radius:50%;background:var(--green,#3DDC97);animation:cgpulse 1.8s ease-in-out infinite}
@@ -6088,7 +6206,7 @@ function bootDisconnected(info){
     + '<a href="https://openai.com/codex/" target="_blank" rel="noreferrer">Codex</a>, then run the same command '
     + '— Galda uses whichever agent you have.</p>'
     + '<p class="cg-who">Signed in as <b></b></p>'
-    + '<p class="cg-switch">Already running Galda under a different account? Run <code>npx @galda/cli --signin</code> and pick this one. Or <a href="/logout">switch this browser →</a></p>'
+    + '<p class="cg-switch">Already running Galda under a different account? Run <code>npx @galda/cli --signin</code> and pick this one. Or <a href="/logout">switch Google account →</a></p>'
     + '<div class="cg-wait"><i></i>WAITING FOR THIS DEVICE</div></div>';
   document.body.appendChild(ov);
   ov.querySelector('.cg-who b').textContent = email || 'your account';
@@ -6131,7 +6249,7 @@ function bootDisconnected(info){
   const CG_ESCALATE_MS = 15000;
   const escalateTimer = (email && cgSwitch) ? setTimeout(() => {
     cgSwitch.classList.add('escalated');
-    cgSwitch.innerHTML = `Still waiting? Galda may already be running on this computer under a <b>different account</b> than <b>${email.replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]))}</b>. Run <code>npx @galda/cli --signin</code> in that terminal and pick this account. Or <a href="/logout">switch this browser →</a>`;
+    cgSwitch.innerHTML = `Still waiting? Galda may already be running on this computer under a <b>different account</b> than <b>${email.replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]))}</b>. Run <code>npx @galda/cli --signin</code> in that terminal and pick this account. Or <a href="/logout">switch Google account →</a>`;
   }, CG_ESCALATE_MS) : null;
   try {
     const es = new EventSource('/presence');

package/engine/lib.mjs

@@ -1069,6 +1069,7 @@ export function goalGroupStatus(goalStatus, startedAt) {
   if (goalStatus === 'planning' || goalStatus === 'running') return 'doing';
   if (goalStatus === 'review') return 'review';
   if (goalStatus === 'retesting') return 'doing'; // Ledger Dismiss → engine re-testing ×3 (v45 §5.3)
+  if (goalStatus === 'folded') return 'review'; // PRD §6.5: rendered inside the Review section, not Done
   if (goalStatus === 'blocked') return 'attn'; // §4E: blocked is Attention, not Done
   if (goalStatus === 'needsInput') return 'todo'; // smart intake: awaiting an answer
   return 'done'; // includes 'reverted' (terminal)
@@ -1101,6 +1102,7 @@ export function goalChip(goalStatus, columns, startedAt) {
   if (goalStatus === 'done') return [pickColumnLabel(columns, 'done', 'DONE'), ''];
   if (goalStatus === 'retesting') return ['RE-TESTING', 'doing']; // Ledger Dismiss → retest ×3 (v45 §5.3)
   if (goalStatus === 'reverted') return ['REVERTED', '']; // Ledger Revert: terminal, distinct from archived
+  if (goalStatus === 'folded') return ['FOLDED', '']; // PRD §6.5: settled, not failed — no red/badge class, matches 'done'/'reverted'
   if (goalStatus === 'blocked') return ['BLOCKED', 'blocked']; // §4E: distinct state (reason + reverify), not FAIL/Done
   if (goalStatus === 'needsInput') return ['確認待ち', 'blocked']; // smart intake: awaiting an answer
   return ['FAIL', ''];
@@ -1595,6 +1597,44 @@ export function detectConflicts(goal, otherGoals) {
     .map((g) => g.id);
 }
 
+// ---- the review gate (PRD §6.5) --------------------------------------------
+// Detection alone was never the point: a flag that says "this conflicts with
+// #38" still leaves the human to untangle two PRs that edit the same lines.
+// PRD §6.5 requires that PRs sitting in Review never conflict WITH EACH OTHER,
+// so work that lands on the same paths must land on the SAME PR.
+//
+// This is the last of the three gates (queue / doing / review) and the only one
+// that knows the truth: by the time a goal finishes, its changed files are
+// measured, not guessed. So the promise rests here, and the earlier gates are
+// free to be wrong — being wrong costs a re-run, never a conflict.
+//
+// Why the caller re-runs the folded goal's intent inside the target's worktree
+// instead of replaying its diff: engine/pr.mjs COPIES changed files into the PR
+// worktree (cp -R) rather than merging them, so aiming this goal's PR at the
+// target's branch would silently overwrite the target's version of any shared
+// file. Re-running lets the worker SEE the target's changes and build on them,
+// which means there is never a conflict to resolve in the first place.
+//
+// `candidates` are same-project goals already awaiting review (each
+// `{ id, changedFiles }`). Returns the id to fold into, or null to open a
+// normal PR.
+//
+// Deliberately folds ONLY when exactly one review goal overlaps. With two or
+// more, folding is not merely insufficient, it is harmful: pulling goal B into
+// A's PR drags B's paths along, so A's PR starts colliding with C's where it
+// did not before. That cluster wants one shared PR, which we cannot build by
+// bolting onto an already-open one — so we leave those flagged (the old
+// behaviour) rather than make the pile worse. Known remainder, named in the
+// handoff, not silently swallowed.
+export function pickFoldTarget(goal, candidates) {
+  const files = goal?.changedFiles ?? [];
+  if (!files.length) return null;
+  const overlapping = (candidates ?? []).filter(
+    (g) => g && g.id !== goal.id && goalsConflict(files, g.changedFiles),
+  );
+  return overlapping.length === 1 ? overlapping[0].id : null;
+}
+
 // Which of `commits` (newest-first, as returned by parseGitLog) are new
 // since we last synced up to `lastSeenHash`? null means nothing has been
 // seen yet, so every commit is new. If lastSeenHash isn't found in the

package/engine/server.mjs

@@ -21,7 +21,7 @@ import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { pathToFileURL } from 'node:url';
 import { needsProjectFolder, folderLabel, buildFolderQuestion, resolveFolderAnswer, classifyFolderTarget, buildFolderInitConfirm, isFolderInitConfirmed, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer, routeQuestionAnswer, notUnderstoodNote, parseRelocalizedQuestion, classifyAuthProbe, authBannerText } from './lib.mjs';
-import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, permissionModeFor, isPlanReview, nextAfterPlanApprove, GOAL_MODES, parseSkillFrontmatter, collectSkills, retestGoal, cancelRetestGoal, computeRetestOutcome, revertGoal, planRevertActions, archiveGoal, unarchiveGoal, undismissGoal, parseNumstat, truncateDiffText, sumUsage, resolveEntryUrl, parseGitLog, diffNewCommits, replayQueueLog, reconcileOrphanGoals, reorderQueue, sortQueueByPriority, TASK_PRIORITIES, validateWorkflowColumns, DEFAULT_WORKFLOW_COLUMNS, validateReviewDefinition, DEFAULT_REVIEW_DEFINITION, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision } from './lib.mjs';
+import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, permissionModeFor, isPlanReview, nextAfterPlanApprove, GOAL_MODES, parseSkillFrontmatter, collectSkills, retestGoal, cancelRetestGoal, computeRetestOutcome, revertGoal, planRevertActions, archiveGoal, unarchiveGoal, undismissGoal, parseNumstat, truncateDiffText, sumUsage, resolveEntryUrl, parseGitLog, diffNewCommits, replayQueueLog, reconcileOrphanGoals, reorderQueue, sortQueueByPriority, TASK_PRIORITIES, validateWorkflowColumns, DEFAULT_WORKFLOW_COLUMNS, validateReviewDefinition, DEFAULT_REVIEW_DEFINITION, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision } from './lib.mjs';
 import { openPR } from './pr.mjs';
 import { runVerification, exerciseUi } from './verify.mjs';
 
@@ -2478,7 +2478,55 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
   // network needed) — this goal's changed files are already final at this
   // point (all its tasks are done), so its conflictsWith is accurate even if
   // PR creation itself fails (e.g. no `gh` auth) or is still no-op'd (no code).
-  updateGoalConflicts(goal);
+  const conflicts = updateGoalConflicts(goal);
+  // PRD §6.5 — the review gate. conflictsWith above only DESCRIBES the
+  // collision; this acts on it. A goal that landed on the same paths as one
+  // already awaiting review must not open a SECOND PR: both would edit the same
+  // lines and fight when they land, which is exactly the "10 goals, 10
+  // conflicting PRs" morning §6.5 exists to kill. Same-place work goes onto the
+  // same PR, so what sits in Review never conflicts with itself.
+  //
+  // This is the last of the three gates (queue / doing / review) and the only
+  // one that carries the promise: the files compared here are measured, not
+  // predicted. That is what lets the earlier, cheaper gates guess — a wrong
+  // guess costs the re-run below, never a conflict.
+  //
+  // We re-run this goal's intent inside the target's worktree rather than
+  // replaying its diff, because openPR COPIES changed files into the PR
+  // worktree instead of merging them: aiming this goal at the target's branch
+  // would silently overwrite the target's version of any shared file. Re-running
+  // lets the worker SEE the target's changes and build on them, so there is
+  // never a conflict to resolve. It costs one extra worker pass — the price of
+  // gates 1/2 having missed, paid in tokens instead of in the user's morning.
+  //
+  // Same owner only: folding across owners would splice one user's work onto
+  // another's PR and echo its text back — the same leak the intake-side fold
+  // guards against with a visibility check.
+  const foldTarget = conflicts.length
+    ? goals.find((g) => g.id === pickFoldTarget(
+      { id: goal.id, changedFiles: goalChangedFileUnion(goal.id) },
+      goals
+        .filter((c) => c.id !== goal.id
+          && c.projectId === goal.projectId
+          && c.status === 'review'
+          && (c.owner ?? 'owner') === (goal.owner ?? 'owner'))
+        .map((c) => ({ id: c.id, changedFiles: goalChangedFileUnion(c.id) })),
+    ))
+    : null;
+  if (foldTarget) {
+    goalAct(`Same files as goal ${foldTarget.id} — folding onto its PR instead of opening a second one.`);
+    // The target re-opens: it has new work to do, and createGoalPR's rework path
+    // will push the result onto the PR branch it already owns.
+    foldTarget.status = 'running';
+    queueReplyTask(foldTarget, goal.text.slice(0, 8000));
+    saveGoal(foldTarget);
+    // The folded goal keeps its row (PRD §3.5: a submission is never dropped) —
+    // it becomes a pointer at the goal that now carries its work.
+    goal.status = 'folded';
+    goal.foldedInto = foldTarget.id;
+    saveGoal(goal);
+    return;
+  }
   // Computed BEFORE createGoalPR (not inside verifyGate, which used to run
   // after) so the PR body's "確認ポイント" headline is available the first
   // time the PR is opened, not only on the review card (Masa 2026-07-16).

package/package.json

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