@galda/cli 0.10.70 → 0.10.71

package/app/index.html

@@ -1109,6 +1109,7 @@
   /* 3列カンバン: chat and the task board share the width evenly beside projects */
   body[data-layout="kanban"] .chat{flex:1 1 0}
   body[data-layout="kanban"] .side{flex:1 1 0;width:auto}
+  body[data-layout="kanban"] .side.collapsed{flex:0 0 0;width:0!important}
   /* B · Center-flow — the final layout. Center = To Do (#tasklist) + composer
      under it; right = Review (top) + Implementing (bottom). Populated by moving
      existing nodes (positionLayout) so all event wiring survives. */
@@ -1782,6 +1783,9 @@
   /* list rail add-row — padding-left:8px puts + on the .trow ● (8px pad + 13px ● + 9px gap grid) */
   #fsRoot .qadd{all:unset;box-sizing:border-box;display:flex;align-items:center;gap:9px;width:100%;padding:6px 4px 6px 8px;border-radius:8px;color:var(--ink3);font-size:11.5px;cursor:pointer;opacity:.45;transition:opacity .15s,color .15s}
   #fsRoot .qadd:hover{opacity:1;color:var(--ink)}
+  #fsRoot .qadd.editing{opacity:1;color:var(--ink);cursor:text}
+  #fsRoot .qadd input{all:unset;display:block;min-width:0;flex:1;color:var(--ink);font:inherit;line-height:18px}
+  #fsRoot .qadd input::placeholder{color:var(--ink3)}
   #fsRoot .lateridle{display:flex;align-items:center;gap:9px;margin:5px 0 2px;padding:9px 10px;border:1px solid var(--hair);border-radius:8px;color:var(--ink2);font-size:10.5px;line-height:1.45}
   #fsRoot .lateridle .msg{flex:1;min-width:0}
   #fsRoot .lateridle button{height:26px;padding:0 10px;border:1px solid var(--hair2);border-radius:7px;background:var(--panel);color:var(--ink);font:600 10px/1 var(--mono);cursor:pointer;white-space:nowrap}
@@ -1824,11 +1828,6 @@
   #fsRoot .revhd[hidden]{display:none}
   #fsRoot .revhd .hd{font-size:13.5px;letter-spacing:-.02em}
   #fsRoot .revhd .rnum{font-size:10px;color:var(--ink3)}
-  #fsRoot .rvbtns{margin-left:auto;display:flex;gap:2px}
-  #fsRoot .rvb{width:22px;height:20px;border:0;border-radius:6px;background:transparent;color:var(--ink3);cursor:pointer;display:grid;place-items:center;opacity:.75}
-  #fsRoot .rvb svg{width:13px;height:13px;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}
-  #fsRoot .rvb:hover{background:transparent;color:var(--ink)} /* icon hover = glyph colour only (§5.5) */
-  #fsRoot .rvb.on{background:var(--hover);color:var(--ink);opacity:1}
   /* V3-C (Masa決定 2026-07-07): the collapsed "N ready to review" strip is REMOVED —
      it duplicated the sm2 meter directly above. Reviews render as meter + header + cards;
      zero reviews render nothing at all (§1.5-3). */
@@ -1859,37 +1858,6 @@
   #fsRoot .rcard .b{width:21px;height:21px;border-radius:7px;border:1px solid var(--hair2);background:transparent;display:grid;place-items:center;cursor:pointer;color:var(--green);font-size:11px;font:inherit}
   #fsRoot .rcard .b.no{color:var(--danger)}
   #fsRoot .rcard .b:hover{background:var(--hover)}
