@galda/cli 0.10.53 → 0.10.55

package/app/index.html

@@ -6894,16 +6894,17 @@ function renderFsTodo(){
   // (only a reply task, which Doing excludes) — it used to vanish from the lane (Masa 2026-07-24).
   // Show it in Doing as a goal row, and stop its old stopped task from lingering under "Needs you".
   const runningTaskGoalIds = new Set(running.filter((t) => !t.reply).map((t) => t.goalId));
-  const resumedGoalIds = new Set(pgoals.filter((g) => g.status === 'running' && g.startedAt).map((g) => g.id));
+  const runningReplyGoalIds = new Set(list.filter((t) => t.reply && t.status === 'running').map((t) => t.goalId));
+  const resumedGoalIds = new Set(runningReplyGoalIds);
   const doingGoals = pgoals.filter((g) => g.status === 'running' && g.startedAt
-    && !runningTaskGoalIds.has(g.id) && !pausedGoalIds.has(g.id));
+    && runningReplyGoalIds.has(g.id) && !runningTaskGoalIds.has(g.id) && !pausedGoalIds.has(g.id));
   // A reply that was OVER the parallel cap (engine PR #342): the goal is 'running'
   // but startedAt is cleared, and its only pending work is a QUEUED reply task —
   // which Doing needs startedAt for, and Next-up excludes (!t.reply). With no
   // bucket it vanished. Surface these "parked" goals at the TOP of To Do ("最上部",
   // Masa 2026-07-24) as Queued rows — not "Working on it" (nothing runs yet). They
   // auto-promote to Doing the moment a slot frees and the engine sets startedAt.
