@galda/cli 0.10.66 → 0.10.68

package/app/index.html

@@ -5945,6 +5945,15 @@ function openGoalOrCard(goalId){
   if (g && ['blocked', 'partial', 'failed', 'interrupted'].includes(g.status) && typeof saOpen === 'function') { saOpen(goalId, true); return; }
   openGoalDetail(goalId);
 }
+// List / board 共通の詳細導線。Review は review ledger、Needs you は attention card、
+// それ以外は通常の goal detail を開く。
+function fsOpenGoalDetail(goalId){
+  const g = state.goals.find((x) => x.id === goalId);
+  if (!g) return;
+  goToGoalInChat(goalId);
+  if (g.status === 'review') openReviewChecklist(goalId);
+  else openGoalOrCard(goalId);
+}
 function closeGoalDetail(){
   $('goalDetailOverlay').classList.remove('show');
   const goalId = state.goalDetailOpen;
@@ -6692,12 +6701,22 @@ function renderFsBoard(){
         h += `<div class="lbc-meter"><span class="bar"><i style="width:${Math.round(done / total * 100)}%"></i></span><span class="frac">${done}/${total}</span></div>`;
       }
     }
-    return `<div class="lbc${quiet ? ' is-quiet' : ''}">${h}</div>`;
+    return `<div class="lbc${quiet ? ' is-quiet' : ''}" data-fsgoal="${g.id}">${h}</div>`;
   };
   const no = (g) => goalNo.get(g.id) ?? Infinity;
   const bucket = { todo: [], doing: [], needs: [], review: [], done: [], later: [], rejected: [] };
   for (const g of pgoals) bucket[fsBoardBucket(g, list)].push(g); // 'rejected' is collected but never rendered as a column below — closed goals disappear from the board
   for (const k of Object.keys(bucket)) bucket[k].sort((a, b) => k === 'done' ? no(b) - no(a) : no(a) - no(b));
+  // List と同じ digest を使い、同一 PR にまとまる Review は看板でも1件として扱う。
+  const reviewDigest = buildReviewDigest({ goals: pgoals, tasks: list });
+  const reviewCard = (r) => {
+    const g0 = pgoals.find((g) => g.id === r.goalIds[0]);
+    const n = r.reviewNumber;
+    return `<div class="lbc" data-fsgoal="${r.goalIds[0]}"><div class="lbc-hd"><span class="lbc-dot rev"></span>`
+      + (n != null ? `<span class="lbc-n">#${n}</span>` : '')
+      + `</div><div class="lbc-t">${tt(r.plan ? r.checkLine : (g0?.text || g0?.plan?.[0] || r.checkLine), 90)}</div></div>`;
+  };
+  bucket.review = reviewDigest;
   // To Do / Doing / Needs you / Review / Done / Later — the original design's columns
   // (Masa 2026-07-16). "Needs you" = a clarifying question is waiting on the user —
   // distinct from "blocked" (an error needing retry/archive, which stays in Doing, the
@@ -6706,11 +6725,15 @@ function renderFsBoard(){
       col('To Do', 'var(--ink3)', bucket.todo.length, bucket.todo.map(goalCard).join(''), 'todo')
     + col('Doing', 'var(--green)', bucket.doing.length, bucket.doing.map(goalCard).join(''), 'doing')
     + (bucket.needs.length ? col('Needs you', '#ffca16', bucket.needs.length, bucket.needs.map(goalCard).join(''), 'needs') : '')
-    + col('Review', '#8390f2', bucket.review.length, bucket.review.map(goalCard).join(''), 'review')
+    + col('Review', '#8390f2', reviewDigest.length, reviewDigest.map(reviewCard).join(''), 'review')
     + col('Done', 'var(--ink3)', bucket.done.length, bucket.done.slice(0, 40).map(goalCard).join(''), 'done')
     + col('Later', 'var(--ink3)', bucket.later.length, bucket.later.map(goalCard).join(''), 'later');
   for (const b of el.querySelectorAll('[data-fsnew]')) b.onclick = () => $('input')?.focus(); // every + New / header + focuses the composer
   for (const b of el.querySelectorAll('[data-fspause]')) b.onclick = togglePauseActive; // Doing列の一時停止/再生
+  for (const c of el.querySelectorAll('[data-fsgoal]')) c.onclick = (e) => {
+    if (e.target.closest('button, a')) return;
+    fsOpenGoalDetail(Number(c.dataset.fsgoal));
+  };
   renderFsWait(bucket);
 }
 // Doing列の一時停止/再生 (Masa 2026-07-18・Spotify式トグル). 楽観的にローカルの
