@galda/cli 0.10.42 → 0.10.43

package/app/index.html

@@ -318,6 +318,12 @@
   .ctxmenu .ctxmsg{padding:2px 5px 3px;font-size:11px;color:var(--ink3)}
   .ctxmenu .ctxmsg:empty{display:none}
   .ctxmenu .ctxmsg.bad{color:var(--danger)}
+  /* "Open folder…" — the Claude-Code entry that opens the OS folder chooser on a
+     local session. A single-line row (the repo rows above are 2-line name+path),
+     hairline-separated from the detected list, matching .appopt grammar. */
+  .ctxmenu .appopt.ctxopen{flex-direction:row;align-items:center;gap:7px;border-top:1px solid var(--hair);margin-top:4px;padding-top:8px}
+  .ctxmenu .appopt.ctxopen svg{width:14px;height:14px;flex:0 0 14px;stroke:currentColor;stroke-width:1.7;fill:none;stroke-linecap:round;stroke-linejoin:round}
+  .ctxmenu .appopt.ctxopen .nm{color:var(--ink);font-size:12.5px;line-height:1.3}
   .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)}
@@ -1018,29 +1024,41 @@
   /* Goal review detail panel (task 72): tapping any Review-column goal item
      (whether or not it has a PR) opens this instead of the chat panel —
      Requirement / What was done / Proof, then Approve/Dismiss + revision chat. */
-  .gdoverlay .modal{width:680px;max-height:min(86vh,760px);display:flex;flex-direction:column;position:relative;overflow:hidden}
-  .gdclosex{position:absolute;right:14px;top:12px}
-  .gdscroll{flex:1;overflow:auto;min-height:0;padding-right:2px}
-  .gdsec{margin-top:16px}
-  .gdsec:first-of-type{margin-top:4px}
-  .gdlabel{font-family:var(--mono);font-size:9.5px;letter-spacing:.06em;color:var(--ink3);text-transform:uppercase;margin-bottom:7px}
-  .gdrequirement{font-size:13.5px;line-height:1.65;color:var(--ink);white-space:pre-wrap}
-  .gdbrief{display:none;margin:12px 0 2px;border:1px solid var(--hair);border-radius:10px;background:var(--surface2);padding:12px 13px}
+  /* View-log / Attention modal — transcribes the Review card's redesign grammar
+     (REVIEW-CARD-SPEC / .redesign): panel container, 40px Linear-docs gutters,
+     sentence-case UI section heads, 14px --ink body prose, canvas log box. Same
+     IDs/classes/markup as before — ONLY the look changes. Behaviour is unchanged
+     (Approve stays hidden for failed; failure brief / Archive / send-back shown).
+     All tokens (--panel/--hair/--ink*/--canvas/--ui/--mono) so it adapts per theme. */
+  .gdoverlay .modal{width:min(680px,94%);max-height:min(86vh,760px);display:flex;flex-direction:column;position:relative;overflow:hidden;
+    background:var(--panel);border:0;border-radius:18px;padding:0;
+    box-shadow:0 18px 54px -18px rgba(15,17,40,.30),0 0 0 1px var(--hair);
+    backdrop-filter:blur(30px) saturate(1.4);-webkit-backdrop-filter:blur(30px) saturate(1.4)}
+  .gdclosex{position:absolute;right:18px;top:16px;z-index:2}
+  .gdoverlay #gdTitle{margin:0;padding:28px 40px 0;font-family:var(--ui);font-size:18px;font-weight:680;letter-spacing:-.018em;line-height:1.3;color:var(--ink)}
+  .gdscroll{flex:1;overflow:auto;min-height:0;padding:0 34px 4px 40px}
+  .gdsec{margin-top:24px}
+  .gdsec:first-of-type{margin-top:20px}
+  /* section head = Linear-docs sentence-case (markup text already "Requirement"/"What
+     was done"/"Proof"/"Log"), matching .redesign .rsec-h — not the old mono eyebrow. */
+  .gdlabel{font-family:var(--ui);font-size:15px;font-weight:680;letter-spacing:-.012em;line-height:1.3;color:var(--ink);text-transform:none;margin-bottom:9px}
+  .gdrequirement{font-size:14px;line-height:1.62;letter-spacing:-.012em;color:var(--ink);max-width:70ch;white-space:pre-wrap}
+  .gdbrief{display:none;margin:16px 0 2px;border:0;border-radius:10px;background:color-mix(in srgb,var(--ink) 4%,transparent);padding:12px 14px}
   .gdbrief.show{display:block}
