Merge pull request #18 from mariuspruvot/fix/deleted-pr-branch

fix(container): surface clear error when PR branch is deleted

Author: mariuspruvot

CLAUDE.md

@@ -51,7 +51,7 @@ infra/
 - **Conversation UI**: frontend renders session output as a structured conversation with markdown (react-markdown + remark-gfm), syntax highlighting (shiki with JS regex engine), diff coloring, and collapsible tool_use/thinking blocks. Components: `ConversationOutput` (scroll container) -> `MessageBlock` (role dispatch) -> `MarkdownContent` / `CodeBlock` / `ToolUseBlock` / `ThinkingBlock`. Data flows as `StreamMessage[]` (structured content blocks) instead of flat text lines.
 - **Session persistence**: stream-json events are batch-persisted to `session_events` table (JSONB) during SSE streaming via `stream_and_persist()`. Completed sessions can be replayed from `GET /sessions/{id}/events`. The streaming pipeline is layered: `stream_events()` (raw tuples) -> `stream_and_persist()` (SSE + DB writes) or `stream_output()` (SSE only, for tests).
 - **Multi-turn via per-turn invocations**: `--input-format stream-json` exits after each turn (by design). The entrypoint runs `claude -p` for the first turn, then loops reading user messages from a FIFO and calling `claude -c -p` (--continue) for each subsequent turn. Each invocation emits its own `system` init + `result` events — frontend should expect multiple `system`/`result` events per session.
-- **Stream-json protocol**: containers emit NDJSON with 5 event types: `system` (init/retry), `assistant` (one event per content block — thinking/text/tool_use), `user` (tool_result), `result` (turn end + metadata), `rate_limit_event`. The `result.result` field duplicates the last assistant text — only display assistant events, use result for status only. No `--include-partial-messages` flag, so no `stream_event` deltas.
+- **Stream-json protocol**: containers emit NDJSON with 5 event types: `system` (init/retry), `assistant` (one event per content block — thinking/text/tool_use), `user` (tool_result), `result` (turn end + metadata), `rate_limit_event`. The `result.result` field duplicates the last assistant text — only display assistant events, use result for status only. No `--include-partial-messages` flag, so no `stream_event` deltas. A 6th type `error` (`{"type":"error","error":{"message":"..."}}`) is emitted by the entrypoint when setup fails (clone/checkout errors). The SSE `done` event includes both `message` and `status` fields — frontend uses `status` to distinguish `completed` vs `failed`.
 - **API prefix**: all routes under `/api/v1`
 - **Admin panel**: SQLAdmin at `/admin`, configured in `admin/views.py`
 

apps/api/src/helprs/modules/container/router.py

@@ -158,15 +158,17 @@ async def _event_stream():
             # Stream ended naturally — container exited.
             # Mark session completed in DB and send done event to frontend.
             msg = "Session completed."
+            status = "completed"
             try:
                 async with get_db_context() as db_ctx:
-                    result = await mark_completed(db_ctx, session_id, docker)
-                    if result.status == ContainerStatus.FAILED:
+                    completed = await mark_completed(db_ctx, session_id, docker)
+                    status = completed.status.value
+                    if completed.status == ContainerStatus.FAILED:
                         msg = "Session failed."
             except Exception:
                 pass  # Best effort; cleanup task handles stragglers
 
-            yield f"event: done\ndata: {json.dumps({'message': msg})}\n\n"
+            yield f"event: done\ndata: {json.dumps({'message': msg, 'status': status})}\n\n"
         finally:
             await docker.close()
 

apps/web/src/features/session/ContainerSession.tsx

@@ -263,12 +263,17 @@ export default function ContainerSession({
         if (!mountedRef.current) return
         source.close()
         eventSourceRef.current = null
-        setStatus('completed')
         setIsThinking(false)
         try {
-          const parsed = JSON.parse(event.data as string) as { message?: string }
+          const parsed = JSON.parse(event.data as string) as { message?: string; status?: string }
+          const finalStatus = parsed.status === 'failed' ? 'failed' : 'completed'
+          setStatus(finalStatus as ContainerStatus)
+          if (finalStatus === 'failed') {
+            setError(parsed.message ?? 'Session failed.')
+          }
           appendStatus(parsed.message ?? 'Session completed.')
         } catch {
+          setStatus('completed')
           appendStatus('Session completed.')
         }
       })

apps/web/src/features/session/containerTypes.ts

@@ -138,11 +138,17 @@ interface ResultEvent {
   duration_ms?: number
 }
 
+interface ErrorEvent {
+  type: 'error'
+  error: { message: string }
+}
+
 type StreamJsonEvent =
   | AssistantEvent
   | SystemEvent
   | ResultEvent
   | UserEvent
+  | ErrorEvent
   | { type: 'rate_limit_event' }
   | { type: 'stream_event' }
   | { type: string }
@@ -216,6 +222,16 @@ export function parseStreamMessage(raw: string): Omit<StreamMessage, 'id' | 'tim
       return null
     }
 
+    // Entrypoint error events — emitted when setup fails (e.g. deleted branch).
+    case 'error': {
+      const err = event as ErrorEvent
+      return {
+        role: 'result',
+        blocks: [{ type: 'text', text: err.error?.message ?? 'Unknown error' }],
+        isError: true,
+      }
+    }
+
     // rate_limit_event, stream_event, unknown — hide
     default:
       return null

infra/docker/claude-runner/entrypoint.sh

@@ -11,16 +11,34 @@ cleanup() {
 }
 trap cleanup SIGTERM SIGINT
 
+# Emit a structured error event to stdout so the SSE pipeline relays it
+# to the frontend before the container exits.
+emit_error() {
+  local msg="$1"
+  # Escape backslashes and double quotes for JSON safety
+  msg="${msg//\\/\\\\}"
+  msg="${msg//\"/\\\"}"
+  printf '{"type":"error","error":{"message":"%s"}}\n' "$msg"
+}
+
 # gh CLI auto-detects GITHUB_TOKEN env var -- no explicit login needed.
 gh auth status > /dev/null 2>&1 || {
-  echo "ERROR: GitHub authentication failed" >&2
+  emit_error "GitHub authentication failed. The token may be expired or invalid."
   exit 1
 }
 
-# Clone the repo and check out the PR branch
-gh repo clone "$REPO_FULL_NAME" /workspace
+# Clone the repo and check out the PR branch.
+# Errors from gh/git go to stderr (invisible to our stdout-only stream),
+# so we emit a structured error event before exiting on failure.
+gh repo clone "$REPO_FULL_NAME" /workspace || {
+  emit_error "Failed to clone repository ${REPO_FULL_NAME}. It may have been deleted or made private."
+  exit 1
+}
 cd /workspace
-gh pr checkout "$PR_NUMBER"
+gh pr checkout "$PR_NUMBER" || {
+  emit_error "Failed to checkout PR #${PR_NUMBER}. The branch may have been deleted after the PR was merged."
+  exit 1
+}
 
 # Fetch PR metadata for the prompt context
 PR_TITLE=$(gh pr view "$PR_NUMBER" --json title --jq '.title')