@galda/cli 0.10.36 → 0.10.38

package/engine/lib.mjs

@@ -877,6 +877,42 @@ export function buildGoalPrBody({ lang, goal, goalTasks, files, owner, branch, p
   ].join('\n');
 }
 
+// summarizeForReview's prompt + reply parser, kept pure/here so engine/test can
+// assert (a) the JSON asks for a work-title, (b) the title guidance names
+// 修正/追加/改善/調査 so an "追加したい" request never becomes "…の修正", and (c) a
+// failed/missing reply falls back to goal.text (no regression) — all without an
+// LLM call. The app's saReviewTitle reads reviewSummary.title first (PR-B).
+export function buildReviewSummaryPrompt({ lang, goalText, changed, reports }) {
+  return [
+    `あるゴールの実装が完了しました。レビューする人が一目で判断できるよう、やさしい${lang === 'ja' ? '日本語' : lang}で書いてください。`,
+    '専門用語・長い説明は禁止。小学生でも分かる短い言い方。JSONのみ出力（前後に文章を書かない）:',
+    '{"title":"依頼を短い作業タイトルに言い換え(体言止め可)","check":"何を確認すれば良いか(1行)","changed":"何を変えたか(1行)"}',
+    'titleは依頼文の意図を取り違えないこと。修正/追加/改善/調査を区別する。'
+      + '例:「Xの不具合」→「Xの修正」/「Yを追加したい」→「Yの追加」/「Zを速くしたい」→「Zの改善」/「なぜWか調べて」→「Wの調査」。',
+    '',
+    `ゴール: ${(goalText ?? '').slice(0, 300)}`,
+    `変更ファイル: ${(changed ?? []).join(', ') || '(なし)'}`,
+    `ワーカー報告:\n${(reports ?? '').slice(0, 1500)}`,
+  ].join('\n');
+}
+
+// Parse the model's JSON into {title, check, changed}, per-field fallback when a
+// key is missing/blank. `fallback` carries the text-derived defaults
+// (title/changed = goal.text) so a goal whose summary call failed still shows
+// its own request text. Never throws — a broken/absent JSON yields the fallback.
+export function parseReviewSummary(raw, fallback = {}) {
+  const clean = (v, n) => String(v ?? '').replace(/\s+/g, ' ').slice(0, n);
+  const m = String(raw ?? '').match(/\{[\s\S]*\}/);
+  if (!m) return { ...fallback };
+  let o;
+  try { o = JSON.parse(m[0]); } catch { return { ...fallback }; }
+  return {
+    title: clean(o.title, 60) || fallback.title,
+    check: clean(o.check, 120),
+    changed: clean(o.changed, 120) || fallback.changed,
+  };
+}
+
 // A finished task's changed files look like a UI edit: app/ (the Manager's
 // own UI dir, or an equivalent frontend root) plus common frontend source
 // extensions. Pure/deterministic — no LLM — so it can gate proof capture
@@ -1139,6 +1175,7 @@ export function goalGroupStatus(goalStatus, startedAt) {
   if (goalStatus === 'folded') return 'review'; // PRD §6.5: rendered inside the Review section, not Done
   if (goalStatus === 'blocked') return 'attn'; // §4E: blocked is Attention, not Done
   if (goalStatus === 'needsInput') return 'todo'; // smart intake: awaiting an answer
+  if (goalStatus === 'rejected') return 'rejected'; // 07-20c: Reject を溜める独立欄（Done ではない）
   return 'done'; // includes 'reverted' (terminal)
 }
 
