@galda/cli 0.10.65 → 0.10.67

package/app/index.html

@@ -4365,7 +4365,7 @@ function renderStream(){
       if (e.key !== 'Enter' || e.isComposing || !inp.value.trim()) return;
       const text = inp.value.trim(); inp.value = ''; inp.disabled = true;
       const r = await fetch(withKey(`/api/goals/${inp.dataset.goal}/reply`), { method: 'POST',
-        headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
+        headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) });
       if (!r.ok) showErr('Reply failed — the goal may not have started yet.');
       inp.disabled = false;
     });
@@ -4948,7 +4948,7 @@ function openGoalheadReply(id, btn){
   const snd = document.createElement('button'); snd.className = 'qbtn ok'; snd.textContent = '↑';
   wrap.appendChild(inp); wrap.appendChild(snd); head.insertAdjacentElement('afterend', wrap); inp.focus();
   const send = async () => { const t = inp.value.trim(); if (!t) return;
-    const r = await fetch(withKey(`/api/goals/${id}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: t }) });
+    const r = await fetch(withKey(`/api/goals/${id}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text: t })) });
     if (!r.ok) showErr('未開始のゴールは編集を使ってください'); await refresh(); };
   inp.onkeydown = (e) => { if (e.key === 'Enter' && !e.isComposing) { e.preventDefault(); send(); } if (e.key === 'Escape') wrap.remove(); };
   snd.onclick = send;
@@ -5405,7 +5405,7 @@ function renderReviewChecklist(){
       b.disabled = true; input.disabled = true;
       const r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST',
         headers: { 'content-type': 'application/json' },
-        body: JSON.stringify({ text: `[Fix request for requirement #${t?.num ?? ''} "${t?.title ?? ''}"] ${text}` }) });
+        body: JSON.stringify(replyWorkerPayload({ text: `[Fix request for requirement #${t?.num ?? ''} "${t?.title ?? ''}"] ${text}` })) });
       if (r.ok) { input.value = ''; input.placeholder = 'Sent — the worker will pick it up'; }
       else showErr('Failed to send the fix request.');
       b.disabled = false; input.disabled = false;
@@ -5649,9 +5649,12 @@ const REPLY_CHOICE_LABEL = { continue: 'Fix this', rescope: 'Rethink it', split:
 // is the task/workflow vocabulary and this is neither (CDO §5).
 const REPLY_WAIT_ROUTING = 'Thinking…';
 const REPLY_WAIT_ANSWERING = 'Answering…';
+function replyWorkerPayload(extra = {}){
+  return { ...extra, agent: state.connectedApp, model: state.stickyModel, effort: state.stickyEffort };
+}
 async function postReply(goalId, text, outcome = 'auto'){
   const r = await fetch(withKey(`/api/goals/${goalId}/dismiss`), { method: 'POST',
-    headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text, outcome }) });
+    headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text, outcome })) });
   if (!r.ok) throw new Error();
   return r.json();
 }
@@ -6139,7 +6142,7 @@ async function sendGoalInstruction(goalId, text){
   $('gdSend').disabled = true; $('gdDiscard').disabled = true;
   try {
     const r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST',
-      headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
+      headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) });
     if (!r.ok) throw new Error();
     upsert(state.tasks, await r.json());
     const g = state.goals.find((x) => x.id === goalId);
@@ -7095,7 +7098,7 @@ function renderFsTodo(){
   // hover-toolbar actions → same endpoints as the SL1 goalhead toolbar
   for (const b of el.querySelectorAll('[data-fsreply]')) b.onclick = (e) => { e.stopPropagation();
     fsInlineInput(b.closest('.trow'), '', 'Reply to this goal…', async (text) => {
-      const r = await fetch(withKey(`/api/goals/${b.dataset.fsreply}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text }) });
+      const r = await fetch(withKey(`/api/goals/${b.dataset.fsreply}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text })) });
       if (!r.ok) showErr('未開始のゴールは編集を使ってください'); await refresh();
     }); };
   for (const b of el.querySelectorAll('[data-fsedit]')) b.onclick = (e) => { e.stopPropagation();
@@ -8577,7 +8580,7 @@ async function send(){
       } else {
         // running/partial/failed/interrupted/blocked → a plain follow-up on the same goal.
         const r = await fetch(withKey(`/api/goals/${bind.goal.id}/reply`), { method: 'POST',
-          headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: fullText }) });
+          headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text: fullText })) });
         if (!r.ok) throw new Error();
         const g = await r.json(); const goal = g.goal ?? g;
         if (goal?.id) upsert(state.goals, goal);
