@loicngr/kobo 1.11.35 → 1.11.37

package/dist/server/routes/workspaces.js

@@ -1,5 +1,7 @@
 import { execFile as execFileCb, execFileSync, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
+import { AgentStopError, assertAgentStopped } from '../utils/agent-stop-result.js';
+import { withGitRepoLock } from '../utils/git-repo-lock.js';
 const execFileAsync = promisify(execFileCb);
 import fs from 'node:fs';
 import path from 'node:path';
@@ -50,8 +52,25 @@ import * as safePath from '../utils/safe-path.js';
 import { WorkspaceLifecycleBusyError, withWorkspaceLifecycleGuard } from '../utils/workspace-lifecycle-guard.js';
 import { resolveExtractedName } from '../utils/workspace-name.js';
 import { resolveSiblingWorkspaceWorktreePath } from '../utils/worktree-paths.js';
-/** Hono sub-router for workspace CRUD, tasks, agent lifecycle, git operations, and PR creation. */
+/** Lifecycle conflicts can be retried once the current owner has stopped. */
+function workspaceErrorStatus(err) {
+    return err instanceof AgentStopError || err instanceof WorkspaceLifecycleBusyError ? 409 : 500;
+}
+/** Hono sub-router for workspace CRUD, tasks, agents, Git and PR creation. */
 const app = new Hono();
+// These handlers own teardown across awaits; purge/delete/restore own their guard in the service.
+for (const route of ['/:id/archive', '/:id/run-setup-script', '/:id/cancel-source-change']) {
+    app.use(route, async (c, next) => {
+        try {
+            await withWorkspaceLifecycleGuard(c.req.param('id'), next);
+        }
+        catch (err) {
+            if (err instanceof WorkspaceLifecycleBusyError)
+                return c.json({ error: err.message, code: err.code }, 409);
+            throw err;
+        }
+    });
+}
 /** Tracks workspaces currently running a setup script to prevent concurrent executions. */
 const setupScriptRunning = new Set();
 /**
@@ -243,7 +262,7 @@ app.get('/', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/engine-handoff-preview — build an editable, deterministic handoff.
@@ -294,7 +313,7 @@ app.post('/:id/switch-engine', migrationGuard, async (c) => {
         // A new engine is started three lines below: the previous one must be dead
         // first, or two agents share the worktree.
         if (agentManager.hasController(id))
-            await agentManager.stopAgentAndWait(id);
+            assertAgentStopped(await agentManager.stopAgentAndWait(id, undefined, 'replacement'));
         const updated = workspaceService.updateWorkspaceEngineConfiguration(id, body.engine, model, effort, body.agentPermissionMode);
         const session = agentManager.startAgent(id, updated.worktreePath, handoff, updated.model, false, updated.agentPermissionMode, undefined, updated.reasoningEffort);
         workspaceService.updateWorkspaceStatus(id, 'executing');
@@ -1366,7 +1385,7 @@ app.post('/:id/sessions', migrationGuard, (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/sessions — list sessions for a workspace
@@ -1381,7 +1400,7 @@ app.get('/:id/sessions', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/pr-states — batch snapshot of PR states known to the
@@ -1395,7 +1414,7 @@ app.get('/pr-states', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/info — bulk snapshot for the 30s client refresh:
@@ -1415,7 +1434,7 @@ app.get('/info', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/comparison — the workspaces running the same task on
@@ -1449,7 +1468,7 @@ app.get('/:id/comparison', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/preset — the create-form preset this workspace would
@@ -1464,7 +1483,7 @@ app.get('/:id/preset', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/pr-snapshot/refresh/:id — on-demand refresh of a single
@@ -1483,7 +1502,7 @@ app.post('/pr-snapshot/refresh/:id', async (c) => {
         const message = err instanceof Error ? err.message : String(err);
         if (/not found/i.test(message))
             return c.json({ error: message }, 404);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/auto-loop-states — batch snapshot keyed by workspace id.
@@ -1518,7 +1537,7 @@ app.get('/auto-loop-states', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/auto-loop — current auto-loop status for one workspace.
@@ -1534,7 +1553,7 @@ app.get('/:id/auto-loop', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/auto-loop — enable the loop (user toggle ON).
@@ -1556,7 +1575,7 @@ app.delete('/:id/auto-loop', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/auto-loop-ready — force auto_loop_ready=true.
@@ -1576,7 +1595,7 @@ app.post('/:id/auto-loop-ready', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/crons — list pending crons for a workspace.
@@ -1590,7 +1609,7 @@ app.get('/:id/crons', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/crons — arm a new cron. Validates the expression
@@ -1638,7 +1657,7 @@ app.post('/:id/crons', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id/crons/:cronId — cancel a single cron. Idempotent:
@@ -1655,7 +1674,7 @@ app.delete('/:id/crons/:cronId', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/pending-wakeup — returns the pending wakeup or null.
@@ -1667,7 +1686,7 @@ app.get('/:id/pending-wakeup', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id/pending-wakeup — user-initiated cancel ("×" button)
@@ -1680,7 +1699,7 @@ app.delete('/:id/pending-wakeup', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/quota-backoff — returns the pending quota backoff or null.
@@ -1696,7 +1715,7 @@ app.get('/:id/quota-backoff', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id/quota-backoff — user-initiated cancel ("×" button).
@@ -1711,7 +1730,7 @@ app.delete('/:id/quota-backoff', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/pending-wakeup — schedule a wakeup, either from
@@ -1748,7 +1767,7 @@ app.post('/:id/pending-wakeup', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // PATCH /api/workspaces/:id/sessions/:sessionId — rename a session
@@ -1772,7 +1791,7 @@ app.patch('/:id/sessions/:sessionId', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id/sessions/:sessionId — remove a stopped session and its history.
@@ -1909,7 +1928,7 @@ app.delete('/:id/events/:eventId', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : 'unknown';
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/tasks — create a new task
@@ -1937,7 +1956,7 @@ app.post('/:id/tasks', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // PATCH /api/workspaces/:id/tasks/:taskId — update task status and/or title
@@ -1976,7 +1995,7 @@ app.patch('/:id/tasks/:taskId', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id/tasks/:taskId — delete a task
@@ -1997,7 +2016,7 @@ app.delete('/:id/tasks/:taskId', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/tasks/notify-updated — broadcast generic task list change
@@ -2015,7 +2034,7 @@ app.post('/:id/tasks/notify-updated', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/agent-description/notify-updated — broadcast
@@ -2037,7 +2056,7 @@ app.post('/:id/agent-description/notify-updated', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/crons/notify-updated — broadcast cron list changed
@@ -2053,7 +2072,7 @@ app.post('/:id/crons/notify-updated', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/tasks/:taskId/notify-done — broadcast task:updated event
@@ -2070,7 +2089,7 @@ app.post('/:id/tasks/:taskId/notify-done', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // Cap how many recent rows one search may scan: the LIKE below cannot use an
@@ -2201,7 +2220,7 @@ app.get('/:id/sessions/:sessionId/summary', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/session-metrics — compact observability data for the timeline.
@@ -2378,7 +2397,7 @@ app.get('/:id/events', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/archived — list archived workspaces (must be before GET /:id)
@@ -2388,7 +2407,7 @@ app.get('/archived', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /:id/prep-autoloop-prompt — compose the project-aware grooming
@@ -2415,7 +2434,7 @@ ${AUTO_LOOP_HARD_RULES}`;
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /:id/chat-history — list up to 200 most recent chat-input messages
@@ -2431,7 +2450,7 @@ app.get('/:id/chat-history', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /:id/chat-history — append a message to this workspace's history.
@@ -2454,7 +2473,7 @@ app.post('/:id/chat-history', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /:id/save-file — persist edited file content from the diff viewer.
@@ -2490,7 +2509,7 @@ app.post('/:id/save-file', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id — get workspace details with tasks
@@ -2505,7 +2524,7 @@ app.get('/:id', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/favorite — mark workspace as favorite
@@ -2660,7 +2679,7 @@ app.patch('/:id', migrationGuard, async (c) => {
             message.includes('Description must be')) {
             return c.json({ error: message }, 400);
         }
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Open the workspace worktree in the user's configured editor. */
@@ -2696,7 +2715,7 @@ app.post('/:id/open-editor', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Open the workspace worktree in the user's configured terminal emulator. */
@@ -2736,7 +2755,7 @@ app.post('/:id/open-terminal', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Open the workspace worktree in the user's configured file manager. */
@@ -2769,7 +2788,7 @@ app.post('/:id/open-file-manager', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Spawn a detached process and resolve as soon as it has started (or reject
@@ -2814,11 +2833,12 @@ app.post('/:id/run-setup-script', async (c) => {
             // rewrites the worktree the agent may still be writing to.
             try {
                 if (agentManager.getAgentStatus(id)) {
-                    await agentManager.stopAgentAndWait(id);
+                    assertAgentStopped(await agentManager.stopAgentAndWait(id, undefined, 'setup'));
                 }
             }
             catch (err) {
                 console.error(`[workspaces] stopAgentAndWait before setup script failed for '${id}':`, err);
+                throw err;
             }
             const effectiveSettings = settingsService.getEffectiveSettings(workspace.projectPath);
             if (!effectiveSettings.setupScript) {
@@ -2845,7 +2865,7 @@ app.post('/:id/run-setup-script', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/archive — mark workspace as archived (soft-delete)
@@ -2860,10 +2880,11 @@ app.post('/:id/archive', migrationGuard, async (c) => {
             return c.json({ error: 'Already archived' }, 400);
         }
         try {
-            await agentManager.stopAgentAndWait(id);
+            assertAgentStopped(await agentManager.stopAgentAndWait(id, undefined, 'archive'));
         }
         catch (err) {
             console.error(`[workspaces] stopAgentAndWait during archive failed for '${id}':`, err);
+            throw err;
         }
         try {
             await devServerService.stopDevServer(id);
@@ -2871,6 +2892,7 @@ app.post('/:id/archive', migrationGuard, async (c) => {
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
             console.error(`[workspaces] stopDevServer during archive failed: ${message}`);
+            throw err;
         }
         try {
             terminalService.destroyTerminal(id);
@@ -2886,7 +2908,7 @@ app.post('/:id/archive', migrationGuard, async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/purge-worktree
@@ -2909,7 +2931,7 @@ app.post('/:id/purge-worktree', migrationGuard, async (c) => {
         if (err instanceof WorkspaceLifecycleBusyError)
             return c.json({ code: err.code, error: err.message }, 409);
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // Recreate the checkout before unarchiving; never starts agents or setup scripts.
@@ -2953,7 +2975,7 @@ app.post('/:id/unarchive', migrationGuard, (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // Shared teardown for a single workspace: stops the agent, destroys the
@@ -2979,10 +3001,11 @@ async function deleteWorkspaceWithSideEffectsUnlocked(workspace, opts) {
     // a few lines below: firing and forgetting here pulled the directory from
     // under an agent still writing to it, destroying uncommitted work.
     try {
-        await agentManager.stopAgentAndWait(workspace.id, undefined, 'delete');
+        assertAgentStopped(await agentManager.stopAgentAndWait(workspace.id, undefined, 'delete'));
     }
     catch (err) {
         console.error(`[workspaces] stopAgentAndWait during delete failed for '${workspace.name}':`, err);
+        throw err;
     }
     // Stop dev server if it was running. The processSpawn would otherwise
     // outlive the workspace (and keep its port + docker containers alive).
@@ -2991,6 +3014,7 @@ async function deleteWorkspaceWithSideEffectsUnlocked(workspace, opts) {
     }
     catch (err) {
         console.error(`[workspaces] stopDevServer during delete failed for '${workspace.name}':`, err);
+        throw err;
     }
     try {
         terminalService.destroyTerminal(workspace.id);
@@ -3089,7 +3113,7 @@ app.delete('/archived', migrationGuard, async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // DELETE /api/workspaces/:id — delete workspace
@@ -3117,7 +3141,7 @@ app.delete('/:id', migrationGuard, async (c) => {
         if (err instanceof WorkspaceLifecycleBusyError)
             return c.json({ code: err.code, error: err.message }, 409);
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/start — start/restart agent
@@ -3162,10 +3186,11 @@ app.post('/:id/start', migrationGuard, async (c) => {
         quotaBackoffService.cancel(id, 'user');
         // Stop the existing agent and wait: a fresh one starts right below.
         try {
-            await agentManager.stopAgentAndWait(id);
+            assertAgentStopped(await agentManager.stopAgentAndWait(id, undefined, 'replacement'));
         }
         catch (err) {
             console.error(`[workspaces] stopAgentAndWait before start failed for '${id}':`, err);
+            throw err;
         }
         const worktreePath = workspace.worktreePath;
         const agent = agentManager.startAgent(id, worktreePath, prompt, workspace.model, resume, workspace.agentPermissionMode, agentSessionId, workspace.reasoningEffort);
@@ -3195,7 +3220,7 @@ app.post('/:id/start', migrationGuard, async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/git-stats — commit count and diff stats for the branch
@@ -3221,7 +3246,7 @@ app.get('/:id/git-stats', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/diff?mode=branch|unpushed — list changed files
@@ -3283,7 +3308,7 @@ app.get('/:id/diff', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/diff-file?path=...&mode=branch|unpushed
@@ -3349,7 +3374,7 @@ app.get('/:id/diff-file', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/rollback-file { path }
@@ -3388,7 +3413,7 @@ app.post('/:id/rollback-file', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/branch-divergence?limit=50
@@ -3420,7 +3445,7 @@ app.get('/:id/branch-divergence', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /api/workspaces/:id/commits?limit=50 — list commits between
@@ -3444,7 +3469,7 @@ app.get('/:id/commits', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // GET /:id/working-tree-files — list uncommitted working-tree files (read-only)
@@ -3459,7 +3484,7 @@ app.get('/:id/working-tree-files', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/rename-branch { newName }
@@ -3531,7 +3556,7 @@ app.post('/:id/rename-branch', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/resync-branch
@@ -3587,7 +3612,7 @@ app.post('/:id/resync-branch', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/push — push working branch to origin
@@ -3624,7 +3649,7 @@ app.post('/:id/push', async (c) => {
         }
         catch (err) {
             const message = err instanceof Error ? err.message : String(err);
-            return c.json({ error: message }, 500);
+            return c.json({ error: message }, workspaceErrorStatus(err));
         }
         // Emit a trace into the chat feed so the user sees the action
         const session = workspaceService.getActiveSession(id);
@@ -3638,7 +3663,7 @@ app.post('/:id/push', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/fetch — git fetch the workspace repo (all branches of origin).
@@ -3655,7 +3680,7 @@ app.post('/:id/fetch', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/pull — pull working branch from origin (fast-forward only)
@@ -3676,7 +3701,7 @@ app.post('/:id/pull', async (c) => {
                 return c.json({ error: err.message, code: 'dirty_worktree', operation: err.operation, status: err.status }, 409);
             }
             const message = err instanceof Error ? err.message : String(err);
-            return c.json({ error: message }, 500);
+            return c.json({ error: message }, workspaceErrorStatus(err));
         }
         // Emit a trace into the chat feed so the user sees the action
         const session = workspaceService.getActiveSession(id);
@@ -3685,7 +3710,7 @@ app.post('/:id/pull', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Rebase the workspace branch onto its source branch. */
@@ -3708,7 +3733,7 @@ app.post('/:id/rebase', async (c) => {
             return c.json({ error: err.message, code: 'dirty_worktree', operation: err.operation, status: err.status }, 409);
         }
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Merge the source branch into the workspace branch (non-fast-forward). */
@@ -3731,7 +3756,7 @@ app.post('/:id/merge', async (c) => {
             return c.json({ error: err.message, code: 'dirty_worktree', operation: err.operation, status: err.status }, 409);
         }
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Abort any in-progress merge or rebase in the worktree. */
@@ -3747,7 +3772,7 @@ app.post('/:id/git/abort', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Continue an in-progress merge, rebase or cherry-pick after resolution. */
@@ -3764,7 +3789,7 @@ app.post('/:id/git/continue', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Stage + commit all working-tree changes (recovery action for a dirty rebase/merge). */
@@ -3783,7 +3808,7 @@ app.post('/:id/git/commit-all', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Ask the workspace agent to inspect and commit the current working tree. */
@@ -3835,7 +3860,7 @@ app.post('/:id/git/discard', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Hand off merge/rebase conflicts to the workspace agent with an intelligent-resolution prompt. */
@@ -3906,7 +3931,7 @@ Start now.`;
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Change the base branch of an existing PR via the resolved forge provider. */
@@ -3943,7 +3968,7 @@ app.post('/:id/change-pr-base', async (c) => {
             return c.json({ error: err.message, code: 'forge_unavailable' }, 409);
         }
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Merge a ready, open PR/MR through its resolved forge provider. */
@@ -3980,7 +4005,7 @@ app.post('/:id/merge-pr', async (c) => {
             return c.json({ error: err.message, code: 'forge_unavailable' }, 409);
         }
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Delete the workspace branch from the remote after its PR/MR was merged. */
@@ -4005,7 +4030,7 @@ app.post('/:id/delete-remote-branch', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Re-target a workspace onto a new source branch (metadata + worktree + PR base). */
@@ -4077,13 +4102,17 @@ app.post('/:id/cancel-source-change', async (c) => {
         if (backups.length === 0) {
             return c.json({ error: 'No backup branch found — cannot auto-restore', code: 'no_backup' }, 409);
         }
-        gitOps.restoreBranchFromBackup(workspace.worktreePath, workspace.workingBranch, backups[0]);
+        if (agentManager.hasController(id))
+            return c.json({ error: 'Stop the agent before restoring the branch' }, 409);
+        await withGitRepoLock(workspace.worktreePath, async () => {
+            gitOps.restoreBranchFromBackup(workspace.worktreePath, workspace.workingBranch, backups[0]);
+        });
         workspaceService.updateWorkspaceSourceBranch(id, body.previousBase);
         return c.json({ success: true, restoredFrom: backups[0] });
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** Force-push the working branch with --force-with-lease (after a history rewrite). */
@@ -4119,7 +4148,7 @@ app.post('/:id/force-push', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/open-pr — create a GitHub PR and send a templated prompt to the agent
@@ -4239,7 +4268,7 @@ app.post('/:id/open-pr', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/start-review — ask the agent to review committed + uncommitted changes
@@ -4302,11 +4331,12 @@ app.post('/:id/start-review', async (c) => {
         if (newSession) {
             // Stop current agent, wait for it, then start fresh.
             try {
-                await agentManager.stopAgentAndWait(workspace.id);
+                assertAgentStopped(await agentManager.stopAgentAndWait(workspace.id, undefined, 'replacement'));
             }
             catch (err) {
                 const msg = err instanceof Error ? err.message : String(err);
                 console.error(`[start-review] stopAgentAndWait failed (continuing): ${msg}`);
+                throw err;
             }
             try {
                 const agent = agentManager.startAgent(workspace.id, worktreePath, rendered, workspace.model, false /* resume */, workspace.agentPermissionMode, undefined, workspace.reasoningEffort);
@@ -4339,7 +4369,7 @@ app.post('/:id/start-review', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/start-ci-fix — dispatch the configured CI-fix
@@ -4405,7 +4435,7 @@ app.post('/:id/start-ci-fix', migrationGuard, async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /**
@@ -4435,7 +4465,7 @@ app.post('/:id/dismiss-pr-attention', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /**
@@ -4461,7 +4491,7 @@ app.post('/:id/restore-pr-attention', async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 /** POST /api/workspaces/:id/mark-read — mark workspace as read (clear unread indicator). */
@@ -4478,7 +4508,7 @@ app.post('/:id/mark-read', (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/stop — stop agent
@@ -4491,11 +4521,12 @@ app.post('/:id/stop', migrationGuard, async (c) => {
         }
         try {
             // The response says "stopped": make that true before returning.
-            await agentManager.stopAgentAndWait(id);
+            assertAgentStopped(await agentManager.stopAgentAndWait(id));
         }
         catch (err) {
             // Agent may not be tracked (e.g. server restarted) — just update status
             console.error(`[workspaces] stopAgentAndWait on manual stop failed for '${id}':`, err);
+            throw err;
         }
         // Always transition to idle so the UI reflects the stopped state
         try {
@@ -4508,7 +4539,7 @@ app.post('/:id/stop', migrationGuard, async (c) => {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 // POST /api/workspaces/:id/interrupt — soft-interrupt agent (SIGINT, like Escape in Claude Code)
@@ -4555,7 +4586,7 @@ app.post('/:id/interrupt', migrationGuard, async (c) => {
             const status = err.code === 'interrupt_failed' ? 500 : 409;
             return c.json({ error: message, code: err.code }, status);
         }
-        return c.json({ error: message }, 500);
+        return c.json({ error: message }, workspaceErrorStatus(err));
     }
 });
 export default app;