@@ -1495,6 +1532,8 @@ export function isNothingVerifiable({ changedFiles = [], hasPassCondition = fals
 // 人がアプリ側から閉じる経路。
 export function advanceReviewGoal(goal) {
   if (goal.status !== 'review') return { ok: false, error: 'goal is not in review' };
+  // 07-20c: PR ありゴールは Approve だけで done にしない（merge=採用が唯一の完了トリガー）。
+  if (goal && goal.pr) return { ok: true, needsMerge: true, status: 'review' };
   return { ok: true, status: 'done' };
 }
 
@@ -1508,20 +1547,39 @@ export function revertReviewGoal(goal) {
 // レビュー詳細パネル(task 70)のApprove/Dismissボタンの判定。advanceReviewGoal(task 62,
 // チェックリスト全件Approveの自動進行)とは別に、人間がレビュー画面から単発で下す判断
 // を扱う——PRの有無を問わず、レビュー中のgoalだけが対象。
-// Approveはそのままdoneへ。goalGroupStatus/goalChipのdone分岐(review以外は全部doneと
-// 読む)と揃えているので、doneに寄せて問題ない。
-export function approveGoal({ goalStatus }) {
+// Approve は PR の有無で分岐する（07-20c）。PR 無しは従来どおり即 done。PR ありは
+// Approve だけで done にせず needsMerge を返す——呼び出し側が「PR をマージして完了」
+// ダイアログを出して PR へ飛ばし、マージ後に syncGoalMerges が review→done を自動確定
+// する。これで「アプリで Approve 済みだが PR は開いたまま」のゾンビを構造的に消す
+// （merge=採用は人の操作、の鉄則を守る）。
+export function approveGoal({ goalStatus, hasPr = false }) {
   if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
+  if (hasPr) return { ok: true, needsMerge: true, status: 'review' };
   return { ok: true, status: 'done' };
 }
 
-// Dismiss(差し戻し)は 'running' に戻す——goalGroupStatus/goalChipは 'running' を
-// startedAt済みなら'doing'バケットに読むので、これでレビュー中断→作業中の表示に戻る。
+// Dismiss(差し戻し)は 'running' に戻す——チャット(/reply や /dismiss にテキスト)での
+// 「作り直し」依頼の受け皿。goalGroupStatus は startedAt 済みなら 'doing' に読む。
 export function dismissGoal({ goalStatus }) {
   if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
   return { ok: true, status: 'running' };
 }
 
+// Reject（07-20c・Dismiss とは別物）は自動再作業をせず、Rejected 欄に溜める 'rejected'
+// へ park する。作り直しはチャット（/reply）で依頼する。Rejected からは reopenGoal で
+// review へ戻せ、Delete（=revert）で PR ごと破棄できる。/dismiss（rework）とは別の
+// /reject エンドポイントが担うので、既存のチャット rework 契約を壊さない。
+export function rejectGoal({ goalStatus }) {
+  if (goalStatus !== 'review') return { ok: false, error: 'goal is not in review' };
+  return { ok: true, status: 'rejected' };
+}
+
+// Rejected 欄の『Reopen』——rejected を review に戻す（rejectGoal の逆操作）。
+export function reopenGoal({ goalStatus }) {
+  if (goalStatus !== 'rejected') return { ok: false, error: 'goal is not rejected' };
+  return { ok: true, status: 'review' };
+}
+
 // ---- MODE (Auto / Plan) ----------------------------------------------------
 // A goal runs in one of two modes. 'auto' = the default implement→verify→review
 // flow (worker edits files with acceptEdits). 'plan' = the worker runs under
@@ -2461,6 +2519,8 @@ export function goalLogLine(goal, prevGoal) {
   const label = String(goal?.plan?.[0] ?? goal?.text ?? '').replace(/\s+/g, ' ').trim().slice(0, 60);
   if (!prevGoal) return goal?.status === 'pending' ? `Goal shelved to Pending: "${label}"` : null;
   if (prevGoal.status === 'review' && goal.status === 'done') return `Approved: "${label}"`;
+  if (prevGoal.status === 'review' && goal.status === 'rejected') return `Rejected: "${label}"`;
+  if (prevGoal.status === 'rejected' && goal.status === 'review') return `Reopened: "${label}"`;
   if (prevGoal.status === 'review' && goal.status === 'running') return `Dismissed: "${label}" — back to work`;
   if (prevGoal.status !== 'running' && goal.status === 'running' && Array.isArray(goal.plan) && goal.plan.length) {
     return `Goal decomposed into ${goal.plan.length} task(s) → To do: "${label}"`;
@@ -2564,8 +2624,10 @@ export function computeRetestOutcome(results = [], total = 3) {
 // terminal 'reverted' status (distinct from 'skipped'/archived). Decision only —
 // the destructive gh/git calls live behind the server's small wrapper.
 export function revertGoal({ goalStatus }) {
-  if (!['review', 'done', 'blocked', 'partial'].includes(goalStatus)) {
-    return { ok: false, error: 'only a finished (review/done/blocked/partial) goal can be reverted' };
+  // 07-20c: 'rejected' も対象に含める——Rejected 欄の Delete は revert 経由で PR を閉じ
+  // worktree を落とす（PR を残したまま消すと孤児 PR ＝別のゾンビになるため）。
+  if (!['review', 'done', 'blocked', 'partial', 'rejected'].includes(goalStatus)) {
+    return { ok: false, error: 'only a finished (review/done/blocked/partial/rejected) goal can be reverted' };
   }
   return { ok: true, status: 'reverted' };
 }
@@ -2903,8 +2965,11 @@ export function nextResumeDelay(attempt, { baseMs = 5 * 60 * 1000, maxMs = 60 *
 // tested — sharing a module across that boundary would couple two things
 // that fail and deploy on different schedules. Keep the two copies in sync by
 // hand; both have their own test coverage against the same free-tier numbers.
+// maxPendingGoals (the 5 concurrent "queued to-do" cap) was REMOVED 2026-07-20
+// (Masa): the free tier no longer caps how many to-dos run at once, and the UI
+// drops the "x / 5" counter. The lifetime (20) and project (1) caps remain the
+// monetization wall.
 export const FREE_TIER_LIMITS = Object.freeze({
-  maxPendingGoals: 5,
   maxCumulativeGoals: 20,
   maxProjects: 1,
 });
@@ -2921,12 +2986,10 @@ export const QUEUED_GOAL_STATUSES = Object.freeze([
 ]);
 
 export function checkFreeTierLimit(usage) {
-  const pendingCount = Number(usage?.pendingCount) || 0;
   const cumulativeCount = Number(usage?.cumulativeCount) || 0;
   const projectCount = Number(usage?.projectCount) || 0;
-  if (pendingCount > FREE_TIER_LIMITS.maxPendingGoals) {
-    return { blocked: true, reason: 'pending-goal-limit', limit: FREE_TIER_LIMITS.maxPendingGoals, value: pendingCount };
-  }
+  // Concurrent "pending" to-dos are no longer capped (Masa 2026-07-20) — only
+  // the lifetime total and the project count gate the free tier.
   if (cumulativeCount > FREE_TIER_LIMITS.maxCumulativeGoals) {
     return { blocked: true, reason: 'cumulative-goal-limit', limit: FREE_TIER_LIMITS.maxCumulativeGoals, value: cumulativeCount };
   }
@@ -3509,3 +3572,15 @@ export function parseClaimResponse(obj) {
   if (obj.token) return { state: 'ready', token: String(obj.token), email: obj.email != null ? String(obj.email) : undefined };
   return { state: 'pending' };
 }
+
+// --- connection status line (queue tray) -------------------------------------
+// Pure source of truth for the offline/reconnecting line that renders as the top
+// row of the queued tray above the composer. app/index.html is a browser static
+// file that can't import this module, so it MIRRORS these two tiny functions
+// inline (see renderQueue()); keep the logic identical on both sides.
+export function connectionBannerState({ online }) {
+  return online ? { kind: 'ok' } : { kind: 'offline', reconnect: true };
+}
+export function unsentMetaLabel({ online }) {
+  return online ? 'Unsent — tap to resend' : 'Waiting for connection';
+}

package/engine/server.mjs

@@ -21,7 +21,7 @@ import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
 import { pathToFileURL } from 'node:url';
 import { needsProjectFolder, folderLabel, buildFolderQuestion, resolveFolderAnswer, classifyFolderTarget, buildFolderInitConfirm, isFolderInitConfirmed, needsReviewPreference, buildReviewPreferenceQuestion, resolveReviewPreferenceAnswer, routeQuestionAnswer, notUnderstoodNote, parseRelocalizedQuestion, classifyAuthProbe, authBannerText, makeSigninChallenge, parseClaimResponse } from './lib.mjs';
-import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, workerResultText, taskCountsAsComplete, resolveWantsPR, resolveGoalSource, buildGoalSummary, buildGoalProofMd, buildGoalPrBody, 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, pickFoldTarget, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyVerifyGate, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot } from './lib.mjs';
+import { parseStreamEvents, parsePlan, refinePlanTasks, findOverlappingGoal, canEditGoal, canDeleteGoal, shouldAskClarification, workerExitReason, isForcedStop, 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, buildEphemeralSeedLog, buildEphemeralSeedProjects, trimTaskActivityForState, buildAskContext, WORKER_TOOLS, verifyCfAccessJwt, resolveIdentity, goalVisibleTo, clampParallelLimit, canStartMore, nextRunnableTasks, goalsConflict, detectConflicts, pickFoldTarget, isUiChange, shouldCaptureProof, shouldCaptureBaseline, hasTestRelevantChanges, parseFailingTestNames, classifyTestGate, classifyVerifyGate, buildExecutionPlan, buildContextHandoffSummary, buildFailurePostmortem, appendFailureMemory, latestFailurePolicy, classifyChangeRisk, checkRunBudget, usageBudgetTokens, isRateLimited, nextResumeDelay, checkFreeTierLimit, resolveEntitlement, resolveCachedEntitlement, FREE_TIER_LIMITS, QUEUED_GOAL_STATUSES, verifyLicenseToken, shouldEmitSetupCompleted, pickAnalyticsUid, shouldEmitFreeExhausted, detectRequestLanguage, isNothingVerifiable, classifyComposerIntentHeuristic, detectPauseIntent, buildIntentPrompt, parseIntentResponse, buildBoardSnapshot, validateBoardSnapshot, boardIsEmpty, decideBoardPull, resolveConnectedAgents, pickAvailableAgent, pickUtilityAgent, utilityModel, liveTakeoverDecision, shouldOpenBrowserOnBoot } from './lib.mjs';
 import { openPR } from './pr.mjs';
 import { runVerification, exerciseUi } from './verify.mjs';
 
@@ -2604,21 +2604,19 @@ async function summarizeForReview(goal, siblings, dir, reviewDefinition) {
   const lang = reviewDefinition.language === 'auto' ? detectRequestLanguage(goal.text) : (reviewDefinition.language || 'ja');
   const changed = [...new Set(siblings.flatMap((t) => t.changedFiles ?? []))].slice(0, 20);
   const reports = siblings.filter((t) => !t.reply).map((t) => `- ${t.title}: ${(t.result ?? '').replace(/\s+/g, ' ').slice(0, 300)}`).join('\n');
-  const fallback = { check: '', changed: (goal.plan?.[0] ?? goal.text ?? '').replace(/\s+/g, ' ').slice(0, 80) };
+  // fallback = current behavior: title/changed derived from the goal's own text,
+  // so a goal with no summary (AI failed or nothing to summarize) still shows a
+  // meaningful title/changed and never a blank or mis-phrased "…の修正".
+  const fallback = {
+    title: (goal.text ?? '').replace(/\s+/g, ' ').slice(0, 60),
+    check: '',
+    changed: (goal.plan?.[0] ?? goal.text ?? '').replace(/\s+/g, ' ').slice(0, 80),
+  };
   if (!changed.length && !reports) return fallback;
-  const prompt = [
-    `あるゴールの実装が完了しました。レビューする人が一目で判断できるよう、やさしい${lang === 'ja' ? '日本語' : lang}で2行だけ書いてください。`,
-    '専門用語・長い説明は禁止。小学生でも分かる短い言い方。JSONのみ出力（前後に文章を書かない）:',
-    '{"check":"何を確認すれば良いか(1行)","changed":"何を変えたか(1行)"}',
-    '',
-    `ゴール: ${(goal.text ?? '').slice(0, 300)}`,
-    `変更ファイル: ${changed.join(', ') || '(なし)'}`,
-    `ワーカー報告:\n${reports.slice(0, 1500)}`,
-  ].join('\n');
+  const prompt = buildReviewSummaryPrompt({ lang, goalText: goal.text, changed, reports });
   try {
     const r = await runUtility({ prompt, cwd: dir, tools: 'Read' });
-    const m = r.result.match(/\{[\s\S]*\}/);
-    if (m) { const o = JSON.parse(m[0]); return { check: String(o.check ?? '').replace(/\s+/g, ' ').slice(0, 120), changed: String(o.changed ?? '').replace(/\s+/g, ' ').slice(0, 120) || fallback.changed }; }
+    return parseReviewSummary(r.result, fallback);
   } catch { /* fall through */ }
   return fallback;
 }
@@ -3177,8 +3175,8 @@ const server = createServer(async (req, res) => {
       email: licenseState.email,
       isPaying: Boolean(licenseState.isPaying),
       plan: licenseState.isPaying ? 'paid' : 'free',
-      usage: { pending: freeUsage.pendingCount, cumulative: freeUsage.cumulativeCount },
-      limits: { pending: FREE_TIER_LIMITS.maxPendingGoals, cumulative: FREE_TIER_LIMITS.maxCumulativeGoals },
+      usage: { cumulative: freeUsage.cumulativeCount },
+      limits: { cumulative: FREE_TIER_LIMITS.maxCumulativeGoals },
       price: await getBillingPrice(),
       siteUrl: BILLING_API_URL || null,
     };
@@ -3786,6 +3784,9 @@ const server = createServer(async (req, res) => {
     if (!requireGoalOwnership(req, res, goal)) return;
     const result = advanceReviewGoal(goal);
     if (!result.ok) return json(res, 409, { error: result.error });
+    // 07-20c: PR ありは done にせず「PR をマージして完了」を促す。status は review の
+    // まま。マージ後に syncGoalMerges が done を確定する。
+    if (result.needsMerge) return json(res, 200, { goal, needsMerge: true, pr: goal.pr });
     goal.status = result.status;
     saveGoal(goal);
     return json(res, 200, goal);
@@ -4047,8 +4048,12 @@ const server = createServer(async (req, res) => {
       pump(goal.projectId);
       return json(res, 200, goal);
     }
-    const result = approveGoal({ goalStatus: goal.status });
+    const result = approveGoal({ goalStatus: goal.status, hasPr: !!goal.pr });
     if (!result.ok) return json(res, 409, { error: result.error });
+    // 07-20c: PR ありは Approve だけで done にしない。status は review のまま返し、
+    // クライアントは「PR をマージして完了してください」ダイアログ＋ Open PR を出す。
+    // マージされたら syncGoalMerges が review→done を自動確定する。
+    if (result.needsMerge) return json(res, 200, { goal, needsMerge: true, pr: goal.pr });
     goal.status = result.status;
     saveGoal(goal);
     return json(res, 200, goal);
@@ -4228,6 +4233,46 @@ const server = createServer(async (req, res) => {
     return;
   }
 
+  // 07-20c: Reject — park a review goal in the Rejected column. No auto-rework
+  // (rework is asked for via chat /reply or /dismiss). Kept as a SEPARATE
+  // endpoint from /dismiss so the existing chat-rework contract is untouched.
+  // An optional text is kept as a rejection note; no worker is spawned.
+  const rejectMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/reject$/);
+  if (rejectMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(rejectMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    const result = rejectGoal({ goalStatus: goal.status });
+    if (!result.ok) return json(res, 409, { error: result.error });
+    let body = '';
+    req.on('data', (d) => { body += d; });
+    req.on('end', () => {
+      let text = '';
+      try { text = String(JSON.parse(body || '{}').text ?? '').trim(); } catch {}
+      goal.status = result.status;
+      if (text) goal.rejectNote = text;
+      goal.rejectedAt = new Date().toISOString();
+      saveGoal(goal);
+      json(res, 200, { goal });
+    });
+    return;
+  }
+
+  // 07-20c: Rejected 欄の『Reopen』——rejected を review へ戻す（Reject の取り消し）。
+  // Delete（破棄）は既存の /revert（PR を閉じ worktree を落とす）を使う。
+  const reopenMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/reopen$/);
+  if (reopenMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(reopenMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    const result = reopenGoal({ goalStatus: goal.status });
+    if (!result.ok) return json(res, 409, { error: result.error });
+    goal.status = result.status;
+    goal.rejectNote = null; goal.rejectedAt = null;
+    saveGoal(goal);
+    return json(res, 200, goal);
+  }
+
   // image attachments: upload (base64 JSON) + serve back for thumbnails
   if (url.pathname === '/api/upload' && req.method === 'POST') {
     let body = '';

package/package.json

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