@@ -6934,7 +6957,7 @@ function renderFsTodo(){
   // renders only when they exist. Same endpoints as the old layout's data-pstart/pdel:
   // Start = POST /api/goals/:id/activate, Delete = DELETE /api/goals/:id (confirm).
   // No mono # — pending goals are never planned, so they carry no task number yet.
-  const laterRows = later.map((g) => `<div class="trow up dim"><span class="st"></span><span class="tt">${tt(g.text, 70)}</span>
+  const laterRows = later.map((g) => `<div class="trow up dim" data-fsgoalrow="${g.id}"><span class="st"></span><span class="tt">${tt(g.text, 70)}</span>
     <span class="acts"><button class="ab txt" data-fspstart="${g.id}" title="Queue it now">Start</button><button class="ab txt" data-fspdel="${g.id}" title="Delete">Delete</button></span></div>`).join('');
   // reference numbers (HANDOFF-v45 §11): a #NN prefix on every To Do / Review item's name.
   // Same goal = same number everywhere (goalReviewNumber = goal.id, unique & stable per
@@ -6949,11 +6972,11 @@ function renderFsTodo(){
     running.filter((t) => !pausedGoalIds.has(t.goalId)).map((t) => {
       const goal = pgoals.find((g) => g.id === t.goalId);
       const title = t.reply ? (goal?.reviewSummary?.check || goal?.plan?.[0] || goal?.text || t.title) : t.title;
-      return `<div class="drow"><div class="trow now"><span class="st run"></span>${noSpan(t.goalId)}<span class="tt">${tt(title)}</span><span class="pct num">${progressFor(t)}%</span>${fsActs(t.goalId)}</div>
+      return `<div class="drow"><div class="trow now" data-fsgoalrow="${t.goalId}"><span class="st run"></span>${noSpan(t.goalId)}<span class="tt">${tt(title)}</span><span class="pct num">${progressFor(t)}%</span>${fsActs(t.goalId)}</div>
       <div class="tbar"><i style="width:${progressFor(t)}%"></i></div></div>`;
     }).join('')
     // 一時停止したゴールは Doing に「Paused」1行(アンバー)で留める＋Resume。走行/中断行は上と needsRows で抑止済み。
-    + pgoals.filter((g) => pausedGoalIds.has(g.id)).map((g) => `<div class="drow"><div class="trow now"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword int">Paused</span><button class="ab txt" data-fspause="1" title="Resume — 再開">Resume</button></div></div>`).join('');
+    + pgoals.filter((g) => pausedGoalIds.has(g.id)).map((g) => `<div class="drow"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword int">Paused</span><button class="ab txt" data-fspause="1" title="Resume — 再開">Resume</button></div></div>`).join('');
   // NEEDS YOU: stopped/errored work that used to fold into Doing, now under its own caption so
   // it no longer reads as "still in flight" (Masa 2026-07-19). Three kinds share it, each
   // keeping the affordances it already had — nothing about the failed-task and blocked-goal
