@galda/cli 0.10.11 → 0.10.13

package/app/index.html

@@ -5814,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);
 }
 

package/engine/relay-client.mjs

@@ -100,8 +100,19 @@ function connect(retryMs = 1000) {
       live.delete(m.id);
     }
   };
-  ws.onclose = () => {
+  ws.onclose = (ev) => {
     if (ws !== currentWs) return; // a superseded socket (we already moved on) — don't reconnect
+    // Close 4000 = the relay evicted us because a NEWER agent for the SAME account
+    // connected (server.mjs "replaced by a newer connection"). If we reconnect we
+    // evict THAT one → the two instances mutual-kick forever, which surfaces to the
+    // user as app.galda.app reload-looping. Stand down: the newest instance is
+    // authoritative. (A normal network drop uses a different code and still
+    // reconnects; sign-in via the watcher below can still retake.)
+    if (ev && ev.code === 4000) {
+      console.log('[agent] relay: superseded by a newer instance of this account — standing down (run only one manager per account)');
+      currentWs = null;
+      return;
+    }
     console.log(`[agent] relay connection lost — retrying in ${retryMs}ms`);
     scheduleReconnect(retryMs);
   };

package/engine/server.mjs

@@ -20,8 +20,8 @@ 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 } : {}),
     });
@@ -2750,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),
@@ -2788,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);
           });
@@ -3115,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

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