-  const parkedReplyGoals = pgoals.filter((g) => g.status === 'running' && !g.startedAt
+  const parkedReplyGoals = pgoals.filter((g) => g.status === 'running'
     && !pausedGoalIds.has(g.id) && !runningTaskGoalIds.has(g.id)
     && list.some((t) => t.goalId === g.id && t.reply && t.status === 'queued')
     && !list.some((t) => t.goalId === g.id && !t.reply && ['running', 'queued'].includes(t.status)));
@@ -6968,7 +6969,10 @@ function renderFsTodo(){
   // Parked over-cap replies ride at the TOP of To Do (above the ordinary Next-up
   // queue), as neutral "Queued" rows — the same goal-row shape as a resumed Doing
   // goal but without the green "Working on it", because no worker is running yet.
-  const parkedRows = parkedReplyGoals.map((g) => `<div class="trow up" data-goalid="${g.id}"><span class="st"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword" style="color:var(--ink3)">Queued</span>${fsActs(g.id)}</div>`).join('');
+  const canUseCodex = state.auth?.reason === 'rate-limited' && (state.agents || []).includes('codex');
+  const codexAction = (goalId, agent) => canUseCodex && agent === 'claude-code'
+    ? `<button class="ab txt" data-fscodex="${goalId}" title="Start now with Codex">Run with Codex</button>` : '';
+  const parkedRows = parkedReplyGoals.map((g) => `<div class="trow up" data-goalid="${g.id}"><span class="st"></span>${noSpan(g.id)}<span class="tt">${tt(g.reviewSummary?.check || g.plan?.[0] || g.text, 60)}</span><span class="stword" style="color:var(--ink3)">Queued</span>${codexAction(g.id, g.agent)}${fsActs(g.id)}</div>`).join('');
   const NCAP = 6;
   const upShown = fsUI.todoMore ? queued : queued.slice(0, NCAP);
   const seenGoals = new Set();
@@ -6983,7 +6987,7 @@ function renderFsTodo(){
           <div class="reps">${reps.map((r) => `<div class="rep">${tt(r.detail ?? r.title, 120)}</div>`).join('')}</div></div>`;
       }
     }
-    return `<div class="trow up${i >= 2 ? ' dim' : ''}" data-goalid="${t.goalId ?? ''}" data-taskid="${t.id}"><span class="st"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span>${fsActs(t.goalId)}</div>${grp}`;
+    return `<div class="trow up${i >= 2 ? ' dim' : ''}" data-goalid="${t.goalId ?? ''}" data-taskid="${t.id}"><span class="st"></span>${noSpan(t.goalId)}<span class="tt">${tt(t.title)}</span>${codexAction(t.goalId, t.agent)}${fsActs(t.goalId)}</div>${grp}`;
   }).join('');
   // CDO review 2026-07-08 §7: this header count used to be queued.length alone (the
   // "Next up" pool only) — so a project sitting in Doing/Later with an empty Next-up
@@ -7043,6 +7047,12 @@ function renderFsTodo(){
   };
   for (const b of el.querySelectorAll('[data-fspause]')) b.onclick = togglePauseActive; // list版 Doing 一時停止/再生（＋Paused行のResume）
   for (const b of el.querySelectorAll('[data-fsretry]')) b.onclick = () => fsRetryTask(b.dataset.fsretry);
+  for (const b of el.querySelectorAll('[data-fscodex]')) b.onclick = async (e) => { e.stopPropagation();
+    b.disabled = true; b.textContent = 'Starting…';
+    const r = await fetch(withKey(`/api/goals/${b.dataset.fscodex}/run-with-codex`), { method: 'POST' });
+    if (!r.ok) showErr((await r.json().catch(() => ({}))).error || 'Could not start with Codex.');
+    await refresh();
+  };
   for (const b of el.querySelectorAll('[data-fslog]')) b.onclick = () => fsToggleLog(Number(b.dataset.fslog));
   for (const b of el.querySelectorAll('[data-fsglog]')) b.onclick = () => toggleGoalDetail(Number(b.dataset.fsglog));
   for (const b of el.querySelectorAll('[data-fsreverify]')) b.onclick = async () => {
@@ -7695,7 +7705,7 @@ const AUTH_REASON_TEXT = {
   'logged-out': 'Not signed in to claude. Run `claude` in a terminal and /login, then relaunch the manager from that terminal — tasks are paused until then.',
   'bad-credentials': 'Worker sign-in failed. Check ANTHROPIC_API_KEY, or run `claude` and /login, then relaunch the manager from that terminal.',
   'probe-failed': 'Couldn’t verify claude sign-in. Ensure the `claude` CLI is installed and signed in, then relaunch the manager.',
-  'rate-limited': 'Claude has reached its usage limit. Claude tasks are queued until access resets; Codex tasks can continue now.',
+  'rate-limited': 'Claude is temporarily unavailable. Your Claude tasks are safely waiting. Tap “Run with Codex” beside a task to start it now.',
 };
 function renderAuthBanner(auth){
   const bar = $('errbar');

package/engine/lib.mjs

@@ -631,11 +631,12 @@ export function parseCodexEvents(line) {
 // (the id from a previous run's thread.started) — that subcommand takes neither
 // --cd nor --sandbox, so the working directory comes from the spawn's cwd and
 // the sandbox from -c sandbox_mode. Verified against codex-cli 0.142.4.
-export function buildCodexArgs({ model, effort, sandbox, cwd, resume } = {}) {
+export function buildCodexArgs({ model, effort, sandbox, cwd, resume, images = [] } = {}) {
   const common = ['--json', '-m', model, '-c', `model_reasoning_effort="${effort}"`, '--skip-git-repo-check'];
+  const imageArgs = images.filter(Boolean).flatMap((path) => ['--image', String(path)]);
   return resume
-    ? ['exec', 'resume', String(resume), ...common, '-c', `sandbox_mode="${sandbox}"`, '-']
-    : ['exec', ...common, '--sandbox', sandbox, '--cd', cwd, '-'];
+    ? ['exec', 'resume', String(resume), ...common, ...imageArgs, '-c', `sandbox_mode="${sandbox}"`, '-']
+    : ['exec', ...common, ...imageArgs, '--sandbox', sandbox, '--cd', cwd, '-'];
 }
 
 // Parse the planner's reply into { entry, tasks }. Accepts either a JSON

package/engine/server.mjs

@@ -1102,6 +1102,7 @@ function rebuildQueuesAfterAdopt() {
   for (const p of projects) queues.set(p.id, { running: new Set(), waiting: [] });
   for (const p of projects) {
     const pending = tasks.filter((t) => t.projectId === p.id && t.status === 'queued').sort((a, b) => a.num - b.num);
+    reconcileQueuedGoalStarts(p.id);
     queues.get(p.id).waiting.push(...pending);
     pump(p.id);
     for (const g of goals.filter((g) => g.projectId === p.id && g.status === 'stacked')) {
@@ -1111,6 +1112,17 @@ function rebuildQueuesAfterAdopt() {
   }
 }
 
+function reconcileQueuedGoalStarts(projectId) {
+  const projectTasks = tasks.filter((task) => task.projectId === projectId);
+  for (const goal of goals.filter((item) => item.projectId === projectId && item.status === 'running' && item.startedAt)) {
+    const goalTasks = projectTasks.filter((task) => task.goalId === goal.id);
+    if (goalTasks.some((task) => task.status === 'queued') && !goalTasks.some((task) => task.status === 'running')) {
+      goal.startedAt = null;
+      saveGoal(goal);
+    }
+  }
+}
+
 const ACTIVITY_LIMIT = 1000;
 function activityLine(line) {
   return String(line ?? '')
@@ -1180,10 +1192,10 @@ function runClaude({ prompt, cwd, tools, onEvent, onTodos, resume, model, effort
 // The Codex half of the worker bridge. Same contract as runClaude, because
 // nothing downstream may care which agent ran: live activity, the agent's own
 // to-dos (the board), the thread id to talk to it again, usage, final message.
-function runCodex({ prompt, cwd, onEvent, onTodos, resume, permissionMode = 'acceptEdits', model, effort, onChild }) {
+function runCodex({ prompt, cwd, onEvent, onTodos, resume, permissionMode = 'acceptEdits', model, effort, images, onChild }) {
   return new Promise((done) => {
     const sandbox = permissionMode === 'plan' ? 'read-only' : 'workspace-write';
-    const args = buildCodexArgs({ model: workerModel('codex', model), effort: workerEffort('codex', effort), sandbox, cwd, resume });
+    const args = buildCodexArgs({ model: workerModel('codex', model), effort: workerEffort('codex', effort), sandbox, cwd, resume, images });
     const child = spawn('codex', args, { cwd, stdio: ['pipe', 'pipe', 'pipe'] });
     onChild?.(child);
     child.stdin.end(prompt);
@@ -2318,6 +2330,7 @@ async function runTask(task) {
       // reply/rework on a normal goal stays acceptEdits as before.
       permissionMode: permissionModeFor(goal?.mode === 'plan' && goal?.planPhase !== 'executing' ? 'plan' : undefined),
       model: task.model ?? goal?.model, effort: task.effort ?? goal?.effort, onEvent: (line) => sendAct(task, line),
+      images: goal?.images,
       onTodos: (todos) => sendTodos(task, todos),
       onChild: (c) => trackGoalWorker(goal?.id, c),
     });
@@ -2373,6 +2386,7 @@ async function runTask(task) {
       prompt, cwd: workDir, tools: WORKER_TOOLS,
       resume: resumeSession, permissionMode,
       model: task.model ?? goal?.model, effort: task.effort ?? goal?.effort, onEvent: (line) => sendAct(task, line),
+      images: goal?.images,
       onTodos: (todos) => sendTodos(task, todos),
       onChild: (c) => trackGoalWorker(goal?.id, c),
     });
@@ -2398,6 +2412,7 @@ async function runTask(task) {
         prompt: workerPrompt(task, goal, null, workerAgent(task.agent ?? goal?.agent)), cwd: workDir, tools: WORKER_TOOLS,
         permissionMode,
         model: task.model ?? goal?.model, effort: task.effort ?? goal?.effort, onEvent: (line) => sendAct(task, line),
+        images: goal?.images,
         onTodos: (todos) => sendTodos(task, todos),
         onChild: (c) => trackGoalWorker(goal?.id, c),
       });
@@ -3993,6 +4008,28 @@ const server = createServer(async (req, res) => {
     return json(res, 200, task);
   }
 
+  // A Claude usage hold should be actionable without asking people to edit
+  // models or sessions. Move every still-queued step for this goal together so
+  // one tap cannot leave a mixed Claude/Codex chain behind.
+  const runWithCodexMatch = url.pathname.match(/^\/api\/goals\/(\d+)\/run-with-codex$/);
+  if (runWithCodexMatch && req.method === 'POST') {
+    const goal = goals.find((g) => g.id === Number(runWithCodexMatch[1]));
+    if (!goal) return json(res, 404, { error: 'goal not found' });
+    if (!requireGoalOwnership(req, res, goal)) return;
+    if (!AVAILABLE_AGENTS.includes('codex')) return json(res, 409, { error: 'Codex is not connected on this device' });
+    const queuedTasks = tasks.filter((task) => task.goalId === goal.id && task.status === 'queued');
+    if (!queuedTasks.length) return json(res, 409, { error: 'this goal has no queued work' });
+    const model = CODEX_MODELS[0];
+    goal.agent = 'codex'; goal.model = model; goal.sessionId = null; goal.startedAt = null;
+    saveGoal(goal);
+    for (const task of queuedTasks) {
+      task.agent = 'codex'; task.model = model; task.sessionId = null;
+      saveTask(task);
+    }
+    pump(goal.projectId);
+    return json(res, 200, { goal, tasks: queuedTasks });
+  }
+
   // Start what the worker said to start, and hand back the URL to look at.
   //
   // This is the "動かして見られる状態" the review card offers. It replaces the
@@ -4939,6 +4976,7 @@ server.listen(PORT, '127.0.0.1', () => {
   for (const p of projects) {
     const pending = tasks.filter((t) => t.projectId === p.id && t.status === 'queued').sort((a, b) => a.num - b.num);
     const q = queues.get(p.id);
+    reconcileQueuedGoalStarts(p.id);
     q.waiting.push(...pending);
     if (pending.length) console.log(`[manager] ${p.id}: re-queued ${pending.length} pending task(s) after restart`);
     pump(p.id);

package/package.json

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