@galda/cli 0.10.94 → 0.10.95

package/engine/server.mjs

@@ -1425,8 +1425,19 @@ function gitStatusPaths(lines = []) {
 function newAttemptId(goal, task) {
   return `goal-${goal?.id ?? 'none'}-task-${task.id}-${Date.now()}-${randomBytes(3).toString('hex')}`;
 }
-function noteGoalTaskBaseline(goal, project, workDir, before) {
-  if (!goal || goal.prBaseline) return;
+// `refresh` re-measures a baseline that already exists. Without it the snapshot
+// is write-once: whatever the shared checkout happened to look like when the
+// goal's FIRST task started is what classifyPrSafety judges forever. So a goal
+// that began while some unrelated file was dirty is permanently unable to
+// produce a PR — "PR creation skipped: this goal started in a dirty shared
+// workspace" re-emits on every close-out even after the workspace was cleaned
+// minutes later, and no amount of asking can fix it. Measured on the operator's
+// instance 2026-07-25..29: goals #729 #733 #731 are all stuck this way.
+// Re-measuring is only correct while there is no PR yet — once a branch exists
+// it is the reference, and moving the baseline under it would compare the work
+// against the wrong starting point.
+function noteGoalTaskBaseline(goal, project, workDir, before, { refresh = false } = {}) {
+  if (!goal || (goal.prBaseline && !refresh)) return;
   const repoRoot = gitSyncOrNull(workDir, ['rev-parse', '--show-toplevel']);
   const branch = repoRoot ? gitSyncOrNull(workDir, ['branch', '--show-current']) : null;
   const head = repoRoot ? gitSyncOrNull(workDir, ['rev-parse', 'HEAD']) : null;
@@ -2731,7 +2742,9 @@ async function runTask(task) {
   task.attemptId = task.attemptId || newAttemptId(goal, task);
   if (goal) {
     goal.latestAttemptId = task.attemptId;
-    noteGoalTaskBaseline(goal, project, workDir, before);
+    // A reply is a fresh attempt: re-measure the workspace so a baseline taken
+    // when the checkout happened to be dirty cannot outlive the mess itself.
+    noteGoalTaskBaseline(goal, project, workDir, before, { refresh: !!task.reply && !goal.pr });
   }
   sendProcessAct(task, `Checked starting git state (${before.length} changed file${before.length === 1 ? '' : 's'} before this task).`);
   // Plan mode makes no edits, so there is nothing to verify — never author a
@@ -3886,7 +3899,15 @@ async function createGoalPR(goal, project, goalTasks, reviewDefinition = DEFAULT
   if (!shouldCreateGoalPR(goal, files)) {
     goal.pr = null;
     goal.prBranch = null;
-    goal.prError = null;
+    // Two different situations used to leave the same silent hole. "No PR was
+    // asked for" is nothing to explain — clear the error. But "a PR WAS asked
+    // for and none exists" is a fact the person needs, and nulling prError here
+    // erased the only field the Review card renders a reason from, so the card
+    // showed a PR-less goal with no explanation at all (goals #725 #751 on the
+    // operator's instance: status done, wantsPR true, pr null, prError empty).
+    goal.prError = goal.wantsPR === true
+      ? 'PRを作成できませんでした: 変更されたファイルが1つもありません（実装が行われていない可能性があります）/ Cannot open a PR: this run produced no file changes.'
+      : null;
     saveGoal(goal);
     goalAct(goal.wantsPR === false
       ? 'Deliverable is No PR, so PR creation is skipped even though files changed.'
@@ -5313,6 +5334,20 @@ const server = createServer(async (req, res) => {
           goal.blocked = null;
           saveGoal(goal);
         }
+        // "PR出して" has to count here too. This is the route EVERY follow-up reply
+        // takes (the review card switches to it once a card is in conversation) and
+        // the one MCP manager_reply uses, so until now a PR asked for on the second
+        // reply — or from an agent session — could never take effect: the deliverable
+        // was only ever upgraded in /dismiss. Measured on the operator's instance
+        // 2026-07-25..29: 「あれ、prいるよね？」then「PR作成して」(#790) and
+        // 「問題ないのでpr出して！」then「あれ、問題ないのでpr作ってください」(#800) —
+        // both asked twice and got no PR either time.
+        // Upgrade only: this can turn the deliverable on, never off, so a later
+        // unrelated reply cannot silently withdraw a PR the person already asked for.
+        if (resolveWantsPR('auto', text, false) && goal.wantsPR !== true) {
+          goal.wantsPR = true;
+          saveGoal(goal);
+        }
         json(res, 200, queueReplyTask(goal, text.trim(), { from: 'you', via: 'thread' }));
       } catch { json(res, 400, { error: 'bad json' }); }
     });
@@ -5391,6 +5426,41 @@ const server = createServer(async (req, res) => {
     return json(res, 200, goal);
   }
 
+  // PR再試行 / Retry PR. The Review card has offered this button all along and it
+  // has never had a route to call — fsRetryPrGoal POSTs here, the server had no
+  // match for it, and the press 404'd and showed an error. So the one repair the
+  // failure message advertises ("commit/stash/revert those unrelated changes,
+  // then rerun") was unreachable from the product: the person cleaned the
+  // workspace and had no way to say "now try again".
+  //
+  // Deliberately narrow — this only re-runs PR creation. It starts no worker and
+  // changes no code, so it is safe to press repeatedly: either the PR appears or
+  // the same honest reason comes back.
+  const retryPrMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/retry-pr$/);
+  if (retryPrMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(retryPrMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    if (goal.pr) return json(res, 409, { error: 'this goal already has a pull request' });
+    const project = projects.find((p) => p.id === goal.projectId);
+    if (!project) return json(res, 404, { error: 'project not found' });
+    // Asking to retry the PR IS asking for a PR — a goal that was created as
+    // No PR but whose owner now presses this wants one.
+    goal.wantsPR = true;
+    // The frozen dirty-workspace verdict is exactly what this button exists to
+    // clear. Re-measure against the workspace as it is NOW, which is the state
+    // the person just repaired.
+    const wdir = (goalWorkDirs.get(goal.id) && existsSync(goalWorkDirs.get(goal.id))) ? goalWorkDirs.get(goal.id) : project.dir;
+    goal.prBaseline = null;
+    goal.prSafety = null;
+    goal.prError = null;
+    noteGoalTaskBaseline(goal, project, wdir, await gitChanges(wdir));
+    const siblings = tasks.filter((t) => t.goalId === goal.id);
+    await createGoalPR(goal, { ...project, dir: wdir }, siblings, getReviewDefinition(goal.projectId), null);
+    saveGoal(goal);
+    return json(res, 200, { goal, pr: goal.pr ?? null, prError: goal.prError ?? null });
+  }
+
   // Archive: retire an UNFINISHED goal (partial/failed/interrupted/blocked)
   // cleanly — spawning no rework. DELETE only accepts stacked/pending, and
   // dismiss on a partial goal queues a "差し戻し" rework task, so a goal that
@@ -5678,7 +5748,12 @@ async function answerGoalQuestion(goal, question) {
       // Manager close-out below owns commit/push/PR creation. Keep this
       // monotonic: an explicit later PR request upgrades a No-PR/auto goal,
       // while ordinary feedback never silently downgrades an existing PR goal.
-      if (result.spawnsWorker && resolveWantsPR('auto', text, false)) goal.wantsPR = true;
+      // Not gated on spawnsWorker: what the person wants DELIVERED is independent
+      // of where their words were routed. A PR asked for while parking the goal
+      // (rescope) or while asking a question (answer) is still a PR they asked
+      // for, and it must survive until close-out rather than being dropped
+      // because this particular reply happened not to wake a worker.
+      if (resolveWantsPR('auto', text, false)) goal.wantsPR = true;
       goal.status = result.status;
       saveGoal(goal);
       // rescope はワーカーを起こさない——「いったん止めて考え直す」なので、走り出したら

package/package.json

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