-  .gdbrief .brow{display:grid;grid-template-columns:120px 1fr;gap:12px;padding:8px 0;border-top:1px solid var(--hair)}
+  .gdbrief .brow{display:grid;grid-template-columns:120px 1fr;gap:12px;padding:9px 0;border-top:1px solid var(--hair)}
   .gdbrief .brow:first-child{border-top:0;padding-top:0}
-  .gdbrief .bk{font-family:var(--mono);font-size:9.5px;letter-spacing:.06em;text-transform:uppercase;color:var(--ink3)}
-  .gdbrief .bv{font-size:13px;line-height:1.55;color:var(--ink)}
-  .gdtask{margin-bottom:10px}
+  .gdbrief .bk{font-family:var(--ui);font-size:12px;font-weight:600;letter-spacing:-.004em;text-transform:none;color:var(--ink3)}
+  .gdbrief .bv{font-size:14px;line-height:1.6;letter-spacing:-.012em;color:var(--ink)}
+  .gdtask{margin-bottom:12px}
   .gdtask:last-child{margin-bottom:0}
-  .gdtasktitle{font-size:12.5px;font-weight:600;color:var(--ink)}
-  .gdtaskresult{font-size:12.5px;color:var(--ink2);line-height:1.6;white-space:pre-wrap;margin-top:3px}
-  .gdlog{max-height:min(34vh,280px);overflow:auto;border:1px solid var(--hair);border-radius:9px;background:var(--surface2);padding:8px 10px;
-    font-family:var(--mono);font-size:10.5px;line-height:1.55;color:var(--ink2);white-space:pre-wrap}
+  .gdtasktitle{font-size:14px;font-weight:600;letter-spacing:-.012em;color:var(--ink)}
+  .gdtaskresult{font-size:14px;color:var(--ink2);line-height:1.62;letter-spacing:-.012em;white-space:pre-wrap;margin-top:4px;max-width:70ch}
+  .gdlog{max-height:min(34vh,280px);overflow:auto;border:0;border-radius:9px;background:var(--canvas);padding:10px 12px;
+    font-family:var(--mono);font-size:10.5px;line-height:1.75;color:var(--ink2);white-space:pre-wrap}
   .gdlogline{border-top:1px solid var(--hair);padding-top:6px;margin-top:6px}
   .gdlogline:first-child{border-top:0;padding-top:0;margin-top:0}
-  .gdempty{font-size:12px;color:var(--ink3)}
-  .gdoverlay .sa-act{border-top:1px solid var(--hair);padding-top:12px;margin-top:12px}
+  .gdempty{font-size:13px;color:var(--ink3)}
+  .gdoverlay .sa-act{border-top:1px solid var(--hair);padding:14px 40px 28px;margin-top:20px}
   .more{margin:6px auto 4px;padding:5px 18px;width:fit-content;display:block;text-align:center;color:var(--ink3);font-size:11.5px;
     border:1px solid var(--hair2);border-radius:999px;background:var(--glass);backdrop-filter:blur(10px);cursor:pointer}
   .more:hover{color:var(--ink)}
@@ -2176,6 +2194,13 @@
   .redesign .rask,.redesign .rcheck,.redesign .rcheck li,.redesign .rcheck1{color:var(--ink) !important}
   .redesign ul.rcheck{margin:2px 0 0;padding:0 0 0 18px;font-size:14px;line-height:1.7;letter-spacing:-.012em}
   .redesign ul.rcheck li{margin-bottom:6px}
