@galda/cli 0.10.84 → 0.10.85

package/engine/server.mjs

@@ -21,8 +21,9 @@ 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, 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, isNothingVerifiableForPR, isSuspiciouslyIncompleteDone, 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, 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, buildReviewAttemptLedger, 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, isNothingVerifiableForPR, isSuspiciouslyIncompleteDone, 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, buildGoalMessage, serializeGoalMessage, parseGoalMessages, computeInternalQualityMetrics, classifyInternalQualityTaskError, resolveWorkspaceMode, goalSessionFor, setGoalAgentSession, switchGoalAgentSession, parseApprovalRequest } from './lib.mjs';
 import { createSerialQueue } from './lib.mjs';
+import { parseRequirementEvidence, unmappedChangedFiles } from './lib.mjs';
 import { isPrClosed } from './lib.mjs';
 import { collectProjectRules } from './lib.mjs';
 import { FALLBACK_CODEX_MODELS, loadCodexModels } from './codex-models.mjs';
@@ -1397,7 +1398,7 @@ function cancelGoalWork(goal) {
   killGoalWorkers(goal.id);
   const q = queues.get(goal.projectId);
   if (q) q.waiting = q.waiting.filter((t) => t.goalId !== goal.id);
-  for (const t of tasks.filter((t) => t.goalId === goal.id && ['queued', 'running', 'interrupted'].includes(t.status))) {
+  for (const t of tasks.filter((t) => t.goalId === goal.id && ['queued', 'running', 'interrupted', 'awaitingApproval'].includes(t.status))) {
     t.status = 'cancelled'; t.finishedAt = new Date().toISOString(); saveTask(t);
   }
 }
@@ -2208,11 +2209,17 @@ function queueReplyTask(goal, text, { from = 'manager', via = 'composer' } = {})
   const task = {
     id: nextId++, num: (nums.length ? Math.max(...nums) : 0) + 1,
     goalId: goal.id, projectId: goal.projectId, reply: true, model: goal.model, effort: goal.effort, agent: goal.agent,
-    title: text.replace(/\s+/g, ' ').slice(0, 60), detail: promptText.slice(0, 4000),
+    title: text.replace(/\s+/g, ' ').slice(0, 60), detail: promptText.slice(0, 4000), replyFrom: from,
     workspaceMode: resolveWorkspaceMode(goal.workspaceMode ?? goal.worktree),
     worktree: goal.worktree === false ? false : undefined,
     passCondition: null, status: 'queued', createdAt: new Date().toISOString(), priority: '中',
     result: null, changedFiles: [], secs: null, activity: [], proof: null, usage: null,
+    userRequirementHistory: tasks.filter((t) => t.goalId === goal.id && (!t.reply || t.replyFrom === 'you')).slice(-12).map((t) => ({ text: t.reply ? t.detail : t.title, status: t.status })),
+    // Transport the prior attempts as facts; the worker, not Manager, decides
+    // what to implement in response to the new user reply.
+    requirementHistory: tasks.filter((t) => t.goalId === goal.id).slice(-12).map((t) => ({
+      text: t.reply ? t.detail : t.title, status: t.status, reply: !!t.reply,
+    })),
   };
   tasks.push(task);
   saveTask(task);
@@ -2252,6 +2259,24 @@ function queueReplyTask(goal, text, { from = 'manager', via = 'composer' } = {})
   return task;
 }
 
+function pauseGoalForApproval(goal, task, request) {
+  if (!goal || !task || !request) return false;
+  const requestedAt = new Date().toISOString();
+  goal.status = 'needsApproval';
+  goal.startedAt = null;
+  goal.pauseReason = 'approval_required';
+  goal.approvalRequest = { ...request, requestedAt, pausedTaskId: task.id, external: false };
+  goal.approvalDecision = null;
+  task.status = 'awaitingApproval';
+  task.result = request.question;
+  task.finishedAt = null;
+  saveTask(task);
+  saveGoal(goal);
+  sendProcessAct(task, `Paused for your approval: ${request.question}`);
+  startNextStacked(goal.projectId);
+  return true;
+}
+
 // split (docs/design/ONE-CONVERSATION.md §1.3): 「それは別件」と返された時の受け皿。
 // 元のゴールには触らない——新しいチケットを1枚起こし、そこに「どこから生まれたか」だけ
 // 片方向の印（bornFrom）を残す。
