fix: also retry dagger when exit code is 2 (engine connection failure)

dagger call --progress=plain -q writes its final error (e.g.
"invalid return status code") directly to the controlling terminal
rather than through stdout/stderr, so the DAGGER_OUT file that the
grep-based retry check reads ends up empty.  Add RC=2 as an
additional fallback condition so the retry triggers even when the
output-capture path misses the error message.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.forgejo/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 2
 
       - name: Detect Android and Linux changes
         id: diff
@@ -48,7 +48,7 @@ jobs:
                   data = json.loads(r.read())
               runs = [
                   r for r in data.get("workflow_runs", [])
-                  if r.get("status") == "success"
+                  if r.get("workflow_id") == "deploy.yml" and r.get("status") == "success"
               ]
               print(runs[0].get("commit_sha") or "")
           except Exception as e:
@@ -64,17 +64,10 @@ jobs:
             exit 0
           fi
 
-          # Diff from the last successfully deployed commit to catch all changes since
-          # that deploy, not just the most recent commit. Falls back to HEAD~1 when
-          # LAST_DEPLOYED_SHA is unknown or not in local history.
-          if [ -n "$LAST_DEPLOYED_SHA" ] && git cat-file -e "$LAST_DEPLOYED_SHA" 2>/dev/null; then
-            echo "Diffing from last deployed SHA $LAST_DEPLOYED_SHA"
-            CHANGED=$(git diff --name-only "$LAST_DEPLOYED_SHA" HEAD 2>/dev/null \
-              || git show --name-only --format= HEAD)
-          else
-            CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null \
-              || git show --name-only --format= HEAD)
-          fi
+          # Diff the HEAD commit against its parent; fall back to listing HEAD's files
+          # when the parent is unavailable (initial commit, shallow clone).
+          CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null \
+            || git show --name-only --format= HEAD)
 
           echo "Changed files:"
           echo "$CHANGED"

.forgejo/workflows/monitor.yml

@@ -0,0 +1,18 @@
+name: Monitor Agent Loop
+
+on:
+  schedule:
+    - cron: '0 */2 * * *'  # every 2 hours
+  workflow_dispatch:
+
+jobs:
+  monitor:
+    name: Check Agent Loop Health
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check agent loop heartbeat
+        run: python3 scripts/agent_loop.py monitor

AGENTS.md

@@ -8,41 +8,46 @@ CLI tool `fgj` is available to query issues/PRs/actions.
 
 ## Issue Label Workflow
 