+  /* Also carries — each folded goal, with Open / Undo (restore). The controls sit at the
+     row end; muted mono buttons, glyph-coloured hover only (§5.5), no filled surface. */
+  .redesign ul.rcarries li{display:flex;align-items:center;gap:10px}
+  .redesign ul.rcarries .cft{min-width:0;overflow:hidden;text-overflow:ellipsis}
+  .redesign ul.rcarries .cfa{margin-left:auto;display:inline-flex;gap:5px;flex:0 0 auto}
+  .redesign ul.rcarries .cfb{height:22px;padding:0 9px;border:1px solid var(--hair2);border-radius:7px;background:transparent;color:var(--ink2);font-family:var(--mono);font-size:10px;cursor:pointer}
+  .redesign ul.rcarries .cfb:hover{background:var(--hover);color:var(--ink)}
   /* Activity (spec §3) = ONE Linear-docs pulldown. Heading plain; chevron on the FIRST
      line; tapping opens the rest below, offset-indented (no left rule); Discussion folds
      in at the bottom of the opened body. */
@@ -3118,7 +3143,7 @@
   <div class="modal reviewmodal">
     <div class="revcount" id="reviewCount">REVIEW</div>
     <h3 id="reviewGoalTitle">Review</h3>
-    <p>Review each requirement with its capture and approve it individually — approved ones fold away. Or approve the whole goal below to send it straight to Done; the next review pops in automatically. Tap outside to close.</p>
+    <p id="reviewIntro">Review each requirement with its capture and approve it individually — approved ones fold away. Or approve the whole goal below to send it straight to Done; the next review pops in automatically. Tap outside to close.</p>
     <div class="rvtoast" id="reviewPrevToast" style="display:none"></div>
     <div class="revsummary" id="reviewSummary">0 / 0 approved</div>
     <div class="revdone" id="reviewDoneMsg">