@@ -2723,8 +2748,11 @@ async function runTask(task) {
     task.secs = Math.round((Date.now() - t0) / 1000);
     task.status = r.code === 0 ? 'done' : 'failed';
     task.result = r.result.slice(0, RESULT_MAX);
+    task.requirementEvidence = parseRequirementEvidence(task.result);
     task.usage = sumUsage([r.usage]);
     if (r.sessionId && goal) { setGoalAgentSession(goal, runAgent, r.sessionId); saveGoal(goal); }
+    const approval = parseApprovalRequest(r.result);
+    if (approval && pauseGoalForApproval(goal, task, approval)) return;
     // A follow-up owns its own evidence too. Previously only the initial task
     // consumed .manager-run.json, so replies either left the new declaration
     // behind or Review kept showing an older task's title/URL.
@@ -2734,6 +2762,8 @@ async function runTask(task) {
     inheritPreviousRunDeclaration(task, goal?.id);
     const afterR = await gitChanges(workDir);
     task.changedFiles = afterR.filter((l) => !before.includes(l)).map((l) => l.slice(3));
+    task.unmappedChangedFiles = unmappedChangedFiles(task.changedFiles, task.requirementEvidence);
+    task.requirementVerification = { proof: task.proof ?? null, run: task.run ?? null, changedFiles: task.changedFiles };
     sendProcessAct(task, `Detected ${task.changedFiles.length} changed file${task.changedFiles.length === 1 ? '' : 's'} from this follow-up.`);
     task.finishedAt = new Date().toISOString();
     task.resultAttemptId = task.attemptId;
@@ -2760,7 +2790,7 @@ async function runTask(task) {
 
   // No `lastFailure` any more: it existed only to tell the next attempt why our
   // check had rejected the last one, and there is no next attempt now.
-  let verify = null, verdict = null, code = 0, result = '', usages = [], timedOut = false;
+  let verify = null, verdict = null, code = 0, result = '', usages = [], timedOut = false, approval = null;
   for (let attempt = 1; attempt <= maxAttempts; attempt++) {
     let callT0 = Date.now();
     const plan = goal?.executionPlan;
@@ -2822,6 +2852,8 @@ async function runTask(task) {
       ? `Worker attempt ${attempt} was stopped at the ${Math.round(WORKER_TIMEOUT_MS / 60000)}-minute run limit (exit ${code}).`
       : `Worker attempt ${attempt} finished with exit code ${code}.`);
     if (r.sessionId && goal) { setGoalAgentSession(goal, runAgent, r.sessionId); saveGoal(goal); }
+    approval = parseApprovalRequest(result);
+    if (approval) break;
     if (!entryUrl) break;
     try {
       if (!verify) {
@@ -2859,6 +2891,11 @@ async function runTask(task) {
   }
 
   if (goal?.cancelled) return; // deleted during the verify loop → don't resurrect the task
+  if (approval) {
+    task.secs = Math.round((Date.now() - t0) / 1000);
+    task.usage = sumUsage(usages);
+    if (pauseGoalForApproval(goal, task, approval)) return;
+  }
   task.secs = Math.round((Date.now() - t0) / 1000);
   // Status decision, most-authoritative first (taskStatusAfterVerify in lib):
   //  1. an independent verify PASS = verified success — wins even if the worker
@@ -2885,6 +2922,7 @@ async function runTask(task) {
   // force-stopped task states WHY so the Attention card explains itself.
   if (forcedStop && (!result || result === '(no output)')) result = workerExitReason(code, timedOut, WORKER_TIMEOUT_MS);
   task.result = result.slice(0, RESULT_MAX);
+  task.requirementEvidence = parseRequirementEvidence(task.result);
   task.usage = sumUsage(usages);
   if (verdict) {
     const label = verdict.pass ? 'PASS' : verdict.inconclusive ? 'INCONCLUSIVE (自動確認できず・要確認)' : 'FAIL';
@@ -2930,6 +2968,8 @@ async function runTask(task) {
   reconcileComparePair(task);
   const after = await gitChanges(workDir);
   task.changedFiles = after.filter((l) => !before.includes(l)).map((l) => l.slice(3));
+  task.unmappedChangedFiles = unmappedChangedFiles(task.changedFiles, task.requirementEvidence);
+  task.requirementVerification = { proof: task.proof ?? null, run: task.run ?? null, changedFiles: task.changedFiles };
   sendProcessAct(task, `Detected ${task.changedFiles.length} changed file${task.changedFiles.length === 1 ? '' : 's'} from this task.`);
   // task 450: taskStatusAfterVerify decided 'done' from `code` alone, before
   // changedFiles existed to check against. Don't trust a clean exit code by
@@ -3458,6 +3498,7 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
   // after) so the PR body's "確認ポイント" headline is available the first
   // time the PR is opened, not only on the review card (Masa 2026-07-16).
   goalAct('Writing the review summary from the worker report and diff.');
+  goal.reviewAttempt = buildReviewAttemptLedger({ goal, tasks: siblings });
   goal.reviewSummary = await summarizeForReview(goal, siblings, wdir, reviewDefinition);
   if (activityTask?.attemptId) goal.reviewSummaryAttemptId = activityTask.attemptId;
   goalAct('Checking changed files and preparing the PR branch if code changed.');
@@ -4318,14 +4359,14 @@ const server = createServer(async (req, res) => {
     req.on('data', (d) => { body += d; });
     req.on('end', async () => {
       try {
-        const { projectId, text, pr, existingPr, 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, approval, action, scope, resumeInstruction, 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
         // (no LLM), checked BEFORE the intent router below: a short command-like
         // "止めて"/"再開" toggles THIS project's pause state and returns a chat reply
         // — it never becomes a To-Do. /later and /review skip this like the router.
-        if (!pending && !review) {
+        if (!pending && !review && !approval) {
           const pauseIntent = detectPauseIntent(text.trim());
           if (pauseIntent === 'pause') {
             pauseProject(projectId);
@@ -4349,7 +4390,7 @@ const server = createServer(async (req, res) => {
         // words then become a new ticket, which is what happens today anyway — a typo
         // must never make a request disappear.
         const identity = identityFor(req);
-        if (!pending && !review) {
+        if (!pending && !review && !approval) {
           const addr = parseGoalAddress(text);
           const target = addr && goals.find((g) => g.id === addr.goalId
             && g.projectId === projectId
@@ -4373,7 +4414,7 @@ const server = createServer(async (req, res) => {
         // anything else gets one Haiku round-trip that both classifies and writes
         // the reply. LLM failure falls back to 'task' — never drop a real
         // implementation ask (the folder guard below still prevents no-ops).
-        if (!pending && !review && classifyComposerIntentHeuristic(text.trim()) === 'chat') {
+        if (!pending && !review && !approval && classifyComposerIntentHeuristic(text.trim()) === 'chat') {
           // Only a HIGH-confidence chat/help/settings message reaches the LLM —
           // to write the reply, and to let the model veto back to 'task' if the
           // heuristic over-fired. Everything else (clear tasks AND ambiguous
@@ -4416,7 +4457,7 @@ const server = createServer(async (req, res) => {
         // reusing the needsInput clarifying card; the answer (POST /answer)
         // rebinds this goal to the chosen repo, then planning proceeds. Skipped
         // for pending/review items (they never spawn a worker).
-        const runnable = !pending && !review;
+        const runnable = !pending && !review && !approval;
         const needsFolder = runnable && needsProjectFolder({ dir: project.dir, homeDir: HOME, isRepo: isGitRepo(project.dir) });
         const lang = /[぀-ヿ㐀-鿿]/.test(text) ? 'ja' : 'en';
         const folderQuestion = needsFolder ? buildFolderQuestion(detectRepos(HOME), { lang }) : undefined;
@@ -4441,17 +4482,27 @@ const server = createServer(async (req, res) => {
         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',
+          status: (needsFolder || needsReviewPref) ? 'needsInput' : approval ? 'needsApproval' : review ? 'review' : pending ? 'pending' : 'stacked',
           question: folderQuestion || reviewPrefQuestion,
+          pauseReason: approval ? 'approval_required' : undefined,
+          approvalRequest: approval ? {
+            type: 'approval_required',
+            action: String(action || 'continue').trim().slice(0, 120),
+            question: text.trim().slice(0, 500),
+            scope: Array.isArray(scope) ? scope.map((x) => String(x).trim().slice(0, 300)).filter(Boolean).slice(0, 20) : [],
+            resumeInstruction: String(resumeInstruction || '').trim().slice(0, 1000),
+            requestedAt: new Date().toISOString(), external: true,
+          } : undefined,
+          approvalDecision: null,
           reviewOnly: review ? true : undefined,
           note: review && typeof note === 'string' && note.trim() ? note.trim().slice(0, 8000) : undefined,
-          wantsPR: review ? Boolean(importedPr) : resolveWantsPR(pr, text, getReviewDefinition(projectId).defaultWantsPR),
+          wantsPR: (review || approval) ? Boolean(importedPr) : resolveWantsPR(pr, text, getReviewDefinition(projectId).defaultWantsPR),
           model: workerModel(goalAgent, model),
           effort: workerEffort(goalAgent, effort),
           agent: goalAgent,
           // MODE (Auto/Plan): plan = propose a plan first, approve to execute.
           // review-only goals never run a worker, so mode is moot → 'auto'.
-          mode: (!review && GOAL_MODES.includes(mode)) ? mode : 'auto',
+          mode: (!review && !approval && GOAL_MODES.includes(mode)) ? mode : 'auto',
           // SKILL: an optional user/project skill (or command) to invoke first.
           skill: (typeof skill === 'string' && skill.trim()) ? skill.trim().slice(0, 80) : null,
           // WORKSPACE MODE: isolated-worktree is the default and uses a clean per-goal
@@ -4897,6 +4948,69 @@ const server = createServer(async (req, res) => {
   }
 
   // Slack-style thread reply on a goal: resumes the goal's worker session
+  // A Needs you decision is not a Review verdict. It either resumes the same
+  // goal/session with an explicit permission boundary, or ends the paused work.
+  const approvalMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/approval$/);
+  if (approvalMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(approvalMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    if (goal.status !== 'needsApproval' || !goal.approvalRequest) return json(res, 409, { error: 'goal is not awaiting approval' });
+    let body = '';
+    req.on('data', (d) => { body += d; });
+    req.on('end', () => {
+      let decision = '', instruction = '';
+      try {
+        const parsed = JSON.parse(body || '{}');
+        decision = String(parsed.decision ?? '').trim();
+        instruction = String(parsed.instruction ?? '').trim().slice(0, 2000);
+      } catch { return json(res, 400, { error: 'bad json' }); }
+      if (!['proceed', 'edit', 'cancel'].includes(decision)) return json(res, 400, { error: 'decision must be proceed, edit, or cancel' });
+      if (decision === 'edit' && !instruction) return json(res, 400, { error: 'instruction required for edit' });
+      const decidedAt = new Date().toISOString();
+      goal.approvalDecision = { decision, instruction: instruction || undefined, decidedAt };
+      const request = goal.approvalRequest;
+
+      // MCP/external agents cannot be resumed by this process. Persist the
+      // decision for manager_status polling and close this human-only card.
+      if (request.external) {
+        goal.status = decision === 'cancel' ? 'skipped' : 'done';
+        goal.pauseReason = null;
+        saveGoal(goal);
+        startNextStacked(goal.projectId);
+        return json(res, 200, goal);
+      }
+
+      const paused = tasks.find((t) => t.id === request.pausedTaskId && t.goalId === goal.id);
+      if (decision === 'cancel') {
+        const q = queues.get(goal.projectId);
+        if (q) q.waiting = q.waiting.filter((t) => t.goalId !== goal.id);
+        for (const t of tasks.filter((t) => t.goalId === goal.id && ['queued', 'awaitingApproval'].includes(t.status))) {
+          t.status = 'cancelled'; t.finishedAt = decidedAt; saveTask(t);
+        }
+        goal.status = 'skipped'; goal.pauseReason = null; goal.startedAt = null;
+        saveGoal(goal); startNextStacked(goal.projectId);
+        return json(res, 200, goal);
+      }
+
+      if (paused) {
+        paused.status = 'done';
+        paused.finishedAt = decidedAt;
+        paused.result = `Approval received: ${request.question}`;
+        saveTask(paused);
+      }
+      const scopeText = request.scope?.length ? `\n許可された範囲:\n- ${request.scope.join('\n- ')}` : '';
+      const resumeText = decision === 'edit'
+        ? `承認条件が更新されました。次の指示の範囲で同じ作業を再開し、最後まで完了してください。\n${instruction}`
+        : `${request.resumeInstruction || `「${request.action}」の実行が承認されました。同じ作業を再開し、最後まで完了してください。`}${scopeText}`;
+      goal.status = 'running'; goal.pauseReason = null; goal.startedAt = null;
+      saveGoal(goal);
+      const replyTask = queueReplyTask(goal, resumeText, { from: 'you', via: 'approval' });
+      return json(res, 200, { ...goal, replyTaskId: replyTask.id });
+    });
+    return;
+  }
+
   // Smart intake: answer a planner clarifying question → fold it into the goal
   // and re-plan (no new worker; same goal continues to decomposition).
   const answerMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/answer$/);
@@ -5070,6 +5184,7 @@ const server = createServer(async (req, res) => {
     const goal = goals.find((g) => g.id === Number(replyMatch[1]));
     if (!goal) return json(res, 404, { error: 'goal not found' });
     if (!requireGoalOwnership(req, res, goal)) return;
+    if (goal.status === 'needsApproval') return json(res, 409, { error: 'goal is awaiting an approval decision — use /approval' });
     if (['stacked', 'planning'].includes(goal.status)) return json(res, 409, { error: 'goal not started yet — edit it instead' });
     let body = '';
     req.on('data', (d) => { body += d; });

package/package.json

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