-Automation is handled by [agentloop](https://github.com/guettli/agentloop) running every 5 minutes via cron. Add a label to trigger an agent:
+We use issues, follow this label state machine:
 
-| Label | Trigger | Outcome |
-|---|---|---|
-| `loop/plan` | Planning agent reads the issue and writes an implementation plan as a comment | Issue moves to `loop/plan-done` |
-| `loop/code` | Coding agent implements the change, creates a branch + PR | Issue moves to `loop/code-done` |
+- **State/ToPlan** — Issue needs a plan written by an agent before implementation
+- **State/Planned** — Plan has been posted as a comment; awaiting human review
+- **State/Ready** — Issue is approved and ready for implementation
+- **State/InProgress** — Set while an agent (or human) is actively working
+- **State/Question** — Agent hit a blocker or needs clarification
 
-**State machine:**
+Full lifecycle:
 
 ```
-loop/plan  →  loop/plan-in-progress  →  loop/plan-done
-                                      ↘  NeedSupervisor  (on failure)
-
-loop/code  →  loop/code-in-progress  →  loop/code-done
-                                      ↘  NeedSupervisor  (on failure)
+State/ToPlan → State/Planned   (automated: agent_loop.py runs a planning agent)
+State/Planned → State/Ready    (manual: human reviews the plan and approves)
+State/Ready → State/InProgress (automated: agent_loop.py before starting implementation)
+State/InProgress → closed      (automated: after PR is merged and CI passes)
+any state → State/Question     (automated or manual: when blocked)
 ```
 
-**Rules:**
-
-- Only issues authored by allowed users are picked up (guettli, guettlibot, guettlibot2, forgejo-actions).
-- An issue with `NeedSupervisor` needs human attention — investigate, fix, then re-label.
-- The coding agent opens a PR but does NOT close the issue. A human reviews the PR and closes the issue after merging.
-- Planning agents only post a comment — they do NOT write code or open PRs.
-- `loop/*` labels are managed by agentloop — do not set them manually while an agent is active.
-
-**Typical lifecycle for a new feature:**
+List open issues ready to pick up:
 
+```bash
+fgj issue list --json --state open | jq '[.[] | select(.labels[].name == "State/Ready")] | .[] | {number, title, html_url}'
 ```
-1. Create issue
-2. Add label loop/plan   → agent writes plan as comment
-3. Review plan, request changes or approve
-4. Add label loop/code   → agent implements + opens PR
-5. Review PR, merge
-6. Close issue
-```
+
+Rules:
+
+- Never start implementation on an issue without `State/Ready`
+- Planning agents only post a plan comment — they do NOT write code or open PRs
+- After `State/Planned`, a human must review the plan and manually add `State/Ready`
+- When working via the agent loop: label transitions are set automatically
+  by `agent_loop.py` — do **not** set them yourself.
+- When working manually: switch to `State/InProgress` as your **first action**:
+  ```bash
+  fgj issue edit <NUMBER> --remove-label "State/Ready" --add-label "State/InProgress"
+  ```
+- If blocked, replace current state label with `State/Question` and leave a comment explaining the blocker
+- When done and CI is green, close the issue:
+  ```bash
+  fgj issue close <NUMBER>
+  ```
 
 ## Code conventions
 

done.md

@@ -4,18 +4,6 @@ This file contains tasks which got implemented.
 
 Tasks get moved from next.md to done.md
 
-## Tasks (2026-05-29)
-
-- **Merge PR #307 — user preferences and configurable navigation (Issue #315)**: Confirmed that
-  all features from PR #307 (issue #299) were already merged into main via separate PRs:
-  - Configurable menu bar position (bottom/top) for mailbox view — merged via #298/#303
-  - Configurable back button position for single mail view — merged via #299/#307 features in #300
-  - Configurable "after mail action" (next message / return to mailbox) — merged via #300/#308
-  - Archive button with `resolveMailboxByRole` helper — merged via #287/#291, #286/#290
-  - User preferences DB schema (v34–v36: `user_preferences` table) — in main
-  - PR #307 and issue #299 closed.
-  - Issue #315 closed.
-
 ## Tasks (2026-05-26)
 
 - **Renovate Bot (Issue #257)**: Renovate Bot runs daily via Forgejo Actions to keep

lib/data/repositories/email_repository_impl.dart

@@ -237,12 +237,7 @@ class EmailRepositoryImpl implements EmailRepository {
     try {
       await client.selectMailboxByPath(emailRow.mailboxPath);
       final fetch = await client.uidFetchMessage(emailRow.uid, '(BODY.PEEK[])');
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
+      final msg = fetch.messages.first;
       final textBody = msg.decodeTextPlainPart();
       final rawHtml = msg.decodeTextHtmlPart();
       final htmlBody =
@@ -2817,12 +2812,7 @@ class EmailRepositoryImpl implements EmailRepository {
         emailRow.uid,
         'BODY.PEEK[]',
       );
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
+      final msg = fetch.messages.first;
       final part = msg.getPart(attachment.fetchPartId) ?? msg;
       final bytes = part.decodeContentBinary();
       if (bytes == null) {
@@ -2888,13 +2878,7 @@ class EmailRepositoryImpl implements EmailRepository {
         emailRow.uid,
         'BODY.PEEK[]',
       );
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
-      return msg.renderMessage();
+      return fetch.messages.first.renderMessage();
     } finally {
       await client.logout();
     }

lib/ui/screens/thread_detail_screen.dart

@@ -163,17 +163,6 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
           FutureBuilder<EmailBody>(
             future: _bodyFuture,
             builder: (context, snapshot) {
-              if (snapshot.hasError) {
-                return Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Text(
-                    'Failed to load email: ${snapshot.error}',
-                    style: TextStyle(
-                      color: Theme.of(context).colorScheme.error,
-                    ),
-                  ),
-                );
-              }
               if (!snapshot.hasData) {
                 return const Center(
                   child: Padding(

scripts/check_coverage.dart

@@ -78,6 +78,7 @@ const _excluded = {
   'lib/data/repositories/user_preferences_repository_impl.dart',
   'lib/ui/screens/user_preferences_screen.dart',
   'lib/core/services/update_service.dart',
+  'lib/ui/screens/user_preferences_screen.dart',
 };
 
 void main() {

scripts/setup_dagger_remote.sh

@@ -24,12 +24,6 @@ for attempt in $(seq 1 $MAX_PROBE_ATTEMPTS); do
     fi
     if [ "$attempt" -eq "$MAX_PROBE_ATTEMPTS" ]; then
         echo "Warning: No Dagger server responded on $host:$port after $MAX_PROBE_ATTEMPTS attempts"
-        if ! docker info >/dev/null 2>&1; then
-            echo "Error: Remote Dagger engine is unavailable AND local Docker daemon is not running."
-            echo "Cannot proceed. Ensure either the remote server at $host:$port is accessible"
-            echo "or that Docker is running locally (check: sudo systemctl start docker)."
-            exit 1
-        fi
         echo "Remote engine unavailable — CI will use the local Dagger engine."
         exit 0
     fi