-  /* rv2 compact one-line rows */
-  #fsRoot[data-rv="2"] .rcard{margin-top:0;border:0;border-radius:0;border-bottom:1px solid var(--hair);padding:7px 3px;gap:9px}
-  #fsRoot[data-rv="2"] .rcard img{display:none}
-  #fsRoot[data-rv="2"] .rcard .rc{display:flex;align-items:center;gap:8px}
-  #fsRoot[data-rv="2"] .rcard .t{font-weight:400;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
-  #fsRoot[data-rv="2"] .rcard .pr{margin-top:0;flex:0 0 auto}
-  #fsRoot[data-rv="2"] .rcard .rid{margin:0;flex:0 0 auto;order:-1}
-  #fsRoot[data-rv="2"] .rcard .b{width:22px;height:22px}
-  /* rv3 large proof thumb as hero (default) — legibility scrim is a faithful flagship port.
-     CDO review 2026-07-08 §3: was scoped :not(.noimg) only, so a proof-less review (no PNG/GIF
-     yet) fell through to the plain white/dark-text .rcard base and floated among the dark
-     thumbnail cards. Now EVERY rv3 card (img or not) gets the same gallery container language —
-     dark ground + white heading + scrim — .noimg just swaps the <img> for a placeholder-dark
-     background (no image element to size the card, so it also needs its own min-height). */
-  /* min-height + dark ground live on the BASE card (not just .noimg): the card's
-     height must NOT depend on the proof <img> rendering. When a proof PNG/GIF is
-     slow (loading="lazy") or fails (404/expired key), the img collapsed below 84px,
-     so the bottom-anchored .rc scrim (26px top padding) overflowed UPWARD and got
-     clipped by overflow:hidden → the "レビューがずれる" clipped dark bars. Now every
-     rv3 card reserves 84px over a dark ground; the img just fills it when present,
-     and a broken img (onerror → removed in JS) reveals the same dark ground. */
-  #fsRoot[data-rv="3"] .rcard{display:block;position:relative;margin-top:8px;padding:0;border:0;border-radius:12px;overflow:hidden;box-shadow:0 0 0 1px var(--hair);min-height:84px;background:linear-gradient(155deg,#2b2e37,#15161a)}
-  #fsRoot[data-rv="3"] .rcard img{width:100%;height:84px;border-radius:0;box-shadow:none;object-fit:cover;display:block}
-  #fsRoot[data-rv="3"] .rcard.noimg{min-height:84px;background:linear-gradient(155deg,#2b2e37,#15161a)} /* placeholder-dark ground, no CSS-blob/lorem — a flat tonal fill matching the scrim's own black, not a fake image */
-  #fsRoot[data-rv="3"] .rcard .rc{position:absolute;left:0;right:0;bottom:0;padding:26px 13px 11px;background:linear-gradient(0deg,rgba(8,10,14,.93),rgba(8,10,14,.72) 45%,rgba(8,10,14,.28) 80%,transparent)} /* §15 stronger scrim for bright thumbs/2-line */
-  #fsRoot[data-rv="3"] .rcard .t{color:#fff;font-size:11.5px;line-height:1.25;text-shadow:0 1px 3px rgba(0,0,0,.55)} /* §15 white heading readable on any photo (or the noimg placeholder ground) */
-  #fsRoot[data-rv="3"] .rcard .pr{color:#e9fff6;background:rgba(255,255,255,.16)}
-  #fsRoot[data-rv="3"] .rcard .rid{color:rgba(255,255,255,.66)}
-  #fsRoot[data-rv="3"] .rcard .act{position:absolute;top:9px;right:9px}
-  #fsRoot[data-rv="3"] .rcard .b{background:rgba(255,255,255,.92);border-color:transparent;color:var(--green)}
-  #fsRoot[data-rv="3"] .rcard .b.no{color:#c0392b}
   /* fold line — "+N more ›" 統一 (§6.5) */
   #fsRoot .morefold{display:flex;justify-content:center;text-align:center;font-family:var(--mono);font-size:10.5px;letter-spacing:.02em;color:var(--ink3);cursor:pointer;padding:8px;border-radius:8px;align-items:center}
   #fsRoot .morefold:hover{background:var(--hover-s);color:var(--ink)}