@@ -9781,7 +9784,7 @@ async function saSendReply(it, i, text){
     it.st = 3; it.rstatus = 'working'; SA.cur = goalId;
     saPaintCard(goalId);
     try {
-      const r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ text: workerText }) });
+      const r = await fetch(withKey(`/api/goals/${goalId}/reply`), { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(replyWorkerPayload({ text: workerText })) });
       if (!r.ok) throw new Error('reply failed');
       if (isAttn) {
         // A Needs-you reply picks the goal back up → it belongs in Doing, not lingering in

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);
       }
@@ -1973,6 +1976,19 @@ function resumeProject(projectId) {
 
 // Slack風スレッド返信タスクの生成(/api/goals/:id/reply と /api/goals/:id/dismiss で共有)。
 // runTask()のtask.reply分岐がgoal.sessionIdをresumeに渡して同じ会話を続ける。
+function applyReplyWorker(goal, requested = {}) {
+  if (requested.agent == null) return { ok: true };
+  if (!WORKER_AGENTS.includes(requested.agent)) return { ok: false, error: 'unsupported agent' };
+  const agent = workerAgent(requested.agent);
+  if (!AVAILABLE_AGENTS.includes(agent)) return { ok: false, error: `${agent} is not connected on this device` };
+  const switchedAgent = agent !== goal.agent;
+  goal.agent = agent;
+  goal.model = workerModel(agent, requested.model);
+  goal.effort = workerEffort(agent, requested.effort);
+  if (switchedAgent) goal.sessionId = null;
+  return { ok: true };
+}
+
 function queueReplyTask(goal, text, { from = 'manager', via = 'composer' } = {}) {
   // Every follow-up on a goal is part of its conversation (§1.1). Recorded here
   // rather than at each call site so an internally-generated nudge (auto-retest
@@ -4522,8 +4538,11 @@ const server = createServer(async (req, res) => {
     req.on('data', (d) => { body += d; });
     req.on('end', () => {
       try {
-        const { text } = JSON.parse(body);
+        const requested = JSON.parse(body);
+        const { text } = requested;
         if (!text?.trim()) return json(res, 400, { error: 'text required' });
+        const worker = applyReplyWorker(goal, requested);
+        if (!worker.ok) return json(res, 409, { error: worker.error });
         // Reply picks a parked goal back up into the work queue. 'review' MUST be
         // here: a completed goal awaiting your approve/reject is 'review', and a
         // reply to it means "not done — keep working" (Masa 2026-07-24: replied to
@@ -4814,13 +4833,15 @@ async function answerGoalQuestion(goal, question) {
     let body = '';
     req.on('data', (d) => { body += d; });
     req.on('end', async () => {
-      let text = '', outcome = 'continue', auto = false;
+      let text = '', outcome = 'continue', auto = false, requested = {};
       try {
-        const parsed = JSON.parse(body || '{}');
-        text = String(parsed.text ?? '').trim();
-        if (REPLY_OUTCOMES.includes(parsed.outcome)) outcome = parsed.outcome;
-        auto = parsed.outcome === 'auto';
+        requested = JSON.parse(body || '{}');
+        text = String(requested.text ?? '').trim();
+        if (REPLY_OUTCOMES.includes(requested.outcome)) outcome = requested.outcome;
+        auto = requested.outcome === 'auto';
       } catch {}
+      const worker = applyReplyWorker(goal, requested);
+      if (!worker.ok) return json(res, 409, { error: worker.error });
 
       // outcome:'auto' = 決めるのは AI 本人 (§1.4)。人の言葉を1回だけ渡して、返って
       // きた行き先のとおりに配線する。我々はキーワードも類似度も見ない。

package/package.json

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