[codex] Harden heartbeat scheduling and runtime controls (#4223)

## Thinking Path > - Paperclip orchestrates AI agents through issue checkout, heartbeat runs, routines, and auditable control-plane state > - The runtime path has to recover from lost local processes, transient adapter failures, blocked dependencies, and routine coalescing without stranding work > - The existing branch carried several reliability fixes across heartbeat scheduling, issue runtime controls, routine dispatch, and operator-facing run state > - These changes belong together because they share backend contracts, migrations, and runtime status semantics > - This pull request groups the control-plane/runtime slice so it can merge independently from board UI polish and adapter sandbox work > - The benefit is safer heartbeat recovery, clearer runtime controls, and more predictable recurring execution behavior ## What Changed - Adds bounded heartbeat retry scheduling, scheduled retry state, and Codex transient failure recovery handling. - Tightens heartbeat process recovery, blocker wake behavior, issue comment wake handling, routine dispatch coalescing, and activity/dashboard bounds. - Adds runtime-control MCP tools and Paperclip skill docs for issue workspace runtime management. - Adds migrations `0061_lively_thor_girl.sql` and `0062_routine_run_dispatch_fingerprint.sql`. - Surfaces retry state in run ledger/agent UI and keeps related shared types synchronized. ## Verification - `pnpm exec vitest run server/src/__tests__/heartbeat-retry-scheduling.test.ts server/src/__tests__/heartbeat-process-recovery.test.ts server/src/__tests__/routines-service.test.ts` - `pnpm exec vitest run src/tools.test.ts` from `packages/mcp-server` ## Risks - Medium risk: this touches heartbeat recovery and routine dispatch, which are central execution paths. - Migration order matters if split branches land out of order: merge this PR before branches that assume the new runtime/routine fields. - Runtime retry behavior should be watched in CI and in local operator smoke tests because it changes how transient failures are resumed. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5-based coding agent runtime, shell/git tool use enabled. Exact hosted model build and context window are not exposed in this Paperclip heartbeat environment. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [ ] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge
2026-04-25 17:25:15 +02:00 · 2026-04-21 12:24:11 -05:00
parent ab9051b595
commit 09d0678840
61 changed files with 17622 additions and 456 deletions
--- a/ui/src/api/activity.ts
+++ b/ui/src/api/activity.ts
@@ -15,6 +15,11 @@ export interface RunForIssue {
  usageJson: Record<string, unknown> | null;
  resultJson: Record<string, unknown> | null;
  logBytes?: number | null;
+  retryOfRunId?: string | null;
+  scheduledRetryAt?: string | null;
+  scheduledRetryAttempt?: number;
+  scheduledRetryReason?: string | null;
+  retryExhaustedReason?: string | null;
  livenessState?: RunLivenessState | null;
  livenessReason?: string | null;
  continuationAttempt?: number;
@@ -31,11 +36,12 @@ export interface IssueForRun {
 }

 export const activityApi = {
-  list: (companyId: string, filters?: { entityType?: string; entityId?: string; agentId?: string }) => {
+  list: (companyId: string, filters?: { entityType?: string; entityId?: string; agentId?: string; limit?: number }) => {
    const params = new URLSearchParams();
    if (filters?.entityType) params.set("entityType", filters.entityType);
    if (filters?.entityId) params.set("entityId", filters.entityId);
    if (filters?.agentId) params.set("agentId", filters.agentId);
+    if (filters?.limit) params.set("limit", String(filters.limit));
    const qs = params.toString();
    return api.get<ActivityEvent[]>(`/companies/${companyId}/activity${qs ? `?${qs}` : ""}`);
  },
--- a/ui/src/components/ActivityCharts.test.tsx
+++ b/ui/src/components/ActivityCharts.test.tsx
@@ -65,6 +65,9 @@ function createRun(overrides: Partial<HeartbeatRun> = {}): HeartbeatRun {
    processStartedAt: null,
    retryOfRunId: null,
    processLossRetryCount: 0,
+    scheduledRetryAt: null,
+    scheduledRetryAttempt: 0,
+    scheduledRetryReason: null,
    livenessState: null,
    livenessReason: null,
    continuationAttempt: 0,
--- a/ui/src/components/IssueRunLedger.test.tsx
+++ b/ui/src/components/IssueRunLedger.test.tsx
@@ -192,6 +192,40 @@ describe("IssueRunLedger", () => {
    expect(container.textContent).not.toContain("initial attempt");
  });

+  it("surfaces scheduled retry timing and exhaustion state without opening logs", () => {
+    renderLedger({
+      runs: [
+        createRun({
+          runId: "run-scheduled",
+          status: "scheduled_retry",
+          finishedAt: null,
+          livenessState: null,
+          livenessReason: null,
+          retryOfRunId: "run-root",
+          scheduledRetryAt: "2026-04-18T20:15:00.000Z",
+          scheduledRetryAttempt: 2,
+          scheduledRetryReason: "transient_failure",
+        }),
+        createRun({
+          runId: "run-exhausted",
+          status: "failed",
+          createdAt: "2026-04-18T19:57:00.000Z",
+          retryOfRunId: "run-root",
+          scheduledRetryAttempt: 4,
+          scheduledRetryReason: "transient_failure",
+          retryExhaustedReason: "Bounded retry exhausted after 4 scheduled attempts; no further automatic retry will be queued",
+        }),
+      ],
+    });
+
+    expect(container.textContent).toContain("Retry scheduled");
+    expect(container.textContent).toContain("Attempt 2");
+    expect(container.textContent).toContain("Transient failure");
+    expect(container.textContent).toContain("Next retry");
+    expect(container.textContent).toContain("Retry exhausted");
+    expect(container.textContent).toContain("No further automatic retry queued");
+  });
+
  it("shows timeout, cancel, and budget stop reasons without raw logs", () => {
    renderLedger({
      runs: [
--- a/ui/src/components/IssueRunLedger.tsx
+++ b/ui/src/components/IssueRunLedger.tsx
@@ -7,6 +7,7 @@ import { heartbeatsApi, type ActiveRunForIssue, type LiveRunForIssue } from "../
 import { cn, relativeTime } from "../lib/utils";
 import { queryKeys } from "../lib/queryKeys";
 import { keepPreviousDataForSameQueryTail } from "../lib/query-placeholder-data";
+import { describeRunRetryState } from "../lib/runRetryState";

 type IssueRunLedgerProps = {
  issueId: string;
@@ -80,6 +81,12 @@ const PENDING_LIVENESS_COPY: LivenessCopy = {
  description: "Liveness is evaluated after the run finishes.",
 };

+const RETRY_PENDING_LIVENESS_COPY: LivenessCopy = {
+  label: "Retry pending",
+  tone: "border-cyan-500/30 bg-cyan-500/10 text-cyan-700 dark:text-cyan-300",
+  description: "Paperclip queued an automatic retry that has not started yet.",
+};
+
 const MISSING_LIVENESS_COPY: LivenessCopy = {
  label: "No liveness data",
  tone: "border-border bg-background text-muted-foreground",
@@ -174,10 +181,12 @@ function runSummary(run: LedgerRun, agentMap: ReadonlyMap<string, Pick<Agent, "n
  const agentName = compactAgentName(run, agentMap);
  if (run.status === "running") return `Running now by ${agentName}`;
  if (run.status === "queued") return `Queued for ${agentName}`;
+  if (run.status === "scheduled_retry") return `Automatic retry scheduled for ${agentName}`;
  return `${statusLabel(run.status)} by ${agentName}`;
 }

 function livenessCopyForRun(run: LedgerRun) {
+  if (run.status === "scheduled_retry") return RETRY_PENDING_LIVENESS_COPY;
  if (run.livenessState) return LIVENESS_COPY[run.livenessState];
  return isActiveRun(run) ? PENDING_LIVENESS_COPY : MISSING_LIVENESS_COPY;
 }
@@ -204,6 +213,7 @@ function stopReasonLabel(run: RunForIssue) {

 function stopStatusLabel(run: LedgerRun, stopReason: string | null) {
  if (stopReason) return stopReason;
+  if (run.status === "scheduled_retry") return "Retry pending";
  if (run.status === "queued") return "Waiting to start";
  if (run.status === "running") return "Still running";
  if (!run.livenessState) return "Unavailable";
@@ -211,6 +221,7 @@ function stopStatusLabel(run: LedgerRun, stopReason: string | null) {
 }

 function lastUsefulActionLabel(run: LedgerRun) {
+  if (run.status === "scheduled_retry") return "Waiting for next attempt";
  if (run.lastUsefulActionAt) return relativeTime(run.lastUsefulActionAt);
  if (isActiveRun(run)) return "No action recorded yet";
  if (run.livenessState === "plan_only" || run.livenessState === "needs_followup") {
@@ -251,7 +262,7 @@ export function IssueRunLedger({
  const { data: runs } = useQuery({
    queryKey: queryKeys.issues.runs(issueId),
    queryFn: () => activityApi.runsForIssue(issueId),
-    refetchInterval: hasLiveRuns ? 5000 : false,
+    refetchInterval: hasLiveRuns || issueStatus === "in_progress" ? 5000 : false,
    placeholderData: keepPreviousDataForSameQueryTail<RunForIssue[]>(issueId),
  });
  const { data: liveRuns } = useQuery({
@@ -361,6 +372,7 @@ export function IssueRunLedgerContent({
            const duration = formatDuration(run.startedAt, run.finishedAt);
            const exhausted = hasExhaustedContinuation(run);
            const continuation = continuationLabel(run);
+            const retryState = describeRunRetryState(run);
            return (
              <article key={run.runId} className="space-y-2 px-3 py-3">
                <div className="flex flex-wrap items-center gap-2">
@@ -396,6 +408,16 @@ export function IssueRunLedgerContent({
                  {continuation ? (
                    <span className="text-[11px] text-muted-foreground">{continuation}</span>
                  ) : null}
+                  {retryState ? (
+                    <span
+                      className={cn(
+                        "rounded-md border px-1.5 py-0.5 text-[11px] font-medium",
+                        retryState.tone,
+                      )}
+                    >
+                      {retryState.badgeLabel}
+                    </span>
+                  ) : null}
                </div>

                <div className="grid gap-2 text-xs text-muted-foreground sm:grid-cols-3">
@@ -413,6 +435,24 @@ export function IssueRunLedgerContent({
                  </div>
                </div>

+                {retryState ? (
+                  <div className="rounded-md border border-border/70 bg-accent/20 px-2 py-2 text-xs leading-5 text-muted-foreground">
+                    {retryState.detail ? <p>{retryState.detail}</p> : null}
+                    {retryState.secondary ? <p>{retryState.secondary}</p> : null}
+                    {retryState.retryOfRunId ? (
+                      <p>
+                        Retry of{" "}
+                        <Link
+                          to={`/agents/${run.agentId}/runs/${retryState.retryOfRunId}`}
+                          className="font-mono text-foreground hover:underline"
+                        >
+                          {retryState.retryOfRunId.slice(0, 8)}
+                        </Link>
+                      </p>
+                    ) : null}
+                  </div>
+                ) : null}
+
                {run.livenessReason ? (
                  <p className="min-w-0 break-words text-xs leading-5 text-muted-foreground">
                    {run.livenessReason}
--- a/ui/src/components/StatusBadge.tsx
+++ b/ui/src/components/StatusBadge.tsx
@@ -9,7 +9,7 @@ export function StatusBadge({ status }: { status: string }) {
        statusBadge[status] ?? statusBadgeDefault
      )}
    >
-      {status.replace("_", " ")}
+      {status.replace(/_/g, " ")}
    </span>
  );
 }
--- a/ui/src/lib/runRetryState.test.ts
+++ b/ui/src/lib/runRetryState.test.ts
@@ -0,0 +1,42 @@
+import { describe, expect, it } from "vitest";
+import { describeRunRetryState, formatRetryReason } from "./runRetryState";
+
+describe("runRetryState", () => {
+  it("formats internal retry reasons for operators", () => {
+    expect(formatRetryReason("transient_failure")).toBe("Transient failure");
+    expect(formatRetryReason("issue_continuation_needed")).toBe("Continuation needed");
+    expect(formatRetryReason("custom_reason")).toBe("custom reason");
+  });
+
+  it("describes scheduled retries", () => {
+    expect(
+      describeRunRetryState({
+        status: "scheduled_retry",
+        retryOfRunId: "run-1",
+        scheduledRetryAttempt: 2,
+        scheduledRetryReason: "transient_failure",
+        scheduledRetryAt: "2026-04-18T20:15:00.000Z",
+      }),
+    ).toMatchObject({
+      kind: "scheduled",
+      badgeLabel: "Retry scheduled",
+      detail: "Attempt 2 · Transient failure",
+    });
+  });
+
+  it("describes exhausted retries", () => {
+    expect(
+      describeRunRetryState({
+        status: "failed",
+        retryOfRunId: "run-1",
+        scheduledRetryAttempt: 4,
+        scheduledRetryReason: "transient_failure",
+        retryExhaustedReason: "Bounded retry exhausted after 4 scheduled attempts; no further automatic retry will be queued",
+      }),
+    ).toMatchObject({
+      kind: "exhausted",
+      badgeLabel: "Retry exhausted",
+      detail: "Attempt 4 · Transient failure · No further automatic retry queued",
+    });
+  });
+});
--- a/ui/src/lib/runRetryState.ts
+++ b/ui/src/lib/runRetryState.ts
@@ -0,0 +1,93 @@
+import { formatDateTime } from "./utils";
+
+type RetryAwareRun = {
+  status: string;
+  retryOfRunId?: string | null;
+  scheduledRetryAt?: string | Date | null;
+  scheduledRetryAttempt?: number | null;
+  scheduledRetryReason?: string | null;
+  retryExhaustedReason?: string | null;
+};
+
+export type RunRetryStateSummary = {
+  kind: "scheduled" | "exhausted" | "attempted";
+  badgeLabel: string;
+  tone: string;
+  detail: string | null;
+  secondary: string | null;
+  retryOfRunId: string | null;
+};
+
+const RETRY_REASON_LABELS: Record<string, string> = {
+  transient_failure: "Transient failure",
+  missing_issue_comment: "Missing issue comment",
+  process_lost: "Process lost",
+  assignment_recovery: "Assignment recovery",
+  issue_continuation_needed: "Continuation needed",
+};
+
+function readNonEmptyString(value: unknown) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : null;
+}
+
+function joinFragments(parts: Array<string | null>) {
+  const filtered = parts.filter((part): part is string => Boolean(part));
+  return filtered.length > 0 ? filtered.join(" · ") : null;
+}
+
+export function formatRetryReason(reason: string | null | undefined) {
+  const normalized = readNonEmptyString(reason);
+  if (!normalized) return null;
+  return RETRY_REASON_LABELS[normalized] ?? normalized.replace(/_/g, " ");
+}
+
+export function describeRunRetryState(run: RetryAwareRun): RunRetryStateSummary | null {
+  const attempt =
+    typeof run.scheduledRetryAttempt === "number" && Number.isFinite(run.scheduledRetryAttempt) && run.scheduledRetryAttempt > 0
+      ? run.scheduledRetryAttempt
+      : null;
+  const attemptLabel = attempt ? `Attempt ${attempt}` : null;
+  const reasonLabel = formatRetryReason(run.scheduledRetryReason);
+  const retryOfRunId = readNonEmptyString(run.retryOfRunId);
+  const exhaustedReason = readNonEmptyString(run.retryExhaustedReason);
+  const dueAt = run.scheduledRetryAt ? formatDateTime(run.scheduledRetryAt) : null;
+  const hasRetryMetadata =
+    Boolean(retryOfRunId)
+    || Boolean(reasonLabel)
+    || Boolean(dueAt)
+    || Boolean(attemptLabel)
+    || Boolean(exhaustedReason);
+
+  if (!hasRetryMetadata) return null;
+
+  if (run.status === "scheduled_retry") {
+    return {
+      kind: "scheduled",
+      badgeLabel: "Retry scheduled",
+      tone: "border-cyan-500/30 bg-cyan-500/10 text-cyan-700 dark:text-cyan-300",
+      detail: joinFragments([attemptLabel, reasonLabel]),
+      secondary: dueAt ? `Next retry ${dueAt}` : "Next retry pending schedule",
+      retryOfRunId,
+    };
+  }
+
+  if (exhaustedReason) {
+    return {
+      kind: "exhausted",
+      badgeLabel: "Retry exhausted",
+      tone: "border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-300",
+      detail: joinFragments([attemptLabel, reasonLabel, "No further automatic retry queued"]),
+      secondary: exhaustedReason,
+      retryOfRunId,
+    };
+  }
+
+  return {
+    kind: "attempted",
+    badgeLabel: "Retried run",
+    tone: "border-slate-500/20 bg-slate-500/10 text-slate-700 dark:text-slate-300",
+    detail: joinFragments([attemptLabel, reasonLabel]),
+    secondary: null,
+    retryOfRunId,
+  };
+}
--- a/ui/src/lib/status-colors.ts
+++ b/ui/src/lib/status-colors.ts
@@ -43,6 +43,7 @@ export const statusBadge: Record<string, string> = {
  // Agent statuses
  active: "bg-green-100 text-green-700 dark:bg-green-900/50 dark:text-green-300",
  running: "bg-cyan-100 text-cyan-700 dark:bg-cyan-900/50 dark:text-cyan-300",
+  scheduled_retry: "bg-sky-100 text-sky-700 dark:bg-sky-900/50 dark:text-sky-300",
  paused: "bg-orange-100 text-orange-700 dark:bg-orange-900/50 dark:text-orange-300",
  idle: "bg-yellow-100 text-yellow-700 dark:bg-yellow-900/50 dark:text-yellow-300",
  archived: "bg-muted text-muted-foreground",
--- a/ui/src/pages/Activity.tsx
+++ b/ui/src/pages/Activity.tsx
@@ -1,11 +1,9 @@
 import { useEffect, useMemo, useState } from "react";
 import { useQuery } from "@tanstack/react-query";
+import type { ActivityEvent, Agent } from "@paperclipai/shared";
 import { activityApi } from "../api/activity";
 import { accessApi } from "../api/access";
 import { agentsApi } from "../api/agents";
-import { issuesApi } from "../api/issues";
-import { projectsApi } from "../api/projects";
-import { goalsApi } from "../api/goals";
 import { buildCompanyUserProfileMap } from "../lib/company-members";
 import { useCompany } from "../context/CompanyContext";
 import { useBreadcrumbs } from "../context/BreadcrumbContext";
@@ -21,7 +19,29 @@ import {
  SelectValue,
 } from "@/components/ui/select";
 import { History } from "lucide-react";
-import type { Agent } from "@paperclipai/shared";
+
+const ACTIVITY_PAGE_LIMIT = 200;
+
+function detailString(event: ActivityEvent, ...keys: string[]) {
+  const details = event.details;
+  for (const key of keys) {
+    const value = details?.[key];
+    if (typeof value === "string" && value.trim()) return value;
+  }
+  return null;
+}
+
+function activityEntityName(event: ActivityEvent) {
+  if (event.entityType === "issue") return detailString(event, "identifier", "issueIdentifier");
+  if (event.entityType === "project") return detailString(event, "projectName", "name", "title");
+  if (event.entityType === "goal") return detailString(event, "goalTitle", "title", "name");
+  return detailString(event, "name", "title");
+}
+
+function activityEntityTitle(event: ActivityEvent) {
+  if (event.entityType === "issue") return detailString(event, "issueTitle", "title");
+  return null;
+}

 export function Activity() {
  const { selectedCompanyId } = useCompany();
@@ -33,8 +53,8 @@ export function Activity() {
  }, [setBreadcrumbs]);

  const { data, isLoading, error } = useQuery({
-    queryKey: queryKeys.activity(selectedCompanyId!),
-    queryFn: () => activityApi.list(selectedCompanyId!),
+    queryKey: [...queryKeys.activity(selectedCompanyId!), { limit: ACTIVITY_PAGE_LIMIT }],
+    queryFn: () => activityApi.list(selectedCompanyId!, { limit: ACTIVITY_PAGE_LIMIT }),
    enabled: !!selectedCompanyId,
  });

@@ -44,24 +64,6 @@ export function Activity() {
    enabled: !!selectedCompanyId,
  });

-  const { data: issues } = useQuery({
-    queryKey: queryKeys.issues.list(selectedCompanyId!),
-    queryFn: () => issuesApi.list(selectedCompanyId!),
-    enabled: !!selectedCompanyId,
-  });
-
-  const { data: projects } = useQuery({
-    queryKey: queryKeys.projects.list(selectedCompanyId!),
-    queryFn: () => projectsApi.list(selectedCompanyId!),
-    enabled: !!selectedCompanyId,
-  });
-
-  const { data: goals } = useQuery({
-    queryKey: queryKeys.goals.list(selectedCompanyId!),
-    queryFn: () => goalsApi.list(selectedCompanyId!),
-    enabled: !!selectedCompanyId,
-  });
-
  const { data: companyMembers } = useQuery({
    queryKey: queryKeys.access.companyUserDirectory(selectedCompanyId!),
    queryFn: () => accessApi.listUserDirectory(selectedCompanyId!),
@@ -81,18 +83,22 @@ export function Activity() {

  const entityNameMap = useMemo(() => {
    const map = new Map<string, string>();
-    for (const i of issues ?? []) map.set(`issue:${i.id}`, i.identifier ?? i.id.slice(0, 8));
    for (const a of agents ?? []) map.set(`agent:${a.id}`, a.name);
-    for (const p of projects ?? []) map.set(`project:${p.id}`, p.name);
-    for (const g of goals ?? []) map.set(`goal:${g.id}`, g.title);
+    for (const event of data ?? []) {
+      const name = activityEntityName(event);
+      if (name) map.set(`${event.entityType}:${event.entityId}`, name);
+    }
    return map;
-  }, [issues, agents, projects, goals]);
+  }, [data, agents]);

  const entityTitleMap = useMemo(() => {
    const map = new Map<string, string>();
-    for (const i of issues ?? []) map.set(`issue:${i.id}`, i.title);
+    for (const event of data ?? []) {
+      const title = activityEntityTitle(event);
+      if (title) map.set(`${event.entityType}:${event.entityId}`, title);
+    }
    return map;
-  }, [issues]);
+  }, [data]);

  if (!selectedCompanyId) {
    return <EmptyState icon={History} message="Select a company to view activity." />;
--- a/ui/src/pages/AgentDetail.tsx
+++ b/ui/src/pages/AgentDetail.tsx
@@ -43,6 +43,7 @@ import { PackageFileTree, buildFileTree } from "../components/PackageFileTree";
 import { ScrollToBottom } from "../components/ScrollToBottom";
 import { formatCents, formatDate, relativeTime, formatTokens, visibleRunCostUsd } from "../lib/utils";
 import { cn } from "../lib/utils";
+import { describeRunRetryState } from "../lib/runRetryState";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Tabs } from "@/components/ui/tabs";
@@ -104,6 +105,7 @@ const runStatusIcons: Record<string, { icon: typeof CheckCircle2; color: string
  failed: { icon: XCircle, color: "text-red-600 dark:text-red-400" },
  running: { icon: Loader2, color: "text-cyan-600 dark:text-cyan-400" },
  queued: { icon: Clock, color: "text-yellow-600 dark:text-yellow-400" },
+  scheduled_retry: { icon: Clock, color: "text-sky-600 dark:text-sky-400" },
  timed_out: { icon: Timer, color: "text-orange-600 dark:text-orange-400" },
  cancelled: { icon: Slash, color: "text-neutral-500 dark:text-neutral-400" },
 };
@@ -2342,26 +2344,39 @@ function PromptsTab({
                </p>
              </div>
            </div>
-            {selectedFileExists && !selectedFileSummary?.deprecated && selectedOrEntryFile !== currentEntryFile && (
-              <Button
-                type="button"
-                size="sm"
-                variant="outline"
-                onClick={() => {
-                  if (confirm(`Delete ${selectedOrEntryFile}?`)) {
-                    deleteFile.mutate(selectedOrEntryFile, {
-                      onSuccess: () => {
-                        setSelectedFile(currentEntryFile);
-                        setDraft(null);
-                      },
-                    });
-                  }
-                }}
-                disabled={deleteFile.isPending}
-              >
-                Delete
-              </Button>
-            )}
+            <div className="flex items-center gap-2">
+              {!fileLoading && (
+                <CopyText
+                  text={displayValue}
+                  ariaLabel="Copy instructions file as markdown"
+                  title="Copy as markdown"
+                  copiedLabel="Copied"
+                  className="inline-flex h-8 w-8 items-center justify-center rounded-md border border-border text-muted-foreground hover:bg-accent hover:text-foreground"
+                >
+                  <Copy className="h-3.5 w-3.5" />
+                </CopyText>
+              )}
+              {selectedFileExists && !selectedFileSummary?.deprecated && selectedOrEntryFile !== currentEntryFile && (
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  onClick={() => {
+                    if (confirm(`Delete ${selectedOrEntryFile}?`)) {
+                      deleteFile.mutate(selectedOrEntryFile, {
+                        onSuccess: () => {
+                          setSelectedFile(currentEntryFile);
+                          setDraft(null);
+                        },
+                      });
+                    }
+                  }}
+                  disabled={deleteFile.isPending}
+                >
+                  Delete
+                </Button>
+              )}
+            </div>
          </div>

          {selectedFileExists && fileLoading && !selectedFileDetail ? (
@@ -3141,6 +3156,7 @@ function RunDetail({ run: initialRun, agentRouteId, adapterType, adapterConfig }
  const sessionChanged = run.sessionIdBefore && run.sessionIdAfter && run.sessionIdBefore !== run.sessionIdAfter;
  const sessionId = run.sessionIdAfter || run.sessionIdBefore;
  const hasNonZeroExit = run.exitCode !== null && run.exitCode !== 0;
+  const retryState = describeRunRetryState(run);

  return (
    <div className="space-y-4 min-w-0">
@@ -3295,6 +3311,30 @@ function RunDetail({ run: initialRun, agentRouteId, adapterType, adapterConfig }
                {run.signal && <span className="text-muted-foreground ml-1">(signal: {run.signal})</span>}
              </div>
            )}
+            {retryState && (
+              <div className="rounded-md border border-border/70 bg-accent/20 px-3 py-2 text-xs leading-5">
+                <div className="flex flex-wrap items-center gap-2">
+                  <span
+                    className={cn(
+                      "rounded-md border px-1.5 py-0.5 text-[11px] font-medium",
+                      retryState.tone,
+                    )}
+                  >
+                    {retryState.badgeLabel}
+                  </span>
+                  {retryState.retryOfRunId ? (
+                    <Link
+                      to={`/agents/${agentRouteId}/runs/${retryState.retryOfRunId}`}
+                      className="font-mono text-foreground hover:underline"
+                    >
+                      {retryState.retryOfRunId.slice(0, 8)}
+                    </Link>
+                  ) : null}
+                </div>
+                {retryState.detail ? <p className="mt-2 text-muted-foreground">{retryState.detail}</p> : null}
+                {retryState.secondary ? <p className="text-muted-foreground">{retryState.secondary}</p> : null}
+              </div>
+            )}
          </div>

          {/* Right column: metrics */}
--- a/ui/src/pages/Dashboard.tsx
+++ b/ui/src/pages/Dashboard.tsx
@@ -27,6 +27,8 @@ import { PageSkeleton } from "../components/PageSkeleton";
 import type { Agent, Issue } from "@paperclipai/shared";
 import { PluginSlotOutlet } from "@/plugins/slots";

+const DASHBOARD_ACTIVITY_LIMIT = 10;
+
 function getRecentIssues(issues: Issue[]): Issue[] {
  return [...issues]
    .sort((a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime());
@@ -58,8 +60,8 @@ export function Dashboard() {
  });

  const { data: activity } = useQuery({
-    queryKey: queryKeys.activity(selectedCompanyId!),
-    queryFn: () => activityApi.list(selectedCompanyId!),
+    queryKey: [...queryKeys.activity(selectedCompanyId!), { limit: DASHBOARD_ACTIVITY_LIMIT }],
+    queryFn: () => activityApi.list(selectedCompanyId!, { limit: DASHBOARD_ACTIVITY_LIMIT }),
    enabled: !!selectedCompanyId,
  });

--- a/ui/storybook/stories/data-viz-misc.stories.tsx
+++ b/ui/storybook/stories/data-viz-misc.stories.tsx
@@ -123,6 +123,10 @@ function makeHeartbeatRun(overrides: Partial<HeartbeatRun>): HeartbeatRun {
    processStartedAt: createdAt,
    retryOfRunId: null,
    processLossRetryCount: 0,
+    scheduledRetryAt: null,
+    scheduledRetryAttempt: 0,
+    scheduledRetryReason: null,
+    retryExhaustedReason: null,
    livenessState: "completed",
    livenessReason: null,
    continuationAttempt: 0,