@galda/cli 0.10.111 → 0.10.112

package/app/index.html

@@ -6431,6 +6431,38 @@ function prefersJapaneseText(...values){
   return values.some((v) => /[\u3040-\u30ff\u3400-\u9fff]/.test(String(v || '')));
 }
 function summarizeAttention(goal, tasks){
+  // A pending question / approval request is the one case where we already HAVE the
+  // worker's own words (engine writes goal.question = {kind,text,options} and
+  // goal.approvalRequest). Show them verbatim. The board's question card already does
+  // this (.qq at the question-card render), and the two paths must not disagree about
+  // the same field — the template built below by pattern-matching the log is a last
+  // resort for goals that stopped without asking anything (PRD §0.1.1-5).
+  if (goal.status === 'needsInput' && goal.question?.text) {
+    const opts = (goal.question.options || []).map((o) => String(o).trim()).filter(Boolean);
+    const jq = prefersJapaneseText(goal.question.text, goal.text);
+    return {
+      label: jq ? '質問' : 'Question',
+      happened: String(goal.question.text).trim(),
+      decision: opts.length
+        ? (jq ? `次のどれかで答えてください: ${opts.join(' / ')}` : `Answer with one of: ${opts.join(' / ')}`)
+        : (jq ? '下の入力欄に答えを書いて送ってください。' : 'Type your answer in the box below and send it.'),
+    };
+  }
+  if (goal.status === 'needsApproval') {
+    const a = goal.approvalRequest || {};
+    const ask = String(a.question || a.action || '').trim();
+    if (ask) {
+      const scope = (a.scope || []).map((s) => String(s).trim()).filter(Boolean);
+      const jq = prefersJapaneseText(ask, goal.text);
+      return {
+        label: jq ? '許可の依頼' : 'Approval requested',
+        happened: scope.length ? `${ask}\n\n${jq ? '対象' : 'Scope'}: ${scope.join(' · ')}` : ask,
+        decision: jq
+          ? 'Proceed で許可、Cancel で断ります。範囲を変えたい場合は Edit scope。'
+          : 'Proceed to allow it, Cancel to refuse. Use Edit scope to narrow what it may touch.',
+      };
+    }
+  }
   const fm = goal.failureMemory?.[goal.failureMemory.length - 1];
   if (fm?.whatHappened || fm?.yourCall) {
     return {
@@ -6483,14 +6515,14 @@ function summarizeAttention(goal, tasks){
   }
   return { happened: happened.replace(/\.+$/, '.'), decision };
 }
-function renderGoalBrief({ goal, tasks, isReview, isAttention }){
+function renderGoalBrief({ goal, tasks, isReview, isAttention, isAsking }){
   const brief = $('gdBrief');
-  if (!isReview && !isAttention) { brief.classList.remove('show'); brief.innerHTML = ''; return; }
+  if (!isReview && !isAttention && !isAsking) { brief.classList.remove('show'); brief.innerHTML = ''; return; }
   let rows;
-  if (isAttention) {
+  if (isAttention || isAsking) {
     const s = summarizeAttention(goal, tasks);
     rows = [
-      ['What happened', s.happened],
+      [s.label || 'What happened', s.happened],
       ['Your call', s.decision],
     ];
   } else {
@@ -6513,9 +6545,17 @@ function renderGoalDetail(){
   const isReview = goal.status === 'review';
   const isAttention = ['blocked', 'partial', 'failed', 'interrupted'].includes(goal.status)
     || tasks.some((t) => ['failed', 'interrupted'].includes(t.status));
-  $('gdTitle').textContent = isReview ? 'Review' : 'Attention';
+  // A goal waiting on an answer/approval is not "stuck" — it is asking. It used to
+  // fall through both flags, so the brief was hidden entirely and the panel showed the
+  // original request with no sign of what the worker actually asked (Masa 2026-07-30).
+  // Kept separate from isAttention so the Discard button's condition does not change.
+  const isAsking = ['needsInput', 'needsApproval'].includes(goal.status);
+  $('gdTitle').textContent = isReview ? 'Review'
+    : goal.status === 'needsInput' ? 'Question'
+    : goal.status === 'needsApproval' ? 'Approval'
+    : 'Attention';
   $('gdRequirement').textContent = goal.text ?? '';
-  renderGoalBrief({ goal, tasks, isReview, isAttention });
+  renderGoalBrief({ goal, tasks, isReview, isAttention, isAsking });
   // review-only items carry no worker tasks — show the author's note (or a
   // plain hint) instead of "No worker reports yet.", and any attached images
   // as the thing to look at.
@@ -6544,10 +6584,22 @@ function renderGoalDetail(){
   $('gdLog').innerHTML = logLines.length
     ? `<div class="gdlog">${logLines.map((s) => `<div class="gdlogline">${esc(s)}</div>`).join('')}</div>`
     : '<div class="gdempty">No log captured yet.</div>';
+  // A goal that is only ASKING has not produced anything yet, so "No worker reports
+  // yet." / "No proof available yet." / "No log captured yet." are three empty boxes
+  // that push the actual question down and out (Masa 2026-07-30: "高さが少なくてみづらい").
+  // §0.1.1-5: do not show the container for something that does not exist. Scoped to the
+  // asking states so Review — where "no proof" is itself a finding — is unchanged.
+  const hideIfEmpty = isAsking && !tasks.length;
+  for (const [id, empty] of [['gdWhatWasDone', !tasks.length && !goal.note], ['gdProof', !proofTasks.length && !reviewImgs.length], ['gdLog', !logLines.length]]) {
+    const sec = $(id).closest('.gdsec');
+    if (sec) sec.style.display = hideIfEmpty && empty ? 'none' : '';
+  }
   $('gdApprove').style.display = isReview ? '' : 'none';
   $('gdDismiss').style.display = isReview ? '' : 'none';
   $('gdDiscard').style.display = isAttention ? '' : 'none';
-  $('gdRevisionInput').placeholder = isReview ? 'Write revision instructions…' : 'Tell the worker what to try next…';
+  $('gdRevisionInput').placeholder = isReview ? 'Write revision instructions…'
+    : goal.status === 'needsInput' ? 'Answer the question…'
+    : 'Tell the worker what to try next…';
   $('gdSend').title = isReview ? 'Send back' : 'Send';
 }
 $('gdClose').onclick = closeGoalDetail;
@@ -9559,7 +9611,12 @@ function closeSummaryPera(){ $('summaryOverlay').classList.remove('show'); }
 // 4 archived / 5 reverted — session-local; the server round-trip is what
 // settles it (see saSync's "returned to review" reset).
 // ============================================================================
-const SA = { open: false, items: [], diffs: {}, actLog: {}, msgs: {}, msgCounts: {}, convOpen: new Set(), shotBox: {}, detOpen: new Set(), diffOpen: new Set(), attachments: {}, focusGid: null, focusScrolled: false, focusTimer: null, cur: null, solo: null, lastMarkup: null };
+// `draft` holds the half-typed reply per goal. It exists because the text used to live
+// ONLY in the DOM, so the sole way to keep it was for saSync() to refuse to run at all
+// while the box had text — which froze the To Do / Doing / Review status updates behind
+// the dialog too. With the text in SA it survives a rebuild on its own, and saSync no
+// longer has to stop (2026-07-30).
+const SA = { open: false, items: [], diffs: {}, actLog: {}, msgs: {}, msgCounts: {}, convOpen: new Set(), shotBox: {}, detOpen: new Set(), diffOpen: new Set(), attachments: {}, draft: {}, focusGid: null, focusScrolled: false, focusTimer: null, cur: null, solo: null, lastMarkup: null };
 // Same convention as the existing ?dev=1 devbar flag — off unless someone opts in by URL.
 const SA_DEV = new URLSearchParams(location.search).get('dev') === '1';
 // task-971: 白黒(モノクロ)版のレールを ?railmono=1 で見比べられるようにする。
@@ -9837,7 +9894,10 @@ function saLedgerRows(){
     // (summarizeAttention), mapped into the review card instead of a bespoke "What happened /
     // Your call" layout (Masa 2026-07-24). The Request section already shows the ask, so drop
     // the summary's "必要だったこと:/Needed:" lead to avoid repeating it.
-    if (['blocked', 'partial', 'failed', 'interrupted'].includes(g.status)) {
+    // needsInput/needsApproval are included so this path shows the worker's verbatim
+    // question too — summarizeAttention returns it as-is for those. Both renders of the
+    // same goal.question must say the same thing (PRD §0.1.1-5).
+    if (['blocked', 'partial', 'failed', 'interrupted', 'needsInput', 'needsApproval'].includes(g.status)) {
       const s = summarizeAttention(g, ts.filter((t) => t.goalId === g.id));
       const why = String(s.happened || '').replace(/^\s*(必要だったこと:|Needed:)[^。.]*[。.]\s*/, '').trim();
       const merged = [why, s.decision].filter(Boolean).join('\n\n');
@@ -10547,7 +10607,7 @@ function saItemHtml(it, i){
     ${conversationSec}
     ${activitySec}
     ${S('Workflow', saWorkflowHtml(it))}
-    <div class="sa-act">${attn ? '' : `<div class="sa-approve-wrap"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button>${delivery}</div><button class="sa-dis" data-saact="dis:${i}">Dismiss</button>`}<div class="sa-replybox"><div class="sa-replyattach${SA.attachments[it.goalId]?.length ? ' has' : ''}" data-saattach="${it.goalId}">${saReplyAttachmentsHtml(it.goalId)}</div><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" data-goal="${it.goalId}" placeholder="Reply, ask, or paste an image…"><button class="sa-send" data-saact="send:${i}" title="Send"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
+    <div class="sa-act">${attn ? '' : `<div class="sa-approve-wrap"><button class="sa-app" data-saact="app:${i}">${SA_SVG.ok}Approve</button>${delivery}</div><button class="sa-dis" data-saact="dis:${i}">Dismiss</button>`}<div class="sa-replybox"><div class="sa-replyattach${SA.attachments[it.goalId]?.length ? ' has' : ''}" data-saattach="${it.goalId}">${saReplyAttachmentsHtml(it.goalId)}</div><div class="sa-chatwrap"><input class="sa-chat" data-i="${i}" data-goal="${it.goalId}" placeholder="Reply, ask, or paste an image…" value="${esc(SA.draft[it.goalId] ?? '')}"><button class="sa-send" data-saact="send:${i}" title="Send"><svg viewBox="0 0 24 24"><path d="M12 19V5M5 12l7-7 7 7"/></svg></button></div></div><button class="sa-ic" title="Archive" data-saact="arch:${i}">${SA_SVG.arch}</button><button class="sa-ic" title="Revert" data-saact="rev:${i}">${SA_SVG.trash}</button></div>
   </div>`;
 }
 // Scroll the See-all body so a card's top edge (.rhead) sits at the top of the visible
@@ -10695,9 +10755,12 @@ function saRender(){
     }) || cards.find((el) => el.getBoundingClientRect().bottom > bodyRect.top);
     if (anchor) { anchorGid = anchor.dataset.gid; anchorOffset = anchor.getBoundingClientRect().top - bodyRect.top; }
   }
-  const focusedReplyGoal = document.activeElement?.matches?.('#seeall .sa-chat')
-    ? document.activeElement.dataset.goal
-    : null;
+  // Remember WHERE the caret was too, not just which box had focus: the text now comes
+  // back from SA.draft, and putting it back without the caret would jump the cursor to
+  // the end mid-word on every SSE tick.
+  const activeChat = document.activeElement?.matches?.('#seeall .sa-chat') ? document.activeElement : null;
+  const focusedReplyGoal = activeChat?.dataset.goal ?? null;
+  const focusedCaret = activeChat ? { start: activeChat.selectionStart, end: activeChat.selectionEnd } : null;
   const pending = SA.items.filter((x) => x.st === 0);
   const green = pending.filter((x) => !x.testResult || x.testResult.ok !== false).length;
   // Solo mode = a single "Needs you" goal opened as this card. It is not a review batch, so the
@@ -10828,10 +10891,24 @@ function saRender(){
       if (!SA.focusTimer) SA.focusTimer = setTimeout(() => { SA.focusGid = null; SA.focusTimer = null; }, 1400);
     });
   }
-  // A relevant status change may legitimately rebuild the card. Restore the
-  // empty reply box's focus afterwards; non-empty input is protected earlier
-  // by saSync and is never rebuilt at all.
-  if (focusedReplyGoal != null) S.querySelector(`.sa-chat[data-goal="${focusedReplyGoal}"]`)?.focus({ preventScroll: true });
+  // Every reply box carries its draft back from SA.draft via the value attribute, so a
+  // rebuild no longer loses what was typed. Keep SA.draft current as the person types —
+  // this is what lets saSync() run during typing instead of freezing.
+  for (const inp of S.querySelectorAll('.sa-chat[data-goal]')) {
+    inp.addEventListener('input', () => {
+      const gid = inp.dataset.goal;
+      if (inp.value) SA.draft[gid] = inp.value; else delete SA.draft[gid];
+    });
+  }
+  // A relevant status change may legitimately rebuild the card. Put focus AND the caret
+  // back where they were.
+  if (focusedReplyGoal != null) {
+    const inp = S.querySelector(`.sa-chat[data-goal="${focusedReplyGoal}"]`);
+    if (inp) {
+      inp.focus({ preventScroll: true });
+      if (focusedCaret) { try { inp.setSelectionRange(focusedCaret.start, focusedCaret.end); } catch { /* not selectable */ } }
+    }
+  }
 }
 // keep the open Ledger in sync with server state (SSE/refresh → render() → here).
 // An item whose goal has RETURNED to 'review' (retest ×3 green, rework done,
@@ -10839,10 +10916,11 @@ function saRender(){
 // blocks the rebuild (same "vanishes mid-type" guard as renderFsLane).
 function saSync(){
   if (!SA.open) return;
-  const ae = document.activeElement;
-  // Do not erase text while the reviewer is typing. Once Send clears the box,
-  // focus alone must not freeze To Do / Doing / Review status updates.
-  if (ae && $('seeall').contains(ae) && ae.tagName === 'INPUT' && ae.value) return;
+  // No typing guard here any more. It used to `return` whenever the focused input had
+  // text, which protected the draft by freezing EVERYTHING — status changes behind the
+  // dialog included, so a card could sit on "Working on it" for as long as someone was
+  // composing a reply. The draft now lives in SA.draft and is restored with its caret by
+  // saRender, so the sync is free to run (2026-07-30).
   // Working cards are intentionally absent from the Review ledger rows after the
   // server moves them to To Do / Doing. Keep their held dialog snapshot wired to
   // live goal/task state so the status changes in place instead of disappearing.
@@ -10878,11 +10956,15 @@ async function saFetchDiffs(){
   if (SA.open) saSync();
 }
 function saOpen(focusGoalId, solo = false){
+  const wasOpen = SA.open;
   SA.open = true;
   SA.lastMarkup = null; // a newly opened/focused dialog always gets a clean first paint
   SA.solo = solo ? focusGoalId : null;   // solo = a single "Needs you" goal opened as one card
   SA.items = saLedgerRows().map((r) => ({ ...r, st: 0 }));
-  SA.detOpen = new Set();
+  // Only a FRESH open starts with everything folded. saOpen also runs when the person taps
+  // a different card while the dialog is already up, and clearing the set there closed the
+  // Activity / Conversation folds they had just opened on the other cards.
+  if (!wasOpen) SA.detOpen = new Set();
   // H14: focus a specific goal's card (single-review tap). Map the tapped goal
   // to the card that CONTAINS it (goals can group in the digest), then let
   // saRender center it + flash a blue ring. Real data keys by goal id.
@@ -11015,8 +11097,9 @@ async function saSendReply(it, i, text){
   text = displayText;
   await saEnsureThread(it);              // fold in any existing history BEFORE this reply (so it isn't hidden)
   const seq = saNextSeq();               // reserve send order NOW, so a late-resolving route keeps its place
-  // Clear the box in place — keep it FOCUSED, not blurred (saSync skips a rebuild while an
-  // input in #seeall has focus, which is what keeps an SSE tick from flashing the panel).
+  // Clear the box in place — keep it FOCUSED, not blurred. The draft must be dropped from
+  // SA.draft as well, or the next rebuild would re-populate the box from the sent text.
+  delete SA.draft[goalId];
   document.querySelectorAll(`#seeall .sa-item[data-gid="${goalId}"] .sa-chat`).forEach((inp) => { inp.value = ''; });
   delete SA.attachments[goalId]; saPaintAttachments(goalId);
   // Append the line to the card's own thread immediately — this is what the person sees, and

package/engine/lib.mjs

@@ -1396,6 +1396,17 @@ export function shouldAutoScroll(scrollTop, scrollHeight, clientHeight, threshol
   return scrollHeight - clientHeight - scrollTop <= threshold;
 }
 
+// Should an Enter keydown submit an input (send chat / save / answer)? Only when
+// the user is NOT mid-IME-composition. Pressing Enter to CONFIRM a Japanese
+// conversion candidate must commit the text, not send the message. Browsers flag
+// this via `isComposing` (and legacy `keyCode === 229`); every submit-on-Enter
+// handler in app/index.html shares this guard so IME confirm never mis-sends.
+export function shouldSubmitOnEnter(event = {}) {
+  if (event.key !== 'Enter') return false;
+  if (event.isComposing || event.keyCode === 229) return false;
+  return true;
+}
+
 // Decide the scrollTop to apply *after* a re-render replaces #stream's HTML
 // (task 93). `pre` is the element's geometry captured BEFORE the innerHTML
 // swap; `newScrollHeight` is its height AFTER. If the user was near the bottom

package/engine/server.mjs

@@ -3032,7 +3032,6 @@ async function runTask(task) {
     task.changedFiles = afterR.filter((l) => !before.includes(l)).map((l) => l.slice(3));
     task.unmappedChangedFiles = unmappedChangedFiles(task.changedFiles, task.requirementEvidence);
     notePreviewScope(task);
-    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.`);
     // An explicit worker receipt takes precedence over Galda's legacy prose
     // guard. The agent owns this decision; Manager only transports it.
@@ -3258,7 +3257,6 @@ async function runTask(task) {
   task.changedFiles = after.filter((l) => !before.includes(l)).map((l) => l.slice(3));
   task.unmappedChangedFiles = unmappedChangedFiles(task.changedFiles, task.requirementEvidence);
   notePreviewScope(task);
-  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.`);
   // An explicit worker receipt takes precedence over Galda's legacy prose
   // guard. The agent owns this decision; Manager only transports it.
@@ -3679,6 +3677,12 @@ function goalChangedFileUnion(goalId) {
 }
 function computeWorktreeChangeLocations(dir) {
   try {
+    // `git diff` alone never reports untracked files, so goals that only add
+    // new files would get changeLocations=[] and could never match by
+    // position for auto-fold. `add -N` (intent-to-add) registers the paths
+    // without staging their content, which is enough for them to show up as
+    // normal diff hunks.
+    gitOut(dir, ['add', '-N', '-A']);
     return parseGitUnifiedDiffLocations(gitOut(dir, ['diff', '--unified=0']) ?? '');
   } catch {
     return [];

package/package.json

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