@galda/cli 0.10.66 → 0.10.67

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.67",
   "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": {