@@ -5180,6 +5205,18 @@ function renderReviewChecklist(){
   $('reviewApprove').style.display = 'none'; // Feedback: drop the duplicate goal-level Approve — per-requirement Approve is enough
   $('reviewDismiss').style.display = canReview ? '' : 'none';
   $('reviewApprove').disabled = !canReview;
+  // A folded goal opens here read-only (Masa 2026-07-23, [Open] from "Also carries"): nothing
+  // to approve, so don't show the approve-each-requirement intro — say honestly where its
+  // work went. Set it in BOTH branches (this overlay is reused across goals, so a stale
+  // folded-intro must not linger on the next review goal).
+  const introEl = $('reviewIntro');
+  if (introEl) {
+    introEl.textContent = canReview
+      ? 'Review each requirement with its capture and approve it individually — approved ones fold away. Or approve the whole goal below to send it straight to Done; the next review pops in automatically. Tap outside to close.'
+      : goal.status === 'folded'
+        ? "This request's work was merged into another review's PR, so there is nothing to approve here — its work is shown below. Undo the merge from “Also carries” to restore it as its own review."
+        : 'Review the details below. Tap outside to close.';
+  }
   renderPrevToast(goalId);
   // task 96: 件数だけでなく「このゴールで何をやったか・何件完了か」を要約表示。
   const sum = buildReviewSummary({ goal, tasks: reqs, approvedN });
@@ -6547,9 +6584,11 @@ function renderFsReview(){
   const pgoals = state.goals.filter((g) => g.projectId === state.active);
   const list = state.tasks.filter((t) => t.projectId === state.active);
   const rows = buildReviewDigest({ goals: pgoals, tasks: list });
-  // PRD §3.5/§6.5 → Masa 2026-07-21: folded goals no longer get their own card in the
-  // Review column (Masa: review欄にいらない). They were never deleted — where their work
-  // went is now logged inside the carrier review's detail ("Also carries", see saItemHtml).
+  // PRD §6.5 → Masa 2026-07-23: a goal folded onto another review's PR does NOT get its own
+  // row in the Review list (Masa, seeing it live: "ここにはいらない・逆にわかりにくい"). Where
+  // its work went — and the control to restore it — live on the carrier's side only, in the
+  // opened detail's "Also carries" section (see saItemHtml's carriesBody). The list stays
+  // just the reviews; folded goals are explained where they were merged.
   if (!rows.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
   const green = rows.filter((r) => !r.testResult || r.testResult.ok !== false).length;
   const blockedN = pgoals.filter((g) => g.status === 'blocked').length;
@@ -6626,8 +6665,8 @@ function renderFsReview(){
     if (e.target.closest('a') || e.target.closest('.act')) return;
     openReviewChecklist(Number(c.dataset.fsrev));
   };
-  // Folded goals no longer render their own card here (Masa 2026-07-21) — where their
-  // work went is logged inside the carrier review's detail ("Also carries"), not tapped.
+  // Folded goals get no row here (Masa 2026-07-23) — they are shown, and restored, on the
+  // carrier's side in the See-all "Also carries" section (saItemHtml + the seeall handler).
   for (const b of el.querySelectorAll('[data-fsapprove]')) b.onclick = async (e) => { e.stopPropagation();
     let ok = true, mergeGoal = null;
     for (const id of b.dataset.fsapprove.split(',')) {
@@ -8644,6 +8683,13 @@ 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';
+  // A folded sibling's work was merged onto this goal (engine stamps from:manager/via:fold,
+  // Masa 2026-07-23). Label it "merged in" so its text does not read as the Manager typing
+  // a fresh request — the old you/via:composer stamp looked like a phantom re-submission.
+  // Which card it came from is listed on the carrier's "Also carries" section.
+  if (m?.via === 'fold') {
+    return `<div class="txr mgr"><span class="w">Manager</span><span class="m">${esc(String(m?.text ?? ''))}</span><span class="cvia">merged in</span></div>`;
+  }
   // 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;
@@ -8824,12 +8870,14 @@ function saItemHtml(it, i){
   const openBody = (it.run?.cmd || it.run?.url)
     ? `<div class="ropen" id="runlocal${i}"><button type="button" class="olink" data-saact="preview:${i}" id="prevlink${i}">${esc(it.run.url || 'Start it')}<span class="ar">↗</span></button><p class="rbody v">${esc(it.run.note || it.run.cmd || 'Starts when you press it.')}</p></div>`
     : '';
-  // ── Also carries (Masa 2026-07-21): goals folded onto this review are logged HERE, inside
-  // the review's own content — not as loose "→ #12 にまとめました" rows in the Review column.
-  // Chrome label stays English (§377-7); the request titles keep whatever language they were
-  // written in. Only rendered when something was actually folded in (§1.5-3 no empty box). ──
+  // ── Also carries (Masa 2026-07-21 → refined 2026-07-23): goals folded onto this review are
+  // logged HERE, inside the review's own content — NOT as loose rows in the Review column
+  // (Masa: "ここにはいらない・逆にわかりにくい"). This is the ONE place a folded goal is shown,
+  // and where it is restored: each item gets [Open] (the Review dialog) and [Undo] (POST /unfold
+  // — pull it back out as its own review + PR). Chrome label stays English (§4); the request
+  // titles keep their language. Only rendered when something was folded in (§1.5-3 no empty box). ──
   const carriesBody = it.folded?.length
-    ? `<ul class="rcheck">${it.folded.map((f) => `<li>#${esc(String(f.id))} ${esc(f.title)}</li>`).join('')}</ul>`
+    ? `<ul class="rcheck rcarries">${it.folded.map((f) => `<li><span class="cft">#${esc(String(f.id))} ${esc(f.title)}</span><span class="cfa"><button class="cfb" data-saact="foldopen:${f.id}">Open</button><button class="cfb" data-saact="foldundo:${f.id}" title="Undo the merge — restore this as its own review">Undo</button></span></li>`).join('')}</ul>`
     : '';
   // ── What to check (spec §2.5): a bulleted list when several, a line when one. ──
   // Only an explicit review-summary check renders here — never the goal text echoed back
@@ -9256,8 +9304,19 @@ $('seeall').addEventListener('click', async (e) => {
   const b = e.target.closest('[data-saact]');
   if (!b) return;
   const [k, v] = b.dataset.saact.split(':'); const i = Number(v);
-  const it = SA.items[i];
   if (k === 'close') return saClose();
+  // Also carries actions carry a GOAL id (not an item index): open the folded goal in the
+  // Review dialog (Masa 2026-07-23 — same review-styled UI, not the plain goal detail; the
+  // #reviewOverlay sits above #seeall, and a folded goal shows read-only there since
+  // canReview=false hides Approve/Dismiss), or restore it via /unfold. Handled before the
+  // SA.items[i] lookup below.
+  if (k === 'foldopen') return openReviewChecklist(Number(v));
+  if (k === 'foldundo') {
+    const r = await fetch(withKey(`/api/goals/${v}/unfold`), { method: 'POST' });
+    if (r && r.ok) await refresh(); else showErr('Undo failed.');
+    return;
+  }
+  const it = SA.items[i];
   if (!it) return;
   // meta-row toggle (H23): tap the token chip to reveal the technique breakdown.
   if (k === 'tok') { b.classList.toggle('open'); $('seeall').querySelector(`#tokdetail${i}`)?.classList.toggle('open'); return; }
@@ -9439,7 +9498,8 @@ function renderCtxBar(){
       // 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>`;
+  const openRow = `<button type="button" class="appopt ctxopen" id="ctxopenfolder" title="Open the OS folder chooser"><svg viewBox="0 0 24 24"><path d="M3 7a2 2 0 012-2h4l2 2h8a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><path d="M12 11v6M9 14h6"/></svg><span class="nm">Open folder…</span></button>`;
+  menu.innerHTML = `${opts}${openRow}<div class="ctxpath"><input type="text" id="ctxdirin" placeholder="~/path/to/repo" aria-label="Folder path" spellcheck="false"><button type="button" class="appopt" id="ctxdiruse" style="width:auto">Use</button></div><div class="ctxmsg" id="ctxdirmsg"></div>`;
 }
 // The worktree checkbox (engine #268). ON — the default, and what every goal has always
 // done — gives each goal its own copy of the repo, so a run cannot leave this folder
@@ -9485,6 +9545,26 @@ async function setProjectFolder(dir){
     render();
   } catch { say('Could not reach the engine.', true); }
 }
+// "Open folder…" the Claude-Code way. On a LOCAL session the engine opens the
+// operator's OWN native OS folder chooser (POST /api/choose-folder — engine PR)
+// and we point this project at the picked path. A remote/relay session can't
+// (the dialog would open on the server, not the person's screen), so it falls
+// back to the detected repos + typed path already in this menu.
+function isLocalSession(){ return ['localhost', '127.0.0.1'].includes(location.hostname); }
+async function openFolderNative(){
+  const msg = $('ctxdirmsg');
+  const say = (t, bad) => { if (msg) { msg.textContent = t; msg.classList.toggle('bad', Boolean(bad)); } };
+  if (!isLocalSession()) { $('ctxdirin')?.focus(); say('Remote session — pick a repo above or type a path.'); return; }
+  say('Opening the folder chooser…');
+  try {
+    const r = await fetch(withKey('/api/choose-folder'), { method: 'POST' });
+    const body = await r.json().catch(() => ({}));
+    if (body.path) { setProjectFolder(body.path); return; }        // reuse: PUT the project's dir, close, render
+    if (body.cancelled) { say(''); return; }
+    if (body.unsupported) { say('This engine can’t open a folder dialog — pick a repo above or type a path.'); return; }
+    say(body.error || 'Could not open the folder chooser.', true);
+  } catch { say('Could not reach the engine.', true); }
+}
 $('ctxdirbtn').onclick = (e) => {
   e.stopPropagation();
   const menu = $('ctxdirmenu');
@@ -9499,6 +9579,7 @@ $('ctxwt').onclick = (e) => {
 };
 $('ctxdirmenu').addEventListener('click', (e) => {
   e.stopPropagation();
+  if (e.target.closest('#ctxopenfolder')) { openFolderNative(); return; }
   const opt = e.target.closest('[data-ctxdir]');
   if (opt) { setProjectFolder(opt.dataset.ctxdir); return; }
   if (e.target.closest('#ctxdiruse')) setProjectFolder($('ctxdirin')?.value ?? '');

package/engine/lib.mjs

@@ -778,7 +778,10 @@ export function refinePlanTasks(tasks, { goalText, maxTasks = 4 } = {}) {
 //   - /api/state には載せない。開いた時だけ取りに行く（実装ログ #234/#238 と同じ形）。
 export const MESSAGE_TEXT_LIMIT = 8000;
 export const MESSAGE_FROM = ['you', 'ai', 'manager'];
-export const MESSAGE_VIA = ['composer', 'review', 'thread'];
+// 'fold' = the review gate merged a sibling goal's work onto this one; the app
+// renders it as a merge notice ("🔀 統合"), not as a human utterance (Masa
+// 2026-07-23 — the old you/composer stamp looked like a phantom re-submission).
+export const MESSAGE_VIA = ['composer', 'review', 'thread', 'fold'];
 
 // 1発言を正規化する。text が空なら null（空の発言は記録しない＝無いものを
 // 残さない）。from/via が未知なら記録側の都合で捨てず、既定に寄せる。
@@ -3751,6 +3754,31 @@ export function folderLabel(dir, homeDir = '') {
   return d.length <= 60 ? d : '…' + d.slice(-59);
 }
 
+// The osascript program that opens the operator's native macOS folder chooser
+// and prints the picked folder's POSIX path. Kept here (not inline in the route)
+// so the exact script — and its quote-escaping — is one testable thing. `choose
+// folder` is a Standard Additions command; `POSIX path of` turns the returned
+// alias into an absolute path string.
+export function chooseFolderScript(prompt = 'Choose a project folder') {
+  const safe = String(prompt).replace(/["\\]/g, ' ');
+  return `POSIX path of (choose folder with prompt "${safe}")`;
+}
+
+// Turn the result of running `osascript -e chooseFolderScript()` into a small
+// verdict the /api/choose-folder route returns. macOS prints the POSIX path
+// (with a trailing slash) on stdout; pressing Cancel exits non-zero with
+// "User canceled." on stderr. Pure, so the route's contract is unit-tested
+// without ever opening a GUI dialog.
+//   { path }      → a folder was chosen (trailing slash stripped; '/' preserved)
+//   { cancelled } → the user dismissed the dialog
+//   { error }     → osascript failed for some other reason
+export function parseChosenFolder({ code = 0, stdout = '', stderr = '' } = {}) {
+  const out = String(stdout).trim();
+  if (Number(code) === 0 && out) return { path: out.replace(/\/+$/, '') || '/' };
+  if (/user cancell?ed/i.test(String(stderr))) return { cancelled: true };
+  return { error: String(stderr).trim() || 'choose folder failed' };
+}
+
 // Build the "which folder should I work in?" clarifying question from detected
 // repos. Reuses the existing needsInput card ({text, options:string[]}), and
 // adds kind:'folder' + folders[] + lang so the /answer handler rebinds the

package/engine/server.mjs

@@ -20,7 +20,7 @@ import { resolve, dirname, join, basename } from 'node:path';
 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, makeSigninChallenge, parseClaimResponse } from './lib.mjs';
+import { needsProjectFolder, folderLabel, chooseFolderScript, parseChosenFolder, buildFolderQuestion, resolveFolderAnswer, classifyFolderTarget, buildFolderInitConfirm, isFolderInitConfirmed, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer, routeQuestionAnswer, notUnderstoodNote, parseRelocalizedQuestion, classifyAuthProbe, authBannerText, makeSigninChallenge, parseClaimResponse } from './lib.mjs';
 import { parseStreamEvents, parseCodexEvents, buildCodexArgs, parsePlan, refinePlanTasks, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, taskStatusAfterVerify, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, buildReviewSummaryPrompt, parseReviewSummary, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, rejectGoal, reopenGoal, 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, workerPrompt, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, isInconclusiveTestRun, classifyVerifyGate, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot, goalTaskTitle, buildGoalTask, RUN_DECL_FILE, parseRunDeclaration, SHOT_DIR, collectShotNames, parseGoalAddress, REPLY_OUTCOMES, REPLY_INTENTS, buildReplyIntentPrompt, parseReplyIntent, buildGoalMessage, serializeGoalMessage, parseGoalMessages } from './lib.mjs';
 import { createSerialQueue } from './lib.mjs';
 import { collectProjectRules } from './lib.mjs';
@@ -2839,7 +2839,12 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
   // 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
+  // `noFold` = the human hit 「戻す」 on a folded card (POST /unfold): re-run
+  // close-out but DON'T fold back into the same target it was just pulled out of
+  // (that would be an instant loop, since the target still sits in review with
+  // the overlapping files). The card then opens its own PR and both stay in
+  // Review, flagged via conflictsWith — the visible collision Masa asked for.
+  const foldTarget = (conflicts.length && !goal.noFold)
     ? goals.find((g) => g.id === pickFoldTarget(
       { id: goal.id, changedFiles: goalChangedFileUnion(goal.id) },
       goals
@@ -2855,10 +2860,16 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
     // 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), { from: 'you', via: 'composer' });
+    // from:'manager' via:'fold' (NOT you/composer): this is the engine merging a
+    // sibling's work, not the human typing. The old you/composer stamp made the
+    // folded goal's text look like a phantom re-submission by the user in the
+    // target's thread (Masa 2026-07-23). The app renders via:'fold' as a merge
+    // notice; the folded card itself carries the "→ #N 統合済み" pointer.
+    queueReplyTask(foldTarget, goal.text.slice(0, 8000), { from: 'manager', via: 'fold' });
     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.
+    // it becomes a pointer at the goal that now carries its work. The app renders
+    // it as a visible "→ #N 統合済み [開く][戻す]" card so it never vanishes.
     goal.status = 'folded';
     goal.foldedInto = foldTarget.id;
     saveGoal(goal);
@@ -3435,6 +3446,27 @@ const server = createServer(async (req, res) => {
     return json(res, 200, { repos: detectRepos(HOME), home: HOME });
   }
 
+  // Open the operator's OWN native OS folder chooser and hand back the absolute
+  // path — the honest "Open folder…" for a LOCAL session, matching Claude Code.
+  // The dialog opens on the machine running the engine, so the browser only calls
+  // this when it is local (same host); a remote/relay UI uses /api/repos instead
+  // (otherwise the dialog would open on the server, not the person's screen). It
+  // returns only the chosen path — nothing is scanned, listed, or invented.
+  //   { path, label } | { cancelled: true } | { unsupported: true } | { error }
+  // MANAGER_NO_NATIVE_DIALOG (and any non-macOS host) short-circuits to
+  // {unsupported} so tests/CI/headless never block on a GUI.
+  if (url.pathname === '/api/choose-folder' && req.method === 'POST') {
+    if (process.platform !== 'darwin' || process.env.MANAGER_NO_NATIVE_DIALOG) {
+      return json(res, 200, { unsupported: true });
+    }
+    execFile('osascript', ['-e', chooseFolderScript()], { timeout: 120000 }, (err, stdout, stderr) => {
+      const verdict = parseChosenFolder({ code: err ? (err.code ?? 1) : 0, stdout, stderr });
+      if (verdict.path) verdict.label = folderLabel(verdict.path, HOME);
+      json(res, 200, verdict);
+    });
+    return;
+  }
+
   // The project's working rules (ONE-CONVERSATION §1.5a): the settings panel
   // shows a read-only view of whichever of CLAUDE.md / AGENTS.md exist in the
   // project dir — the instructions the connected AI actually reads. The browser
@@ -4011,6 +4043,31 @@ const server = createServer(async (req, res) => {
     return json(res, 200, goal);
   }
 
+  // 「戻す」on a folded card (Masa 2026-07-23 — 畳むけど見える・戻せる): pull a
+  // folded goal back out of the target it was merged into and give it its own
+  // PR. We flag noFold so finishGoalIfComplete's review gate does NOT fold it
+  // straight back into the same target (which still sits in review with the
+  // overlapping files); the re-run opens a separate PR and both cards stay in
+  // Review, flagged via conflictsWith. Non-destructive to the target: whatever
+  // work already merged into it stays — this only restores the folded card.
+  const unfoldMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/unfold$/);
+  if (unfoldMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(unfoldMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    if (goal.status !== 'folded') return json(res, 409, { error: 'goal is not folded' });
+    const project = projects.find((p) => p.id === goal.projectId);
+    if (!project) return json(res, 404, { error: 'project not found' });
+    goal.foldedInto = null;
+    goal.noFold = true;
+    goal.status = 'running'; // let finishGoalIfComplete re-run close-out (its tasks are all done → opens its own PR)
+    saveGoal(goal);
+    finishGoalIfComplete(goal, project).catch((e) => {
+      goal.status = 'failed'; goal.prError = String(e).slice(0, 300); saveGoal(goal);
+    });
+    return json(res, 200, goal);
+  }
+
   // Pending (deliberately shelved) goals: activate moves one into the normal
   // breakdown-first flow; pend shelves a stacked goal.
   const activateMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/activate$/);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galda/cli",
-  "version": "0.10.42",
+  "version": "0.10.43",
   "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": {