@@ -6978,13 +7001,13 @@ function renderFsTodo(){
       const reason = String(t.result || '').trim();
       const reasonLine = reason && reason.toLowerCase() !== word.toLowerCase()
         ? `<div class="msg"><span class="x ${isInt ? 'int' : ''}">${icon}</span>${tt(reason, 180)}</div>` : '';
-      return `<div class="drow err${isInt ? ' int' : ''}"><div class="trow now"><span class="st run ${isInt ? 'int' : 'bad'}"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span><span class="stword ${isInt ? 'int' : ''}">${word}</span>${fsActs(t.goalId)}</div>
+      return `<div class="drow err${isInt ? ' int' : ''}"><div class="trow now" data-fsgoalrow="${t.goalId}"><span class="st run ${isInt ? 'int' : 'bad'}"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span><span class="stword ${isInt ? 'int' : ''}">${word}</span>${fsActs(t.goalId)}</div>
       <div class="errline">${reasonLine}
       <div class="acts2"><button class="errbtn" data-fsretry="${t.id}">${label}</button><button class="errbtn" data-fslog="${t.id}">View log</button></div></div></div>`; }).join('')
-    + blocked.map((g) => g.blocked?.kind === 'paused' ? '' : `<div class="drow err"><div class="trow now"><span class="st run bad"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword">Failed</span></div>
+    + blocked.map((g) => g.blocked?.kind === 'paused' ? '' : `<div class="drow err"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run bad"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword">Failed</span></div>
       <div class="errline"><div class="msg"><span class="x">✗</span>${tt(g.blocked?.reason ?? 'blocked', 180)}</div>
       <div class="acts2"><button class="errbtn" data-fsreverify="${g.id}">Retry</button><button class="errbtn" data-fsglog="${g.id}">View log</button><button class="errbtn" data-fsarchive="${g.id}">Archive</button></div></div></div>`).join('')
-    + needsInput.map((g) => `<div class="drow err int"><div class="trow now"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.text || g.plan?.[0], 60)}</span><span class="stword int">Needs input</span></div>
+    + needsInput.map((g) => `<div class="drow err int"><div class="trow now" data-fsgoalrow="${g.id}"><span class="st run int"></span>${noSpan(g.id)}<span class="tt">${tt(g.text || g.plan?.[0], 60)}</span><span class="stword int">Needs input</span></div>
       <div class="errline"><div class="msg"><span class="x int">?</span>${tt(g.question?.text || 'A question is waiting on you', 180)}</div>
       <div class="acts2"><button class="errbtn" data-fsglog="${g.id}">Answer</button></div></div></div>`).join('');
   // Parked over-cap replies ride at the TOP of To Do (above the ordinary Next-up
@@ -6993,7 +7016,7 @@ function renderFsTodo(){
   const canUseCodex = state.auth?.reason === 'rate-limited' && (state.agents || []).includes('codex');
   const codexAction = (goalId, agent) => canUseCodex && agent === 'claude-code'
     ? `<button class="ab txt" data-fscodex="${goalId}" title="Start now with Codex">Run with Codex</button>` : '';
-  const parkedRows = parkedReplyGoals.map((g) => `<div class="trow up" data-goalid="${g.id}"><span class="st"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword" style="color:var(--ink3)">Queued</span>${codexAction(g.id, g.agent)}${fsActs(g.id)}</div>`).join('');
+  const parkedRows = parkedReplyGoals.map((g) => `<div class="trow up" data-goalid="${g.id}" data-fsgoalrow="${g.id}"><span class="st"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword" style="color:var(--ink3)">Queued</span>${codexAction(g.id, g.agent)}${fsActs(g.id)}</div>`).join('');
   const NCAP = 6;
   const upShown = fsUI.todoMore ? queued : queued.slice(0, NCAP);
   const seenGoals = new Set();
@@ -7008,7 +7031,7 @@ function renderFsTodo(){
           <div class="reps">${reps.map((r) => `<div class="rep">${tt(r.detail ?? r.title, 120)}</div>`).join('')}</div></div>`;
       }
     }
-    return `<div class="trow up${i >= 2 ? ' dim' : ''}" data-goalid="${t.goalId ?? ''}" data-taskid="${t.id}"><span class="st"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span>${codexAction(t.goalId, t.agent)}${fsActs(t.goalId)}</div>${grp}`;
+    return `<div class="trow up${i >= 2 ? ' dim' : ''}" data-goalid="${t.goalId ?? ''}" data-taskid="${t.id}"${t.goalId != null ? ` data-fsgoalrow="${t.goalId}"` : ''}><span class="st"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span>${codexAction(t.goalId, t.agent)}${fsActs(t.goalId)}</div>${grp}`;
   }).join('');
   // CDO review 2026-07-08 §7: this header count used to be queued.length alone (the
   // "Next up" pool only) — so a project sitting in Doing/Later with an empty Next-up
@@ -7035,20 +7058,25 @@ function renderFsTodo(){
     <div class="tl">
       ${(doingRows || paused) ? `<span class="tlcap tlcap-doing" style="padding-top:0">Doing<button class="tlcap-pause" data-fspause="1" aria-pressed="${paused ? 'true' : 'false'}" title="${paused ? 'Resume — 再開' : 'Pause — 一時停止'}">${paused ? '<svg viewBox="0 0 24 24"><path d="M8 5v14l11-7z"/></svg>' : '<svg viewBox="0 0 24 24"><rect x="6" y="5" width="4" height="14" rx="1"/><rect x="14" y="5" width="4" height="14" rx="1"/></svg>'}</button></span>${doingRows}` : ''}
       ${needsRows ? `<span class="tlcap needs"${(doingRows || paused) ? '' : ' style="padding-top:0"'}>Needs you</span>${needsRows}` : ''}
-      ${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"><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('')}` : ''}
+      ${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>` : ''}
       ${laterRows ? `<span class="tlcap">Later</span>${laterRows}` : ''}
       <button class="qadd" data-fsnew="1" title="New goal"><span class="paplus"></span>New</button>
     </div>
     ${doneAll.length ? `<div class="doneline${fsUI.doneOpen ? ' open' : ''}" id="fsDoneLine">✓ Done<span class="num">${doneAll.length}</span><span class="fold">▾</span></div>
-      <div id="fsDonelist"${fsUI.doneOpen ? '' : ' hidden'}>${doneAll.map((t) => `<div class="trow up dim done"><span class="st ok"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span></div>`).join('')}</div>` : ''}`;
+      <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 dl = el.querySelector('#fsDoneLine');
   if (dl) dl.onclick = () => { fsUI.doneOpen = !fsUI.doneOpen; dl.classList.toggle('open', fsUI.doneOpen); el.querySelector('#fsDonelist').hidden = !fsUI.doneOpen; };
+  for (const r of el.querySelectorAll('[data-fsgoalrow]')) r.onclick = (e) => {
+    if (e.target.closest('button, a, input, .acts, .acts2, .errbtn, .ab, .repfold')) return;
+    const id = Number(r.dataset.fsgoalrow);
+    if (Number.isFinite(id)) fsOpenGoalDetail(id);
+  };
   for (const b of el.querySelectorAll('[data-fsreopen]')) b.onclick = async (e) => { e.stopPropagation();
     const r = await fetch(withKey(`/api/goals/${b.dataset.fsreopen}/reopen`), { method: 'POST' });
     if (!r.ok) showErr('Reopen failed.'); else await refresh(); };

package/engine/lib.mjs

@@ -2008,20 +2008,23 @@ export function isPrMerged({ state, mergedAt } = {}) {
   return state === 'MERGED' || !!mergedAt;
 }
 
+export function isPrClosed({ state, mergedAt } = {}) {
+  return state === 'CLOSED' && !mergedAt;
+}
+
 // Interpret the same `gh pr view` result's reviewDecision field
 // (APPROVED / CHANGES_REQUESTED / REVIEW_REQUIRED / null).
 export function isPrApproved({ reviewDecision } = {}) {
   return reviewDecision === 'APPROVED';
 }
 
-// A 'review' goal whose PR merged OR was approved is done; every other goal
-// status (and a still-open, unapproved PR) passes through unchanged — this
+// A 'review' goal whose PR merged OR closed is done; every other goal status
+// (including an approved but still-open PR) passes through unchanged — this
 // never regresses a goal out of 'review' on its own.
-export function reviewToDoneStatus({ goalStatus, merged }) {
-  // Only an actual MERGE closes a review (= the change shipped). A GitHub PR
-  // *approval* must NOT auto-Done on reload — you review IN the Manager, so an
-  // external approval silently clearing your Review was the "勝手にdone" surprise.
-  return goalStatus === 'review' && merged ? 'done' : goalStatus;
+export function reviewToDoneStatus({ goalStatus, merged, closed }) {
+  // Merge and close both end the GitHub review lifecycle. Approval alone does
+  // not: an approved but still-open PR remains actionable in Review.
+  return goalStatus === 'review' && (merged || closed) ? 'done' : goalStatus;
 }
 
 // Build the proof PR body (EN + JA, no emoji) and the PROOF.md committed to

package/engine/server.mjs

@@ -23,6 +23,7 @@ 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, 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, resolveTestGate, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, workerPrompt, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, isInconclusiveTestRun, countInfraFlakes, classifyRunFailures, classifyVerifyGate, 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, 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 { isPrClosed } from './lib.mjs';
 import { collectProjectRules } from './lib.mjs';
 import { FALLBACK_CODEX_MODELS, loadCodexModels } from './codex-models.mjs';
 import { CLAUDE_MODELS } from './claude-models.mjs';
@@ -1400,7 +1401,7 @@ async function syncAllExternal() {
 }
 
 // Goals awaiting review carry their PR url in goal.pr; poll `gh pr view` for
-// each and flip 'review' -> 'done' once GitHub reports it merged or approved.
+// each and flip 'review' -> 'done' once GitHub reports it merged or closed.
 function ghPrView(url) {
   return new Promise((res) => {
     execFile('gh', ['pr', 'view', url, '--json', 'state,mergedAt,reviewDecision'], (e, out, stderr) => {
@@ -1418,13 +1419,15 @@ async function syncGoalMerges() {
     if (!raw) return;
     let data;
     try { data = JSON.parse(raw); } catch { return; }
-    const newStatus = reviewToDoneStatus({ goalStatus: g.status, merged: isPrMerged(data), approved: isPrApproved(data) });
+    const merged = isPrMerged(data);
+    const closed = isPrClosed(data);
+    const newStatus = reviewToDoneStatus({ goalStatus: g.status, merged, closed, approved: isPrApproved(data) });
     if (newStatus !== g.status) {
       g.status = newStatus; saveGoal(g);
       // §3/§7: a merged PR is truly terminal (no rework possible) — reclaim the
       // per-goal worktree so .manager-wt/goal-<id> doesn't leak forever. (Manual
       // Approve stays reworkable via revert, so we don't clean those up here.)
-      if (newStatus === 'done' && isPrMerged(data)) {
+      if (newStatus === 'done' && (merged || closed)) {
         const project = projects.find((p) => p.id === g.projectId);
         if (project) removeGoalWorkDir(g, project);
       }

package/package.json

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