@@ -3106,7 +3074,7 @@
        Structure ported from docs/design/flagship/flagship.html: rail | Implementing | lane.
        The composer (#composerWrap: queue + composer + send/prism ring) is ADOPTED into
        #fsCompwrap by positionLayout() — same nodes, same handlers, input-focus fix intact. -->
-  <div id="fsRoot" data-rv="1">
+  <div id="fsRoot">
     <div class="fscard fsrail">
       <button class="railtg" id="fsRailTg" title="Fold the rail"></button><!-- panel icon filled by tgUpdate (v45 §4) -->
       <button class="fsprojbtn" id="fsProjBtn" title="Switch project"><span class="pname" id="fsProjBtnName"></span><svg viewBox="0 0 24 24"><path d="M6 9l6 6 6-6"/></svg></button>
@@ -6324,7 +6292,6 @@ function render(){
 // queueOrder); actions call the SAME endpoints (approve/dismiss/retry/reply…).
 // ============================================================================
 const fsUI = {
-  rv: 1, // approved screenshot-free B Status dot design; Review has one stable view
   band: Number(localStorage.getItem('fsBand') ?? 0),   // theme-6 band choice
   revMore: false,                                      // "+N more" fold on the review list (§1.5-8)
   todoFold: false, doneOpen: false, rejOpen: false, todoMore: false,
@@ -6352,7 +6319,6 @@ function fsActs(goalId){
 function renderFlagship(){
   if (state.layout !== 'flagship') return;
   const root = $('fsRoot'); if (!root) return;
-  root.dataset.rv = String(fsUI.rv);
   // Wall-clock phase for the spinning markers: any ring re-created this render (the board
   // re-renders often on progress %) starts at the angle a continuous one would be at now,
   // instead of snapping back to 0deg — no "jump". The rail ring is guarded separately and
@@ -6933,8 +6899,10 @@ 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 });
-  const foldedRows = pgoals.filter((g) => g.status === 'folded' && g.foldedInto != null);
-  if (!rows.length && !foldedRows.length) { el.innerHTML = ''; return; } // §1.5-3: no reviews → the UI itself does not exist
+  // Folded goals belong only to the carrier's Review dialog ("Also carries").
+  // They are historical context, not independently reviewable work, so rendering
+  // them here produced the contradictory "0 ready" header followed by stale cards.
+  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;
   const pct = rows.length ? Math.round((green / rows.length) * 100) : 0;
@@ -6974,13 +6942,6 @@ function renderFsReview(){
     return `<div class="rcard noimg" data-fsrev="${r.goalIds[0]}"><div class="rc"><div class="t">${rid}${esc(r.plan ? r.checkLine : saReviewTitle(g0))}</div>${rnote}${infraNote}${pr}${conflictNote}</div>
       <div class="act"><button class="b" data-fsapprove="${ids}" title="Approve">✓</button><button class="b no" data-fsdismiss="${ids}" title="Send back">✕</button></div></div>`;
   };
-  const foldCard = (g) => {
-    const target = pgoals.find((x) => x.id === g.foldedInto);
-    const n = goalReviewNumber({ goal: g, tasks: list });
-    const rid = n != null ? `<span class="rid gno" data-n="${n}">#${n}</span>` : '';
-    const targetNo = target ? (goalReviewNumber({ goal: target, tasks: list }) ?? target.id) : g.foldedInto;
-    return `<div class="rcard noimg foldrow" data-fsrev="${g.id}"><div class="rc"><div class="t">${rid}${esc(saReviewTitle(g))}</div><span class="rstat">Merged into #${esc(String(targetNo))}</span></div></div>`;
-  };
   // V3-C (Masa決定 2026-07-07): no collapsed strip — it duplicated the sm2 meter right
   // above. Reviews render directly: meter + Review header + cards (+N more fold, §1.5-8).
   // The meter counts what is reviewable, so it only exists when something is (§1.5-3):
@@ -6991,7 +6952,7 @@ function renderFsReview(){
       <div class="m-bar"><i style="width:${pct}%"></i></div>
       <div class="s">${esc(sline)}</div></div>` : ''}
     <div class="revhd" id="fsRevHd"><span class="hd">Review</span><span class="rnum num">${green} ready</span></div>
-    <div class="revlist">${shown.map(card).join('')}${foldedRows.map(foldCard).join('')}
+    <div class="revlist">${shown.map(card).join('')}
       ${rows.length > RCAP ? `<div class="morefold" id="fsRevMore">${fsUI.revMore ? 'less' : `+${rows.length - RCAP} more`}<span class="g">›</span></div>` : ''}</div>`;
   // Mirror the ready-review count onto the mobile top-bar "Review N" opener (H23).
   const _hn = document.getElementById('fsHambN'); if (_hn) _hn.textContent = green > 0 ? String(green) : '';
@@ -7009,8 +6970,8 @@ function renderFsReview(){
     if (e.target.closest('a') || e.target.closest('.act') || e.target.closest('[data-goalreverify]')) return;
     openReviewChecklist(Number(c.dataset.fsrev));
   };
-  // Folded goals get no row here (Masa 2026-07-23) — they are shown, and restored, on the
-  // carrier's side in the See-all "Also carries" section (saItemHtml + the seeall handler).
+  // Folded goals 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(',')) {
@@ -7289,9 +7250,9 @@ function renderFsTodo(){
       ${rejected.length ? `<span class="tlcap rejcap"${(doingRows || paused) || needsRows ? '' : ' style="padding-top:0"'}>Dismissed<span class="num">${rejected.length}</span></span>${rejected.map((g) => `<div class="trow up rej" data-fsgoalrow="${g.id}"><span class="st rej"></span>${noSpan(g.id)}<span class="tt">${tt(g.text, 70)}</span><span class="acts"><button class="ab" data-fsreopen="${g.id}" title="Reopen — back to Review">${FS_ICONS.reopen}</button><button class="ab" data-fsrejdel="${g.id}" title="Delete — discard (closes the PR)">${FS_ICONS.del}</button></span></div>`).join('')}` : ''}
       ${(parkedRows || upRows) ? `<span class="tlcap"${(doingRows || paused) || needsRows || rejected.length ? '' : ' style="padding-top:0"'}>Next up</span>${parkedRows}${upRows}` : ''}
       ${queued.length > NCAP ? `<div class="morefold" id="fsTodoMore">${fsUI.todoMore ? 'less' : `+${queued.length - NCAP} more`}<span class="g">›</span></div>` : ''}
-      <button class="qadd" data-fsnew="1" title="New goal"><span class="paplus"></span>New</button>
+      <div class="qadd" data-fsnew="1" role="button" tabindex="0" title="New goal"><span class="paplus"></span><span>New</span></div>
       <span class="tlcap">Later</span>
-      <button class="qadd lateradd" data-fslaternew="1" title="New Later goal"><span class="paplus"></span>New</button>
+      <div class="qadd lateradd" data-fslaternew="1" role="button" tabindex="0" title="New Later goal"><span class="paplus"></span><span>New</span></div>
       ${laterIdle}
       ${laterRows}
     </div>
@@ -7299,12 +7260,12 @@ function renderFsTodo(){
       <div id="fsDonelist"${fsUI.doneOpen ? '' : ' hidden'}>${doneAll.map((t) => `<div class="trow up dim done"${t.goalId != null ? ` data-fsgoalrow="${t.goalId}"` : ''}><span class="st ok"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span></div>`).join('')}</div>` : ''}`;
   el.classList.toggle('folded', !!fsUI.todoFold);
   $('fsTodoHd').onclick = () => { fsUI.todoFold = !fsUI.todoFold; el.classList.toggle('folded', fsUI.todoFold); };
-  const qadd = el.querySelector('.qadd[data-fsnew]');            // + New → focus the composer (the real create path)
-  if (qadd) qadd.onclick = () => $('input')?.focus();
+  const qadd = el.querySelector('.qadd[data-fsnew]');
+  if (qadd) qadd.onclick = (e) => { e.stopPropagation(); fsInlineNewRow(qadd, 'Add to To Do…', (text) => fsCreateGoal(text, false)); };
   const laterAdd = el.querySelector('.qadd[data-fslaternew]');
   if (laterAdd) laterAdd.onclick = (e) => {
     e.stopPropagation();
-    fsInlineInput(laterAdd, '', 'Add to Later…', fsCreatePendingGoal);
+    fsInlineNewRow(laterAdd, 'Add to Later…', (text) => fsCreateGoal(text, true));
   };
   const dl = el.querySelector('#fsDoneLine');
   if (dl) dl.onclick = () => { fsUI.doneOpen = !fsUI.doneOpen; dl.classList.toggle('open', fsUI.doneOpen); el.querySelector('#fsDonelist').hidden = !fsUI.doneOpen; };
@@ -7381,19 +7342,50 @@ function renderFsTodo(){
     const r = await fetch(withKey(`/api/goals/${b.dataset.fsdel}`), { method: 'DELETE' });
     if (!r.ok) showErr('Cannot delete a running/finished goal — reply to append instead'); else await refresh(); };
 }
-async function fsCreatePendingGoal(text){
+async function fsCreateGoal(text, pending){
   const r = await fetch(withKey('/api/tasks'), { method: 'POST', headers: { 'content-type': 'application/json' },
-    body: JSON.stringify({ projectId: state.active, text, pr: 'auto', model: state.stickyModel, effort: state.stickyEffort, agent: state.connectedApp, mode: 'auto', pending: true }) });
+    body: JSON.stringify({ projectId: state.active, text, pr: 'auto', model: state.stickyModel, effort: state.stickyEffort, agent: state.connectedApp, mode: 'auto', pending }) });
   if (r.status === 402) {
     const data = await r.json().catch(() => ({}));
     showBillingBlocked(data.blocked);
-    return;
+    return false;
   }
-  if (!r.ok) { showErr('Later add failed.'); return; }
+  if (!r.ok) { showErr(pending ? 'Later add failed.' : 'To Do add failed.'); return false; }
   clearBillingBlocked();
   const goal = await r.json();
   if (goal?.id) upsert(state.goals, goal);
   render();
+  return true;
+}
+function fsInlineNewRow(row, placeholder, onSubmit){
+  if (!row) return;
+  const current = row.querySelector('input');
+  if (current) { current.focus(); return; }
+  const label = row.querySelector('span:last-child');
+  if (!label) return;
+  const original = label.textContent;
+  const inp = document.createElement('input');
+  inp.type = 'text'; inp.placeholder = placeholder; inp.setAttribute('aria-label', placeholder);
+  label.replaceWith(inp); row.classList.add('editing'); inp.focus();
+  let done = false;
+  const restore = () => {
+    if (done) return;
+    done = true; row.classList.remove('editing');
+    if (inp.isConnected) { const span = document.createElement('span'); span.textContent = original; inp.replaceWith(span); }
+  };
+  inp.onkeydown = (e) => {
+    if (e.key === 'Enter' && !e.isComposing) {
+      e.preventDefault();
+      const value = inp.value.trim();
+      if (!value) return;
+      done = true; row.classList.remove('editing'); inp.disabled = true;
+      Promise.resolve(onSubmit(value)).then((ok) => {
+        if (ok !== false || !inp.isConnected) return;
+        done = false; row.classList.add('editing'); inp.disabled = false; inp.focus();
+      });
+    } else if (e.key === 'Escape') restore();
+  };
+  inp.onblur = () => setTimeout(restore, 150);
 }
 function fsInlineInput(afterEl, value, placeholder, onSubmit){
   if (!afterEl || afterEl.nextElementSibling?.classList.contains('fsinline')) return;
@@ -9613,7 +9605,9 @@ function saItemHtml(it, i){
   // 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>`
-    : '';
+    : it.pr
+      ? `<div class="ropen"><a class="olink" href="${esc(it.pr)}" target="_blank" rel="noopener">${esc(it.pr)}<span class="ar">↗</span></a><p class="rbody v">Review and merge this pull request to finish the item.</p></div>`
+      : '';
   const prRepairBody = it.goal?.prError
     ? `<div class="prfail"><b>${esc(it.goal.prRepair?.title || 'PR blocked')}</b> <span class="dim">${esc(it.goal.prError)}</span>${it.goal.prRepair?.steps?.length ? `<ul>${it.goal.prRepair.steps.map((s) => `<li>${esc(s)}</li>`).join('')}</ul>` : ''}${it.goal.prRepair?.dirtyFiles?.length ? `<div class="dim">dirty: ${it.goal.prRepair.dirtyFiles.map(esc).join(' · ')}</div>` : ''}<div class="acts2"><button class="errbtn" data-saact="retrypr:${i}">${failureLang() === 'ja' ? 'PR再試行' : 'Retry PR'}</button><button class="errbtn" data-saact="glog:${i}">${failureLang() === 'ja' ? 'ログ確認' : 'View log'}</button></div></div>`
     : '';

package/engine/lib.mjs

@@ -89,6 +89,36 @@ export function resolveEntryUrl({ entry, projectDir, managerRoot, port, accessKe
   return pathToFileURL(abs).href;
 }
 
+// Preserve the worker-declared artifact below an ephemeral Manager origin.
+export function rebasePreviewUrl(declaredUrl, serverUrl) {
+  if (!serverUrl) return declaredUrl ?? null;
+  if (!declaredUrl) return serverUrl;
+  try {
+    const declared = new URL(declaredUrl);
+    const server = new URL(serverUrl);
+    const params = new URLSearchParams(declared.search);
+    for (const [key, value] of server.searchParams) {
+      if (!params.has(key)) params.set(key, value);
+    }
+    server.pathname = declared.pathname || '/';
+    server.search = params.toString();
+    server.hash = declared.hash;
+    return server.toString();
+  } catch {
+    return serverUrl;
+  }
+}
+
+export function shouldCreateGoalPR(goal, files = []) {
+  return goal?.wantsPR === true && files.length > 0;
+}
+
+export function normalizePullRequestUrl(value) {
+  const text = typeof value === 'string' ? value.trim() : '';
+  if (!/^https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+\/?$/i.test(text)) return null;
+  return text.replace(/\/$/, '');
+}
+
 // Extract token/cost usage from a parsed `type:'result'` stream-json event
 // (the final event of a `claude -p --output-format stream-json` run).
 // Returns null for any other event type.
@@ -482,7 +512,7 @@ export function goalSessionFor(goal, agent) {
   const a = String(agent || goal.agent || 'claude-code');
   const map = goal.sessions && typeof goal.sessions === 'object' ? goal.sessions : null;
   if (map?.[a]) return String(map[a]);
-  if (goal.sessionId && (!goal.sessionAgent || goal.sessionAgent === a || !map)) return String(goal.sessionId);
+  if (goal.sessionId && !map && (!goal.sessionAgent || goal.sessionAgent === a)) return String(goal.sessionId);
   return null;
 }
 
@@ -499,7 +529,8 @@ export function setGoalAgentSession(goal, agent, sessionId) {
 
 export function switchGoalAgentSession(goal, nextAgent) {
   if (!goal) return null;
-  if (goal.sessionId && goal.agent) setGoalAgentSession(goal, goal.agent, goal.sessionId);
+  const previousAgent = String(goal.agent || 'claude-code');
+  if (goal.sessionId) setGoalAgentSession(goal, previousAgent, goal.sessionId);
   goal.agent = nextAgent;
   const sessionId = goalSessionFor(goal, nextAgent);
   goal.sessionId = sessionId;

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, chooseFolderScript, parseChosenFolder, buildFolderQuestion, resolveFolderAnswer, classifyFolderTarget, buildFolderInitConfirm, isFolderInitConfirmed, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer, routeQuestionAnswer, notUnderstoodNote, parseRelocalizedQuestion, classifyAuthProbe, authBannerText, makeSigninChallenge, parseClaimResponse, isCommandOnPath } from './lib.mjs';
-import { parseStreamEvents, parseCodexEvents, buildCodexArgs, parsePlan, refinePlanTasks, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, classifyWorkerFailure, isForcedStop, taskStatusAfterVerify, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, latestGoalOutcomeTask, buildDirtyWorkspacePrBlock, 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, resolveTestGate, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, workerPrompt, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, autoFoldReviewsEnabled, parseGitUnifiedDiffLocations, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyPrSafety, isInconclusiveTestRun, countInfraFlakes, classifyRunFailures, classifyVerifyGate, buildVerificationInfraError, verificationInfraErrorFrom, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, licenseTokenPayload, shouldRefreshLicense, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, testFailureReason, manualTestRetryPrompt, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot, goalTaskTitle, buildGoalTask, shouldUsePlannerForGoal, RUN_DECL_FILE, parseRunDeclaration, SHOT_DIR, collectShotNames, parseGoalAddress, REPLY_OUTCOMES, REPLY_INTENTS, buildReplyIntentPrompt, parseReplyIntent, buildGoalMessage, serializeGoalMessage, parseGoalMessages, computeInternalQualityMetrics, classifyInternalQualityTaskError, resolveWorkspaceMode, goalSessionFor, setGoalAgentSession, switchGoalAgentSession } from './lib.mjs';
+import { parseStreamEvents, parseCodexEvents, buildCodexArgs, parsePlan, refinePlanTasks, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, classifyWorkerFailure, isForcedStop, taskStatusAfterVerify, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, latestGoalOutcomeTask, buildDirtyWorkspacePrBlock, 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, rebasePreviewUrl, shouldCreateGoalPR, normalizePullRequestUrl, parseGitLog, diffNewCommits, replayQueueLog, reconcileOrphanGoals, reorderQueue, sortQueueByPriority, TASK_PRIORITIES, validateWorkflowColumns, DEFAULT_WORKFLOW_COLUMNS, validateReviewDefinition, DEFAULT_REVIEW_DEFINITION, resolveTestGate, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, workerPrompt, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, autoFoldReviewsEnabled, parseGitUnifiedDiffLocations, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyPrSafety, isInconclusiveTestRun, countInfraFlakes, classifyRunFailures, classifyVerifyGate, buildVerificationInfraError, verificationInfraErrorFrom, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, licenseTokenPayload, shouldRefreshLicense, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, testFailureReason, manualTestRetryPrompt, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot, goalTaskTitle, buildGoalTask, shouldUsePlannerForGoal, RUN_DECL_FILE, parseRunDeclaration, SHOT_DIR, collectShotNames, parseGoalAddress, REPLY_OUTCOMES, REPLY_INTENTS, buildReplyIntentPrompt, parseReplyIntent, buildGoalMessage, serializeGoalMessage, parseGoalMessages, computeInternalQualityMetrics, classifyInternalQualityTaskError, resolveWorkspaceMode, goalSessionFor, setGoalAgentSession, switchGoalAgentSession } from './lib.mjs';
 import { createSerialQueue } from './lib.mjs';
 import { isPrClosed } from './lib.mjs';
 import { collectProjectRules } from './lib.mjs';
@@ -2004,24 +2004,6 @@ function managerHandoffPrompt(goal, plan) {
   ].filter(Boolean).join('\n\n');
 }
 
-function recentProjectFailureMemory(projectId, text) {
-  const haystack = String(text ?? '').toLowerCase();
-  return goals
-    .filter((g) => g.projectId === projectId && Array.isArray(g.failureMemory) && g.failureMemory.length)
-    .flatMap((g) => g.failureMemory.map((entry) => ({ goal: g, entry })))
-    .filter(({ entry }) => {
-      if (!haystack) return true;
-      const blob = `${entry?.recurrenceKey ?? ''} ${entry?.rootCause ?? ''} ${entry?.whatHappened ?? ''}`.toLowerCase();
-      return blob.includes('test') && /test|テスト|検証/.test(haystack)
-        || blob.includes('budget') && /token|budget|予算|コンテキスト/.test(haystack)
-        || blob.includes('proof') && /ui|proof|スクショ|画面/.test(haystack)
-        || blob.includes('non-code') && /docs?|prd|調査|レポート|document/.test(haystack);
-    })
-    .sort((a, b) => String(b.entry.createdAt ?? '').localeCompare(String(a.entry.createdAt ?? '')))
-    .slice(0, 3)
-    .map(({ entry }) => entry);
-}
-
 function recordGoalFailure(goal, { kind, reason = '', usage = null, changedFiles = [], testResult = null, attentionHadDetail = true } = {}) {
   if (!goal) return null;
   const siblings = tasks.filter((t) => t.goalId === goal.id);
@@ -2553,10 +2535,11 @@ async function startPreview(task) {
   if (managerPackage && existsSync(join(dir, 'engine', 'server.mjs')) && existsSync(join(dir, 'app', 'index.html'))) {
     const eph = await startEphemeralApp(dir);
     if (!eph) throw new Error('Could not start the local preview. Please try again.');
-    const entry = { proc: eph.child, url: eph.url, expires: Date.now() + PREVIEW_IDLE_MS };
+    const previewUrl = rebasePreviewUrl(url, eph.url);
+    const entry = { proc: eph.child, url: previewUrl, expires: Date.now() + PREVIEW_IDLE_MS };
     previews.set(task.id, entry);
     eph.child.on('close', () => { if (previews.get(task.id) === entry) previews.delete(task.id); });
-    return { url: eph.url, reused: false, started: true };
+    return { url: previewUrl, reused: false, started: true };
   }
   // Declared a URL but no command: the thing is already reachable (an app the
   // worker left running, a hosted page). Nothing to start.
@@ -3279,11 +3262,10 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
   // (e.g. the skip endpoint) still PR from the isolated worktree, not the shared dir.
   const wdir = (goalWorkDirs.get(goal.id) && existsSync(goalWorkDirs.get(goal.id))) ? goalWorkDirs.get(goal.id) : project.dir;
   const prProject = { ...project, dir: wdir };
-  // Masa's model: any goal that TOUCHED CODE opens a PR (reviewed via the PR);
-  // a no-code goal is a report/confirmation. So always attempt a PR — createGoalPR
-  // no-ops when there are no changed files — instead of gating on goal.wantsPR
-  // (which defaulted to false, so almost nothing ever became a PR). Always call
-  // it (not just `if (!goal.pr)`): when a goal already has a PR — e.g. a review
+  // Close-out always delegates to createGoalPR so it can record an explicit
+  // No PR decision as well as create/update a requested PR. `goal.wantsPR` is
+  // authoritative: changed files alone must never override the user's choice.
+  // Always call it (not just `if (!goal.pr)`): when a goal already has a PR — e.g. a review
   // comment sent it back for rework and the reply task just finished — this is
   // the only place that pushes the rework diff, and createGoalPR itself decides
   // "new PR" vs "push onto the existing PR's branch" from goal.pr/goal.prBranch.
@@ -3626,13 +3608,16 @@ async function createGoalPR(goal, project, goalTasks, reviewDefinition = DEFAULT
   // the diff. Proof artifacts (.manager-proof) are intentional and kept.
   const SCRATCH = /(^|\/)\.tmp|\.log$|(^|\/)\.manager-wt(\/|$)|(^|\/)node_modules(\/|$)|(^|\/)secret\.key$/;
   const files = [...new Set(goalTasks.flatMap((t) => t.changedFiles))].filter((f) => f && !SCRATCH.test(f));
-  // No code changed → nothing to open a PR for. This is a confirmation /
-  // investigation goal, not a failure: it still lands in Review (nextGoalStatus),
-  // where the worker's report IS the "please confirm" summary. So clear any PR
-  // error and return — don't scare the reviewer with a red prError. (A rework
-  // round can't actually hit this — its files are a superset of the ones that
-  // already got it a PR — but the guard is harmless either way.)
-  if (!files.length) { goal.pr = null; goal.prError = null; saveGoal(goal); goalAct('No code changes detected, so PR creation is skipped.'); return; }
+  if (!shouldCreateGoalPR(goal, files)) {
+    goal.pr = null;
+    goal.prBranch = null;
+    goal.prError = null;
+    saveGoal(goal);
+    goalAct(goal.wantsPR === false
+      ? 'Deliverable is No PR, so PR creation is skipped even though files changed.'
+      : 'No code changes detected, so PR creation is skipped.');
+    return;
+  }
   const unsafe = prSafetyIssue(goal, project, files);
   if (unsafe) {
     goal.prError = unsafe.message.slice(0, 300);
@@ -4155,7 +4140,7 @@ const server = createServer(async (req, res) => {
     req.on('data', (d) => { body += d; });
     req.on('end', async () => {
       try {
-        const { projectId, text, pr, images, model, effort, source, pending, review, note, mode, skill, agent, worktree, workspaceMode } = JSON.parse(body);
+        const { projectId, text, pr, existingPr, images, model, effort, source, pending, review, note, mode, skill, agent, worktree, workspaceMode } = JSON.parse(body);
         const project = projects.find((p) => p.id === projectId);
         if (!project || !text?.trim()) return json(res, 400, { error: 'projectId and text required' });
         // Chat-driven play/pause (Masa: "チャットで再生一時停止はおせる"). Deterministic
@@ -4269,16 +4254,20 @@ const server = createServer(async (req, res) => {
         // (connected-agents Phase A) — a requested/default agent that isn't
         // present would otherwise spawn a worker doomed to fail at launch.
         const goalAgent = pickAvailableAgent(workerAgent(agent), AVAILABLE_AGENTS);
-        const priorFailureMemory = recentProjectFailureMemory(projectId, text.trim());
+        // Failure memory belongs to one conversation. A new Goal must not
+        // inherit an unrelated Goal's old failure just because both mention UI.
+        const priorFailureMemory = [];
         const resolvedWorkspaceMode = resolveWorkspaceMode(workspaceMode ?? worktree);
         const workspaceDirty = resolvedWorkspaceMode === 'direct-workspace' ? projectDirtyInfo(project.dir) : {};
+        const importedPr = review ? normalizePullRequestUrl(existingPr) : null;
+        if (review && existingPr && !importedPr) return json(res, 400, { error: 'existingPr must be a GitHub pull request URL' });
         const goal = {
           id: nextId++, projectId, text: text.trim().slice(0, 8000),
           status: (needsFolder || needsReviewPref) ? 'needsInput' : review ? 'review' : pending ? 'pending' : 'stacked',
           question: folderQuestion || reviewPrefQuestion,
           reviewOnly: review ? true : undefined,
           note: review && typeof note === 'string' && note.trim() ? note.trim().slice(0, 8000) : undefined,
-          wantsPR: review ? false : resolveWantsPR(pr, text, getReviewDefinition(projectId).defaultWantsPR),
+          wantsPR: review ? Boolean(importedPr) : resolveWantsPR(pr, text, getReviewDefinition(projectId).defaultWantsPR),
           model: workerModel(goalAgent, model),
           effort: workerEffort(goalAgent, effort),
           agent: goalAgent,
@@ -4305,7 +4294,7 @@ const server = createServer(async (req, res) => {
             previousSession: false,
           }),
           priorFailureMemory: priorFailureMemory.length ? priorFailureMemory : undefined,
-          plan: null, pr: undefined, createdAt: new Date().toISOString(),
+          plan: null, pr: importedPr || undefined, createdAt: new Date().toISOString(),
           // Stage 2 (multi-user): who this goal belongs to — 'owner' for
           // key-auth/MANAGER_OWNER_EMAIL, else the creator's Google email.
           owner: identity,

package/package.json

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