npm - @galda/cli - Versions diffs - 0.10.12 → 0.10.13 - Mend

@galda/cli 0.10.12 → 0.10.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/app/index.html CHANGED Viewed

@@ -971,7 +971,7 @@
   .gearbtn{display:grid;place-items:center;width:30px;height:28px;border:1px solid var(--hair2);border-radius:8px;background:transparent;color:var(--ink2);cursor:pointer}
   .gearbtn:hover{background:var(--surface2);color:var(--ink)}
   .gearbtn svg{width:15px;height:15px;fill:none;stroke:currentColor;stroke-width:1.7;stroke-linecap:round;stroke-linejoin:round}
-  .gearpop{display:none;position:absolute;top:36px;right:0;z-index:80;background:var(--panel);border-radius:12px;box-shadow:0 10px 30px rgba(20,23,31,.18),0 0 0 1px var(--hair);padding:12px 13px;width:320px;
+  .gearpop{display:none;position:absolute;top:36px;right:0;z-index:80;background:var(--panel);border-radius:12px;box-shadow:0 10px 30px rgba(20,23,31,.18),0 0 0 1px var(--hair);padding:12px 13px;width:250px;
     max-height:78vh;overflow-y:auto;scrollbar-width:thin; /* TB edge + colour sections made it taller than the viewport */
     /* opaque chip fill (HANDOFF-v45 §9): a translucent --canvas would let the wallpaper
        bleed through and colour each row differently — this token mixes off the OPAQUE
@@ -1008,7 +1008,7 @@
      the rail (left is set on open from the measured rail edge), max-height = viewport −
      margins, internal scroll. White-translucent per §3: color-mix 74% + blur28 (theme-tinted).
      The node is adopted to <body> in flagship (positionLayout) — .top is display:none there. */
-  body[data-layout="flagship"] .gearpop{position:fixed;top:120px;right:auto;width:380px;max-height:calc(100vh - 160px);border-radius:14px;
+  body[data-layout="flagship"] .gearpop{position:fixed;top:120px;right:auto;width:300px;max-height:calc(100vh - 160px);border-radius:14px;
     background:color-mix(in srgb,var(--panel) 74%,transparent);
     -webkit-backdrop-filter:blur(28px) saturate(1.35);backdrop-filter:blur(28px) saturate(1.35)}
   /* settings = EDIT SESSION (HANDOFF-v45 §3, flagship .cfoot/.mcpbox port): sticky footer,
@@ -2183,8 +2183,9 @@
       <div class="lbrow"><span class="lb">Projects</span>
         <button class="ghostbtn morebtn" id="fsMoreBtn" title="Settings"><svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="3.2"/><path d="M19.4 15a1.7 1.7 0 00.34 1.87l.06.06a2 2 0 11-2.83 2.83l-.06-.06a1.7 1.7 0 00-1.87-.34 1.7 1.7 0 00-1 1.56V21a2 2 0 11-4 0v-.09a1.7 1.7 0 00-1-1.56 1.7 1.7 0 00-1.87.34l-.06.06a2 2 0 11-2.83-2.83l.06-.06a1.7 1.7 0 00.34-1.87 1.7 1.7 0 00-1.56-1H3a2 2 0 110-4h.09a1.7 1.7 0 001.56-1 1.7 1.7 0 00-.34-1.87l-.06-.06a2 2 0 112.83-2.83l.06.06a1.7 1.7 0 001.87.34h.09a1.7 1.7 0 001-1.56V3a2 2 0 114 0v.09a1.7 1.7 0 001 1.56h.09a1.7 1.7 0 001.87-.34l.06-.06a2 2 0 112.83 2.83l-.06.06a1.7 1.7 0 00-.34 1.87v.09a1.7 1.7 0 001.56 1H21a2 2 0 110 4h-.09a1.7 1.7 0 00-1.56 1z"/></svg></button>
         <div class="moremenu" id="fsMoreMenu">
-          <button class="ghostbtn" id="fsCust">Theme Color…</button>
+          <button class="ghostbtn" id="fsCust">Customize…</button>
           <button class="ghostbtn" id="fsConn">Connect MCP</button>
+          <button class="ghostbtn" id="fsTodoBd">To Do board</button>
           <button class="ghostbtn" id="fsHist">History</button>
           <button class="ghostbtn" id="fsSet">Settings</button>
         </div>
@@ -5400,19 +5401,6 @@ function renderClawdHero(){
   tgUpdate();
   $('fsMoreBtn').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.toggle('open'); };
   document.addEventListener('click', (e) => { if (!e.target.closest('#fsRoot .lbrow')) $('fsMoreMenu').classList.remove('open'); });
-  // Hover-first (Masa指示 2026-07-16): on a real pointer, aligning the cursor over
-  // the gear reveals the menu with no click, and resting on a menu row previews
-  // its panel straight away — click still works underneath for touch. A short
-  // hover-intent delay (120ms) stops a mouse just passing through from flashing
-  // every panel open.
-  if (matchMedia('(hover:hover)').matches) {
-    const lbrow = $('fsMoreBtn').closest('.lbrow');
-    let closeT = null;
-    if (lbrow) {
-      lbrow.addEventListener('mouseenter', () => { clearTimeout(closeT); $('fsMoreMenu').classList.add('open'); });
-      lbrow.addEventListener('mouseleave', () => { closeT = setTimeout(() => $('fsMoreMenu').classList.remove('open'), 150); });
-    }
-  }
   const closeMobilePanels = () => {
     document.body.classList.remove('laneopen', 'projectsopen');
   };
@@ -5434,21 +5422,11 @@ function renderClawdHero(){
   // v46 (HANDOFF-v45 §3): the menu entries deep-link into the 4-tab settings panel —
   // Customize…→THEME / Connect MCP→MCP / History→HISTORY / Settings→SETTINGS.
   // stopPropagation: the document click-away handler otherwise closes it in the same event.
-  // Each row also opens on hover-intent (120ms), so resting the cursor on a row is
-  // enough to see its panel — click still fires the same action underneath.
-  const menuItem = (btn, tab) => {
-    const open = (e) => { e && e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen(tab); };
-    btn.onclick = open;
-    if (matchMedia('(hover:hover)').matches) {
-      let t = null;
-      btn.addEventListener('mouseenter', () => { t = setTimeout(open, 120); });
-      btn.addEventListener('mouseleave', () => clearTimeout(t));
-    }
-  };
-  menuItem($('fsCust'), 'theme');
-  menuItem($('fsConn'), 'mcp');
-  menuItem($('fsHist'), 'history');
-  menuItem($('fsSet'), 'settings');
+  $('fsCust').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('theme'); };
+  $('fsConn').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('mcp'); };
+  $('fsTodoBd').onclick = () => { $('fsMoreMenu').classList.remove('open'); $('toggle').click(); }; // To Do board stays reachable from the menu; ⌘K itself now opens the project switcher (HANDOFF-v45 §11)
+  $('fsHist').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('history'); };
+  $('fsSet').onclick = (e) => { e.stopPropagation(); $('fsMoreMenu').classList.remove('open'); custOpen('settings'); };
   // parallel-runs switcher (§1.5-1/-7): same toggle+click-away shape as fsMoreMenu above.
   // Row content is rebuilt by renderFsFeed() (running list changes live); the open/closed
   // class here is left alone by that rebuild so the popover doesn't snap shut mid-render.
@@ -5836,12 +5814,19 @@ function bootDisconnected(info){
   const cw = document.getElementById('composerWrap');
   if (cw) cw.addEventListener('mousedown', (e) => { if (e.target.closest('#appsel, #modelsel, #effortsel')) return; gate(e); });
-  // come alive automatically: when the relay stops flagging disconnected (the
-  // engine connected → its live app is proxied), reload into the real board.
+  // Come alive automatically: while this device's engine is offline the relay
+  // 503s every engine-backed path (only /, /theme.css, /fonts.css are served);
+  // the instant the agent connects, the same path is proxied to the live engine
+  // (200). So we probe an engine-only endpoint by STATUS and reload when it stops
+  // 503-ing. We must NOT decide this by fetching `/` and grepping its HTML for a
+  // sentinel: this very poll's source contains the string '__GALDA_DISCONNECTED',
+  // so it is baked into every proxied copy of the page — the match is ALWAYS
+  // "found", the reload never fires, and the tab stays stuck on the connect
+  // screen forever ("npx said done but nothing happens"). (fix: status, not body)
   setInterval(() => {
-    fetch('/', { cache: 'no-store', credentials: 'same-origin' }).then((r) => r.text()).then((t) => {
-      if (t.indexOf('__GALDA_DISCONNECTED') === -1) location.reload();
-    }).catch(() => {});
+    fetch('/api/state', { cache: 'no-store', credentials: 'same-origin' })
+      .then((r) => { if (r.status !== 503) location.reload(); })
+      .catch(() => {});
   }, 4000);
 }
@@ -7473,11 +7458,11 @@ function gearSetHTML(){
         <button class="optchip" data-gsignin="1">Sign in with Google</button></div>
        <div class="srow dis" id="licKeyMsg" style="display:none"></div>`;
   } else if (bill.plan === 'paid') {
-    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google · ${esc(bill.email)}</span></div><button class="optchip" data-gsignout="1">Log out</button></div>
+    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google</span></div><span class="bx-sval">${esc(bill.email)}</span></div>
        <div class="srow"><div class="sl">Plan</div><span class="bx-pdot"><i></i>Paid</span></div>
        <div class="srow"><div class="sl">Billing<span class="sd">manage or cancel in Stripe</span></div><button class="bx-cchip" data-gportal="1">Manage</button></div>`;
   } else {
-    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google · ${esc(bill.email)}</span></div><button class="optchip" data-gsignout="1">Log out</button></div>
+    billingRow = `<div class="srow"><div class="sl">Account<span class="sd">Signed in with Google</span></div><span class="bx-sval">${esc(bill.email)}</span></div>
        <div class="srow"><div class="sl">Plan</div><span class="bx-sval">Free</span></div>
        <div class="srow"><div class="sl">To Dos<span class="sd">pending, this install</span></div><span class="bx-sval bx-num">${u.pending ?? 0} / ${lim.pending ?? 5}</span></div>
        <div class="srow"><div class="sl">Lifetime</div><span class="bx-sval bx-num">${u.cumulative ?? 0} / ${lim.cumulative ?? 19}</span></div>
@@ -7539,12 +7524,6 @@ function buildGearPop(){
     if (upBtn) upBtn.onclick = () => startCheckout();
     const portalBtn = pop.querySelector('[data-gportal]');
     if (portalBtn) portalBtn.onclick = () => openBillingPortal();
-    const signOutBtn = pop.querySelector('[data-gsignout]');
-    if (signOutBtn) signOutBtn.onclick = async () => {
-      signOutBtn.disabled = true;
-      try { await fetch(withKey('/api/signout'), { method: 'POST' }); }
-      finally { await refresh(); if ($('gearPop')) buildGearPop(); }
-    };
     return;
   }
   if (custTab === 'mcp') {

package/engine/server.mjs CHANGED Viewed

@@ -13,15 +13,15 @@
 import { createServer } from 'node:http';
 import { spawn, execFile, spawnSync } from 'node:child_process';
-import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync, statSync, readdirSync, unlinkSync } from 'node:fs';
+import { readFileSync, writeFileSync, appendFileSync, existsSync, mkdirSync, statSync, readdirSync } from 'node:fs';
 import { emitEvent } from './analytics-client.mjs';
 import { randomBytes, createHash } from 'node:crypto';
 import { resolve, dirname, join, basename } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { pathToFileURL } from 'node:url';
-import { needsProjectFolder, folderLabel, buildFolderQuestion, resolveFolderAnswer } from './lib.mjs';
-import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildReviewRuleSection, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, 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, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable } from './lib.mjs';
+import { needsProjectFolder, folderLabel, buildFolderQuestion, resolveFolderAnswer, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer } from './lib.mjs';
+import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, nextGoalStatus, isPrMerged, isPrApproved, reviewToDoneStatus, advanceReviewGoal, revertReviewGoal, approveGoal, dismissGoal, 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, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable } from './lib.mjs';
 import { openPR } from './pr.mjs';
 import { runVerification, exerciseUi } from './verify.mjs';
@@ -2160,6 +2160,11 @@ async function finishGoalIfComplete(goal, project, activityTask = null) {
   // point (all its tasks are done), so its conflictsWith is accurate even if
   // PR creation itself fails (e.g. no `gh` auth) or is still no-op'd (no code).
   updateGoalConflicts(goal);
+  // Computed BEFORE createGoalPR (not inside verifyGate, which used to run
+  // 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.reviewSummary = await summarizeForReview(goal, siblings, wdir, reviewDefinition);
   goalAct('Checking changed files and preparing the PR branch if code changed.');
   await createGoalPR(goal, prProject, siblings, reviewDefinition, activityTask);
   // goal 427 §4: classify the change's risk from the SAME changed-files/diff
@@ -2228,8 +2233,13 @@ async function verifyGate(goal, prProject, siblings, baseProject, activityTask =
     goal.testResult = { ran: false, skipped: true, skippedReason: changedFiles.length ? 'documentation-only change' : 'no changed files' };
     goalAct(`Skipped project tests: ${goal.testResult.skippedReason}.`);
   }
-  goalAct('Writing the review summary from the worker report and diff.');
-  goal.reviewSummary = await summarizeForReview(goal, siblings, wdir, reviewDefinition);
+  // Normally already set by finishGoalIfComplete before the PR was opened
+  // (so the PR body can include it too); only fall back here for the
+  // standalone /reverify path or any older goal that never got one.
+  if (!goal.reviewSummary) {
+    goalAct('Writing the review summary from the worker report and diff.');
+    goal.reviewSummary = await summarizeForReview(goal, siblings, wdir, reviewDefinition);
+  }
   const uiTasks = siblings.filter((t) => isUiChange(t.changedFiles));
   // Only require/capture proof for projects we can actually boot & screenshot
   // (Manager-shaped). A generic web repo that edits a stylesheet can't be
@@ -2371,26 +2381,12 @@ async function createGoalPR(goal, project, goalTasks, reviewDefinition = DEFAULT
     // (Masa: 「ユーザーの言語で」).
     const lang = reviewDefinition.language === 'auto' ? detectRequestLanguage(goal.text) : (reviewDefinition.language || 'ja');
     const L = (en, ja) => (lang === 'en' ? en : ja);
-    const bodyFor = (branch) => [
-      ...(proofItems.length && owner ? [
-        L('## Proof — one tap, plays in place', '## 動作確認 — 1タップでその場で再生'),
-        '',
-        `https://github.com/${owner}/blob/${branch}/${proofRel}/PROOF.md`,
-        '',
-      ] : []),
-      L('## Goal', '## ゴール'),
-      '',
-      goal.text.slice(0, 1500),
-      '',
-      ...buildReviewRuleSection(reviewDefinition.description),
-      L(`Implemented by Manager for AI: the goal was decomposed into ${goalTasks.length} task(s), each executed by a Claude Code worker (flat-rate, no extra API), tests written and run per task.${proofItems.length ? ' Tasks with a pass condition were verified independently in a headless browser.' : ''}`,
-        `Manager for AI が実装: ゴールを${goalTasks.length}個のタスクに分解し、Claude Code worker が順に実行（既存サブスク・追加API無し・タスク毎にテストを作成し実行）。${proofItems.length ? '成功条件つきタスクは headless ブラウザで独立検証済み。' : ''}`),
-      '',
-      L('## Tasks and worker reports', '## タスクとworker報告'),
-      ...goalTasks.map((t) => `\n### ${t.num} ${t.title} — ${t.status} (${t.secs}s)\n${(t.result ?? '').slice(0, 800)}`),
-      '',
-      L(`Changed files: ${files.map((f) => `\`${f}\``).join(' ')}`, `変更ファイル: ${files.map((f) => `\`${f}\``).join(' ')}`),
-    ].join('\n');
+    const bodyFor = (branch) => buildGoalPrBody({
+      lang, goal, goalTasks, files, owner, branch, proofRel,
+      proofItemsCount: proofItems.length,
+      reviewDescription: reviewDefinition.description,
+      reviewSummary: goal.reviewSummary,
+    });
     const title = `Manager for AI: ${isRework ? L('rework — ', '再作業 — ') : ''}${goal.plan?.[0] ?? goal.text.slice(0, 60)}${goal.plan?.length > 1 ? L(` +${goal.plan.length - 1} more`, ` 他${goal.plan.length - 1}件`) : ''}`;
     const { url, branch } = openPR({
       repoDir: project.dir, slug: `goal-${goal.id}`,
@@ -2401,7 +2397,7 @@ async function createGoalPR(goal, project, goalTasks, reviewDefinition = DEFAULT
       extraCopies,
       extraWrites: proofItems.length ? [{
         destRel: `${proofRel}/PROOF.md`,
-        content: buildGoalProofMd({ goalText: goal.text, items: proofItems }),
+        content: buildGoalProofMd({ goalText: goal.text, items: proofItems, lang }),
       }] : [],
       ...(isRework ? { existingBranch: goal.prBranch, existingPrUrl: goal.pr } : {}),
     });
@@ -2556,16 +2552,6 @@ const server = createServer(async (req, res) => {
     return;
   }
-  // POST /api/signout — forget the local license so the settings panel can
-  // offer a plain "Log out" instead of requiring the `--signin` CLI flag to
-  // switch Google accounts. Clears the on-disk token and the in-memory cache;
-  // idempotent when already signed out.
-  if (url.pathname === '/api/signout' && req.method === 'POST') {
-    if (existsSync(licenseFile)) unlinkSync(licenseFile);
-    licenseState = { email: null, isPaying: false, verifiedAt: 0 };
-    return json(res, 200, { ok: true });
-  }
   // GET /api/signin-url — mints a one-time nonce and returns the billing
   // Worker's /connect URL for "Sign in with Google". The app opens this in the
   // browser; Google bounces back to /oauth/callback (below) with a token.
@@ -2760,15 +2746,22 @@ const server = createServer(async (req, res) => {
         // for pending/review items (they never spawn a worker).
         const runnable = !pending && !review;
         const needsFolder = runnable && needsProjectFolder({ dir: project.dir, homeDir: HOME, isRepo: isGitRepo(project.dir) });
-        const folderQuestion = needsFolder
-          ? buildFolderQuestion(detectRepos(HOME), { lang: /[぀-ヿ㐀-鿿]/.test(text) ? 'ja' : 'en' })
-          : undefined;
+        const lang = /[぀-ヿ㐀-鿿]/.test(text) ? 'ja' : 'en';
+        const folderQuestion = needsFolder ? buildFolderQuestion(detectRepos(HOME), { lang }) : undefined;
+        // Task 5 (PR運用ヒアリング): once the folder is settled, ask — once per
+        // project, before its first runnable goal — whether this project wants
+        // PRs. Skipped this round if a folder question already claimed the
+        // needsInput slot; that goal gets rebound to a real repo via /answer
+        // and the NEXT goal for that project is what actually asks this.
+        const needsReviewPref = runnable && !needsFolder && needsReviewPreference({ askedBefore: project.reviewPrefAsked });
+        const reviewPrefQuestion = needsReviewPref ? buildReviewPreferenceQuestion({ lang }) : undefined;
+        if (needsReviewPref) { project.reviewPrefAsked = true; saveProjects(); }
         const goalAgent = workerAgent(agent);
         const priorFailureMemory = recentProjectFailureMemory(projectId, text.trim());
         const goal = {
           id: nextId++, projectId, text: text.trim().slice(0, 8000),
-          status: needsFolder ? 'needsInput' : review ? 'review' : pending ? 'pending' : 'planning',
-          question: folderQuestion,
+          status: (needsFolder || needsReviewPref) ? 'needsInput' : review ? 'review' : pending ? 'pending' : 'planning',
+          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),
@@ -2798,7 +2791,7 @@ const server = createServer(async (req, res) => {
         // pending = deliberately shelved (Phase 2 material): never planned,
         // never queued, until POST /api/goals/:id/activate. review-only items
         // are terminal-until-human too, so they also skip planGoal.
-        if (runnable && !needsFolder) {
+        if (runnable && !needsFolder && !needsReviewPref) {
           planGoal(goal).catch((e) => {
             goal.status = 'failed'; goal.prError = String(e).slice(0, 300); saveGoal(goal);
           });
@@ -3125,6 +3118,28 @@ const server = createServer(async (req, res) => {
         saveGoal(goal);
         return json(res, 200, goal);
       }
+      // Review-preference answer (task 5 onboarding funnel): fold into the
+      // project's review definition (defaultWantsPR) rather than goal.text —
+      // like the folder question, this is project setup, not a task detail.
+      if (goal.question?.kind === 'reviewPref') {
+        const project = projects.find((p) => p.id === goal.projectId);
+        const patch = resolveReviewPreferenceAnswer(answer, goal.question);
+        if (project) {
+          const merged = validateReviewDefinition({ ...getReviewDefinition(project.id), ...patch });
+          if (merged.ok) {
+            reviewDefinitions[project.id] = merged.definition;
+            saveReviewDefinitions();
+            send({ ev: 'review-definition', projectId: project.id, reviewDefinition: merged.definition });
+          }
+        }
+        goal.wantsPR = resolveWantsPR(undefined, goal.text, patch.defaultWantsPR);
+        goal.question = null;
+        goal.clarified = true;
+        goal.status = 'planning';
+        saveGoal(goal);
+        planGoal(goal).catch((e) => { goal.status = 'failed'; goal.prError = String(e).slice(0, 300); saveGoal(goal); });
+        return json(res, 200, goal);
+      }
       goal.text = `${goal.text}\n[確認: ${goal.question?.text ?? ''} → ${answer}]`;
       goal.clarified = true; // answered once → planGoal must never re-ask (persisted via saveGoal)
       goal.question = null;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@galda/cli",
-  "version": "0.10.12",
+  "version": "0.10.13",
   "type": "module",
   "description": "Galda - hand off work to your Claude Code, get proof back. Runs on your existing subscription, no extra API cost.",
   "scripts": {