@galda/cli 0.10.79 → 0.10.81

package/app/index.html

@@ -6828,7 +6828,10 @@ function renderFsBoard(){
     // errored is status-based now (blocked/failed/partial/interrupted live in the Needs-you column,
     // not Doing). Doing holds only what's actively moving, so bkt==='doing' ⇒ healthy in flight.
     const errored = ['blocked', 'failed', 'partial', 'interrupted'].includes(g.status);
-    const intr = g.status === 'interrupted';
+    // `partial` can mean an earlier step completed and the latest one was
+    // interrupted. Read the concrete task so this card doesn't turn amber,
+    // resumable work into a red generic failure.
+    const intr = g.status === 'interrupted' || list.some((t) => t.goalId === g.id && t.status === 'interrupted');
     const isPaused = g.status === 'blocked' && g.blocked?.kind === 'paused'; // 一時停止=エラーでなくアンバー扱い
     const amber = intr || isPaused;
     const healthyRun = bkt === 'doing' && !errored; // paused(=errored) goals now sit in 'doing' too but carry no progress bar
@@ -7161,7 +7164,10 @@ function errorButtonsHtml(meta, { taskId = null, goalId = null, interrupted = fa
   const out = [];
   for (const id of meta.actionIds || []) {
     if (id === 'retry' && taskId != null) out.push(`<button class="errbtn" data-fsretry="${taskId}">${interrupted ? C.resume : C.retry}</button>`);
-    else if (id === 'run-with-codex' && canCodex) out.push(`<button class="errbtn" data-fscodex="${goalId}">${C.other}</button>`);
+    // This keeps the existing agent-switch endpoint, but says what it really does
+    // for an interrupted run: continue the saved goal with another agent rather
+    // than imply a brand-new, contextless task will be created.
+    else if (id === 'run-with-codex' && canCodex) out.push(`<button class="errbtn" data-fscodex="${goalId}">${interrupted ? (failureLang() === 'ja' ? 'Codexで再開' : 'Resume with Codex') : C.other}</button>`);
     else if (id === 'connect') out.push(`<button class="errbtn" data-fsconnectworker="1">${C.connect}</button>`);
     else if (id === 'check-connection') out.push(`<button class="errbtn" data-fscheckworker="1">${C.check}</button>`);
     else if (id === 'retry-tests' && goalId != null) out.push(`<button class="errbtn" data-fsreverify="${goalId}">${C.tests}</button>`);
@@ -7297,10 +7303,6 @@ function renderFsTodo(){
   const needsCount = failed.filter((t) => !resumedGoalIds.has(t.goalId)).length + blocked.length + needsInput.length;
   const doingCount = running.length + finalizingGoals.length + pausedGoalIds.size;
   const nextCount = parkedReplyGoals.length + queued.length;
-  const hasPipelineWork = doingCount > 0 || nextCount > 0 || pgoals.some((g) => ['planning', 'stacked'].includes(g.status));
-  const laterIdle = later.length && !hasPipelineWork
-    ? `<div class="lateridle"><span class="msg">${document.documentElement.lang === 'ja' ? `実行待ちはありません。Laterの${later.length}件は自動開始されません。` : `Nothing is queued. ${later.length} Later item${later.length === 1 ? '' : 's'} will not start automatically.`}</span><button data-fsstartnextlater="${later[0].id}">${document.documentElement.lang === 'ja' ? '次を開始' : 'Start next'}</button></div>`
-    : '';
   // Free-tier pending counter (H22): on the free plan the header shows the wall
   // — pending goals out of the 5-slot cap — reddening at the cap and gone once
   // paid. Reads the SAME numbers the gate enforces (state.billing, never a local
@@ -7322,7 +7324,6 @@ function renderFsTodo(){
       <div class="qadd" data-fsnew="1" role="button" tabindex="0" title="New goal"><span class="paplus"></span><span>New</span></div>
       <span class="tlcap">Later</span>
       <div class="qadd lateradd" data-fslaternew="1" role="button" tabindex="0" title="New Later goal"><span class="paplus"></span><span>New</span></div>
-      ${laterIdle}
       ${laterRows}
     </div>
     ${doneAll.length ? `<div class="doneline${fsUI.doneOpen ? ' open' : ''}" id="fsDoneLine">✓ Done<span class="num">${doneAll.length}</span><span class="fold">▾</span></div>
@@ -7387,13 +7388,6 @@ function renderFsTodo(){
     let r; try { r = await fetch(withKey(`/api/goals/${b.dataset.fspstart}/activate`), { method: 'POST' }); }
     catch { showErr('Start failed.'); return; }
     if (!r.ok) showErr('Start failed.'); else await refresh(); };
-  const startNextLater = el.querySelector('[data-fsstartnextlater]');
-  if (startNextLater) startNextLater.onclick = async (e) => { e.stopPropagation();
-    startNextLater.disabled = true;
-    let r; try { r = await fetch(withKey(`/api/goals/${startNextLater.dataset.fsstartnextlater}/activate`), { method: 'POST' }); }
-    catch { showErr(document.documentElement.lang === 'ja' ? '開始できませんでした' : 'Could not start the next item.'); startNextLater.disabled = false; return; }
-    if (!r.ok) { showErr(document.documentElement.lang === 'ja' ? '開始できませんでした' : 'Could not start the next item.'); startNextLater.disabled = false; }
-    else await refresh(); };
   for (const b of el.querySelectorAll('[data-fspdel]')) b.onclick = async (e) => { e.stopPropagation();
     const preview = b.closest('.trow')?.querySelector('.tt')?.textContent || '';
     if (!(await confirmDelete({ title: 'Delete this shelved goal?', preview }))) return;
@@ -8933,7 +8927,14 @@ async function send(){
         // review goal → the AI decides continue/rescope/split/answer (same path as the
         // review card's own reply box), with the note anchored under the composer.
         const body = await replyToGoal(bind.goal.id, fullText, '#input');
-        if (body) { upsert(state.goals, body.goal); if (body.task) upsert(state.tasks, body.task); render(); }
+        if (body) {
+          upsert(state.goals, body.goal); if (body.task) upsert(state.tasks, body.task);
+          // A Review reply is a one-shot handoff. Keeping the composer bound
+          // afterwards adds a redundant “Replying to #N” banner and makes the
+          // next, unrelated instruction easy to send to the old goal by mistake.
+          state.selectedGoal = null;
+          render();
+        }
       } else {
         // running/partial/failed/interrupted/blocked → a plain follow-up on the same goal.
         const r = await fetch(withKey(`/api/goals/${bind.goal.id}/reply`), { method: 'POST',
@@ -9178,6 +9179,11 @@ function latestGoalRunForOutcome(goalId, tasks, outcome){
 function saRowFromDigest(r, gs, ts){
     const g = gs.find((x) => x.id === r.goalIds[0]);
     const outcome = latestGoalOutcomeTask(g?.id, ts);
+    // A timeout commonly settles its parent goal as `partial`: some earlier work
+    // may be real, while the final task is retryable. Preserve the task-level truth
+    // here so the card never calls that state a generic failure.
+    const interruptedTask = [...ts].filter((t) => r.goalIds.includes(t.goalId) && t.status === 'interrupted')
+      .sort((a, b) => taskSortTime(b) - taskSortTime(a))[0] || null;
     const pt = ts.find((t) => r.goalIds.includes(t.goalId) && t.proof && (t.proof.png || t.proof.gif));
     // "What we did" (H23 §2, replaces the old Plan/Review-thread folds): one bullet
     // per finished requirement task's own report; falls back to the goal's plan
@@ -9207,6 +9213,7 @@ function saRowFromDigest(r, gs, ts){
       .map((x) => ({ id: x.id, title: saReviewTitle(x) }));
     return {
       ids: r.goalIds, goalId: r.goalIds[0], goal: g, folded,
+      interruptedTask,
       no: r.reviewNumber,
       title: saReviewTitle(g),
       check: String(g?.reviewSummary?.check || r.checkLine || '').replace(/\s+/g, ' ').trim(),
@@ -9733,10 +9740,27 @@ function saItemHtml(it, i){
     ? `<div class="ropen rdeclerr"><p class="rbody v">${failureLang() === 'ja' ? 'AIが開けるものを用意しようとしましたが、記録が読み取れませんでした。返信して直させてください。' : 'The AI tried to declare something to open here, but the record was unreadable. Reply to have it rewritten.'}</p></div>`
     : '';
   const openBody = (it.run?.cmd || it.run?.url)
-    ? `<div class="ropen" id="runlocal${i}"><button type="button" class="olink" data-saact="preview:${i}" id="prevlink${i}">${esc(it.run.url || 'Start it')}<span class="ar">↗</span></button><p class="rbody v">${esc(it.run.note || it.run.cmd || 'Starts when you press it.')}</p></div>`
+    ? `<div class="ropen" id="runlocal${i}"><button type="button" class="olink" data-saact="preview:${i}" id="prevlink${i}">${esc(it.run.url || 'Start it')}<span class="ar">↗</span></button><p class="rbody v">${esc(it.run.note || it.run.cmd || 'Starts when you press it.')}${it.interruptedTask ? ' Available now; it does not wait for this run to finish.' : ''}</p></div>`
     : it.pr
       ? `<div class="ropen"><a class="olink" href="${esc(it.pr)}" target="_blank" rel="noopener">${esc(it.pr)}<span class="ar">↗</span></a><p class="rbody v">Review and merge this pull request to finish the item.</p></div>`
       : runDeclErrorBody;
+  // An interrupted worker is not a failed implementation. Keep the recovery
+  // record factual and compact: the last recorded step, files already changed,
+  // whether verification remains, and the exact resume action. These are all
+  // state fields — no Manager-generated diagnosis or task re-planning.
+  const interruptedBody = it.interruptedTask ? (() => {
+    const t = it.interruptedTask;
+    const last = (state.act[t.id] ?? t.activity ?? []).filter(Boolean).at(-1);
+    const files = [...new Set((t.changedFiles ?? []).concat(filePaths))];
+    const tests = it.testResult?.ran
+      ? (it.testResult.ok ? 'Verification completed before the interruption.' : 'Verification remains incomplete or failed.')
+      : 'Verification has not completed yet.';
+    const reason = String(t.result || 'The worker reached its run limit before finishing.').replace(/\s+/g, ' ').slice(0, 240);
+    return `<div class="rinfra"><p class="rbody v"><b>Interrupted — resume available</b><br>${esc(reason)}</p>`
+      + (last ? `<p class="rbody v">Last recorded step: ${esc(String(last).slice(0, 220))}</p>` : '')
+      + (files.length ? `<p class="rbody v">Changed so far: ${esc(files.join(' · '))}</p>` : '')
+      + `<p class="rbody v">${esc(tests)}</p><div class="acts2"><button class="errbtn" data-saact="resume:${i}">Resume</button>${errorButtonsHtml(taskErrorMeta(t, it.goal), { taskId: null, goalId: it.goalId, interrupted: true, agent: t.agent || it.goal?.agent })}</div></div>`;
+  })() : '';
   const prRepairBody = it.goal?.prError
     ? `<div class="prfail"><b>${esc(it.goal.prRepair?.title || 'PR blocked')}</b> <span class="dim">${esc(it.goal.prError)}</span>${it.goal.prRepair?.steps?.length ? `<ul>${it.goal.prRepair.steps.map((s) => `<li>${esc(s)}</li>`).join('')}</ul>` : ''}${it.goal.prRepair?.dirtyFiles?.length ? `<div class="dim">dirty: ${it.goal.prRepair.dirtyFiles.map(esc).join(' · ')}</div>` : ''}<div class="acts2"><button class="errbtn" data-saact="retrypr:${i}">${failureLang() === 'ja' ? 'PR再試行' : 'Retry PR'}</button><button class="errbtn" data-saact="glog:${i}">${failureLang() === 'ja' ? 'ログ確認' : 'View log'}</button></div></div>`
     : '';
@@ -9899,8 +9923,8 @@ function saItemHtml(it, i){
   const attn = !working && ['blocked', 'partial', 'failed', 'interrupted'].includes(gstatus);
   // Match the flagship list's state colours (Masa's Interrupt=amber / Failed=red rule): an
   // interrupted goal is amber+resumable, everything else stopped is a red error.
-  const attnInt = gstatus === 'interrupted';
-  const attnLabel = gstatus === 'interrupted' ? 'Interrupted' : gstatus === 'blocked' ? 'Blocked' : 'Failed';
+  const attnInt = gstatus === 'interrupted' || Boolean(it.interruptedTask);
+  const attnLabel = attnInt ? 'Interrupted — resume available' : gstatus === 'blocked' ? 'Blocked' : 'Failed';
   const rst = working
     ? '<span class="rst working"><span class="rdot"></span>Working on it</span>'
     : attn
@@ -9912,6 +9936,7 @@ function saItemHtml(it, i){
     ${meta}
     ${reqSec}
     ${S('Open it', openBody)}
+    ${S('Run state', interruptedBody)}
     ${S('PR', prRepairBody)}
     ${S('Also carries', carriesBody)}
     ${S('What to check', checkBody)}
@@ -10396,6 +10421,11 @@ $('seeall').addEventListener('click', async (e) => {
   }
   const it = SA.items[i];
   if (!it) return;
+  if (k === 'resume') {
+    const taskId = it.interruptedTask?.id;
+    if (taskId != null) return fsRetryTask(taskId);
+    return;
+  }
   if (k === 'retrypr') return fsRetryPrGoal({ disabled: false, textContent: '', dataset: { fsprretry: String(it.goalId) } });
   if (k === 'glog') return toggleGoalDetail(it.goalId);
   // meta-row toggle (H23): tap the token chip to reveal the technique breakdown.
@@ -10598,7 +10628,7 @@ function renderCtxBar(){
       + `<span class="pt">\u200e${esc(folderShort(r.dir))}</span></button>`)
     .join('');
   const openRow = `<button type="button" class="appopt ctxopen" id="ctxopenfolder" title="Open the OS folder chooser"><svg viewBox="0 0 24 24"><path d="M3 7a2 2 0 012-2h4l2 2h8a2 2 0 012 2v8a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><path d="M12 11v6M9 14h6"/></svg><span class="nm">Open folder…</span></button>`;
-  menu.innerHTML = `${opts}${openRow}<div class="ctxpath"><input type="text" id="ctxdirin" placeholder="~/path/to/repo" aria-label="Folder path" spellcheck="false"><button type="button" class="appopt" id="ctxdiruse" style="width:auto">Use</button></div><div class="ctxmsg" id="ctxdirmsg"></div>`;
+  menu.innerHTML = `${opts}${openRow}<div class="ctxmsg" id="ctxdirmsg"></div>`;
 }
 // Workspace mode is fixed to the isolated worktree (clean separate checkout). The
 // direct-workspace escape hatch was removed after two accidents where a stray click
@@ -10626,7 +10656,7 @@ async function setProjectFolder(dir){
   const want = String(dir ?? '').trim();
   const msg = $('ctxdirmsg');
   const say = (t, bad) => { if (msg) { msg.textContent = t; msg.classList.toggle('bad', Boolean(bad)); } };
-  if (!want) { say('Type a path, or pick one above.', true); return; }
+  if (!want) { say('Choose a folder.', true); return; }
   say('');
   try {
     const r = await fetch(withKey(`/api/projects/${encodeURIComponent(state.active)}`), {
@@ -10648,14 +10678,14 @@ function isLocalSession(){ return ['localhost', '127.0.0.1'].includes(location.h
 async function openFolderNative(){
   const msg = $('ctxdirmsg');
   const say = (t, bad) => { if (msg) { msg.textContent = t; msg.classList.toggle('bad', Boolean(bad)); } };
-  if (!isLocalSession()) { $('ctxdirin')?.focus(); say('Remote session — pick a repo above or type a path.'); return; }
+  if (!isLocalSession()) { say('Open Manager locally to choose a folder on this computer.', true); return; }
   say('Opening the folder chooser…');
   try {
     const r = await fetch(withKey('/api/choose-folder'), { method: 'POST' });
     const body = await r.json().catch(() => ({}));
     if (body.path) { setProjectFolder(body.path); return; }        // reuse: PUT the project's dir, close, render
     if (body.cancelled) { say(''); return; }
-    if (body.unsupported) { say('This engine can’t open a folder dialog — pick a repo above or type a path.'); return; }
+    if (body.unsupported) { say('This engine can’t open a folder dialog on this system.', true); return; }
     say(body.error || 'Could not open the folder chooser.', true);
   } catch { say('Could not reach the engine.', true); }
 }
@@ -10671,11 +10701,6 @@ $('ctxdirmenu').addEventListener('click', (e) => {
   if (e.target.closest('#ctxopenfolder')) { openFolderNative(); return; }
   const opt = e.target.closest('[data-ctxdir]');
   if (opt) { setProjectFolder(opt.dataset.ctxdir); return; }
-  if (e.target.closest('#ctxdiruse')) setProjectFolder($('ctxdirin')?.value ?? '');
-});
-$('ctxdirmenu').addEventListener('keydown', (e) => {
-  e.stopPropagation();
-  if (e.key === 'Enter' && !e.isComposing && e.target.id === 'ctxdirin') { e.preventDefault(); setProjectFolder(e.target.value); }
 });
 $('appbtn').onclick = (e) => { e.stopPropagation(); $('appmenu').classList.toggle('show'); };
 $('appmenu').addEventListener('click', (e) => {

package/engine/server.mjs

@@ -2593,7 +2593,11 @@ async function startPreview(task) {
   // They never need a child process; treating them like a Manager app made
   // "Open it" fail even though the HTML artifact was ready to view.
   if (!cmd && typeof url === 'string' && url.startsWith('/upload/')) {
-    return { url, reused: false, started: false };
+    // The card opens this relative URL in a new tab. Carry the manager key in
+    // that URL; otherwise the new navigation loses the authenticated fetch
+    // context and the upload route correctly returns its 403 gate.
+    const keyedUrl = `${url}${url.includes('?') ? '&' : '?'}key=${encodeURIComponent(ACCESS_KEY)}`;
+    return { url: keyedUrl, reused: false, started: false };
   }
   const live = previews.get(task.id);
   if (live && live.proc.exitCode === null) {
@@ -4097,13 +4101,17 @@ const server = createServer(async (req, res) => {
   // (otherwise the dialog would open on the server, not the person's screen). It
   // returns only the chosen path — nothing is scanned, listed, or invented.
   //   { path, label } | { cancelled: true } | { unsupported: true } | { error }
-  // MANAGER_NO_NATIVE_DIALOG (and any non-macOS host) short-circuits to
-  // {unsupported} so tests/CI/headless never block on a GUI.
+  // MANAGER_NO_NATIVE_DIALOG short-circuits so tests/CI/headless never block
+  // on a GUI. macOS, Windows and common Linux desktops use their native picker.
   if (url.pathname === '/api/choose-folder' && req.method === 'POST') {
-    if (process.platform !== 'darwin' || process.env.MANAGER_NO_NATIVE_DIALOG) {
+    if (process.env.MANAGER_NO_NATIVE_DIALOG) {
       return json(res, 200, { unsupported: true });
     }
-    execFile('osascript', ['-e', chooseFolderScript()], { timeout: 120000 }, (err, stdout, stderr) => {
+    const windowsScript = 'Add-Type -AssemblyName System.Windows.Forms; $d = New-Object System.Windows.Forms.FolderBrowserDialog; if ($d.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) { [Console]::Write($d.SelectedPath) }';
+    const command = process.platform === 'darwin' ? 'osascript' : process.platform === 'win32' ? 'powershell.exe' : 'zenity';
+    const args = process.platform === 'darwin' ? ['-e', chooseFolderScript()] : process.platform === 'win32'
+      ? ['-NoProfile', '-NonInteractive', '-Command', windowsScript] : ['--file-selection', '--directory', '--title=Choose a project folder'];
+    execFile(command, args, { timeout: 120000 }, (err, stdout, stderr) => {
       const verdict = parseChosenFolder({ code: err ? (err.code ?? 1) : 0, stdout, stderr });
       if (verdict.path) verdict.label = folderLabel(verdict.path, HOME);
       json(res, 200, verdict);

package/package.json

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