@monster-orange/den 0.4.8 → 0.4.10

package/src/ui/cli/usage-command.ts

@@ -1,8 +1,10 @@
 /**
  * `<cli> usage` (den#6): how agents spend tokens and time, read from the
  * runtimes' own transcripts on this machine (usage sources, plugin kind
- * `usage`). Nothing is sent anywhere: it reads local files and writes
- * local files.
+ * `usage`). None of it is sent anywhere: it reads local files and writes
+ * local files. The one question it asks outside: when an agent ran
+ * `gh pr merge`, `gh pr view <ref> --json number,state` confirms the merge
+ * (gh-pr-state.ts) before it counts.
  *
  *   agents [-w <ws>] [--json]    each agent's tokens and outcome (PR opened
  *                                or merged, tests green, wall-clock), joined
@@ -15,10 +17,15 @@
 import * as fs from "fs";
 import * as path from "path";
 import {
+  agentFilesDir,
   listRecords,
   readRecord,
   writeRecord,
 } from "../../shared/agents/records.js";
+import { clearDue, markDue } from "../../shared/agents/rotation.js";
+import { ghPrState } from "../../shared/git/gh-pr-state.js";
+import type { PrStateCheck } from "../../shared/usage/report.js";
+import { readAgentsConfig } from "../../shared/den-config.js";
 import { getStateDir } from "../../shared/paths.js";
 import { product } from "../../shared/product.js";
 import {
@@ -48,11 +55,14 @@ export const USAGE_HELP = {
     "",
     "{cli} usage agents [-w <ws>] [--json]",
     "    each agent's tokens and outcome (pull request opened or merged, tests",
-    "    green, wall-clock), joined on its conversation id, and saved in its",
-    "    record; then the share of agents with both",
+    "    green, wall-clock), compactions and rotations, joined on its",
+    "    conversation id, and saved in its record; then the share of agents",
+    "    with both. A merged pull request makes the agent's rotation due",
     "{cli} usage report [--days <n>] [--json]",
     "    the last n days (default 7): tokens, context re-reads, polling, denials,",
-    "    tool errors, corrections, subagents on Opus; written to",
+    "    tool errors, corrections, subagents on Opus, the longest session's context",
+    "    per call, the share of re-reads from never-ending sessions (more",
+    "    compactions than agents.rotate.after_compactions), rotations; written to",
     "    <state dir>/usage/<date>.json and .md, compared with the last report",
   ],
 };
@@ -64,6 +74,37 @@ export interface UsageDeps {
   out?: (line: string) => void;
   err?: (line: string) => void;
   cli?: string;
+  /** agents.rotate (default: the org config's). */
+  rotateAfter?: () => { afterCompactions: number } | undefined;
+  /**
+   * A pull request's state, to confirm a `gh pr merge` the agent ran
+   * (default: `gh pr view <ref> --json number,state` in the agent's folder).
+   */
+  prState?: PrStateCheck;
+}
+
+/**
+ * The check, counting how often gh ran (`asked`) and how often it could not
+ * run because gh is not installed (`missing`); the summary says both.
+ */
+function counted(
+  f: NonNullable<UsageDeps["prState"]>,
+): NonNullable<UsageDeps["prState"]> & { asked: number; missing: number } {
+  const g = Object.assign(
+    async (ref: string, o: { repo?: string; cwd: string }) => {
+      try {
+        const st = await f(ref, o);
+        g.asked++;
+        return st;
+      } catch (e) {
+        if ((e as NodeJS.ErrnoException)?.code === "ENOENT") g.missing++;
+        else g.asked++;
+        throw e;
+      }
+    },
+    { asked: 0, missing: 0 },
+  );
+  return g;
 }
 
 function resolve(d: UsageDeps) {
@@ -74,6 +115,8 @@ function resolve(d: UsageDeps) {
     out: d.out ?? ((l: string) => console.log(l)),
     err: d.err ?? ((l: string) => console.error(l)),
     cli: d.cli ?? product().cli,
+    rotateLimit: () => rotateLimit(d),
+    prState: counted(d.prState ?? ghPrState(d.env ?? process.env)),
   };
 }
 
@@ -92,7 +135,11 @@ const mins = (ms?: number) =>
       ? `${Math.round(ms / 60_000)}m`
       : `${(ms / 3_600_000).toFixed(1)}h`;
 
-/** Save each attributed row's usage and outcome in its agent record. */
+/**
+ * Save each attributed row's usage and outcome in its agent record. An
+ * agent whose pull request merged has its rotation marked due (den#4): its
+ * Stop hook then asks it for its handoff.
+ */
 function save(stateDir: string, rows: readonly AgentUsageRow[]): void {
   for (const r of rows) {
     if (!r.usage) continue;
@@ -103,6 +150,23 @@ function save(stateDir: string, rows: readonly AgentUsageRow[]): void {
       usage: r.usage,
       ...(r.outcome ? { outcome: r.outcome } : {}),
     });
+    if (r.outcome?.prMerged)
+      markDue(agentFilesDir(stateDir, rec.id), "pr-merged", rec.resumeToken);
+    // A mark gh no longer confirms is dropped, and its rotation with it.
+    else if (rec.outcome?.prMerged)
+      clearDue(agentFilesDir(stateDir, rec.id), "pr-merged");
+  }
+}
+
+/** agents.rotate.after_compactions; the default when the config can't be read. */
+function rotateLimit(d: UsageDeps): number {
+  try {
+    return (
+      (d.rotateAfter ?? (() => readAgentsConfig().rotate))()
+        ?.afterCompactions ?? 3
+    );
+  } catch {
+    return 3;
   }
 }
 
@@ -117,7 +181,10 @@ async function agents(
   const recs = listRecords(d.stateDir()).filter(
     (r) => !ws || r.workspace === ws,
   );
-  const rows = await agentUsage(recs, { env: d.env });
+  const rows = await agentUsage(recs, {
+    env: d.env,
+    prState: d.prState,
+  });
   save(d.stateDir(), rows);
   const pct = attributedPct(rows);
   if (p.flags["--json"]) {
@@ -138,6 +205,8 @@ async function agents(
       "WALL",
       "TESTS",
       "PR",
+      "COMPACTIONS",
+      "ROTATIONS",
     ],
     ...rows.map((r) => [
       r.agent,
@@ -153,15 +222,27 @@ async function agents(
           : "red",
       r.outcome?.prOpened
         ? `${r.outcome.prOpened}${r.outcome.prMerged ? " (merged)" : ""}`
-        : "-",
+        : r.outcome?.prMergeConfirmed
+          ? `${r.outcome.prMergeConfirmed} (merged)`
+          : "-",
+      r.compactions === undefined ? "-" : String(r.compactions),
+      String(r.rotations),
     ]),
   ]))
     d.out(l);
   for (const r of rows) if (r.why) d.out(`  ${r.agent}: ${r.why}`);
   d.out("");
   d.out(
-    `${pct}% of agents have their tokens and outcome (${rows.filter((r) => r.attributed).length} of ${rows.length}). Read locally; nothing was sent.`,
+    `${pct}% of agents have their tokens and outcome (${rows.filter((r) => r.attributed).length} of ${rows.length}). Read locally; none of this was sent.`,
   );
+  if (d.prState.asked)
+    d.out(
+      `To confirm a merge, it asked GitHub for the state of ${d.prState.asked} pull request${d.prState.asked === 1 ? "" : "s"} (gh pr view).`,
+    );
+  if (d.prState.missing)
+    d.out(
+      `Couldn't check ${d.prState.missing} merge${d.prState.missing === 1 ? "" : "s"}: gh is not installed.`,
+    );
   return 0;
 }
 
@@ -209,9 +290,12 @@ async function report(
   for (const src of usageSources())
     for (const f of src.files(since, d.env))
       stats.push(await src.mine(f, { since }));
-  const rows = await agentUsage(listRecords(d.stateDir()), { env: d.env });
+  const rows = await agentUsage(listRecords(d.stateDir()), {
+    env: d.env,
+    prState: d.prState,
+  });
   save(d.stateDir(), rows);
-  const m = weeklyMetrics(stats, rows);
+  const m = weeklyMetrics(stats, rows, d.rotateLimit());
   const date = now.toISOString().slice(0, 10);
   const dir = path.join(d.stateDir(), "usage");
   const prev = previous(dir, date);

package/src/ui/server/agent-routes.ts

@@ -18,6 +18,11 @@
  *   POST /api/workspaces/<ws>/agents/<id>/resume  the same conversation (AG-14)
  *   POST /api/workspaces/<ws>/agents/<id>/fresh   a new conversation, same
  *                                                 persona and workspace
+ *   POST /api/workspaces/<ws>/agents/<id>/relaunch  a rotated agent (den#4):
+ *                                                 a new conversation whose
+ *                                                 first prompt is its
+ *                                                 handoff.md; a resume of
+ *                                                 one is refused (409 rotated)
  *   POST /api/workspaces/<ws>/agents/<id>/remove  forget a stopped one (Undo:
  *                                                 /api/agents/restore)
  *   POST /api/agents/clear-stopped                { workspaces: [...] }: forget
@@ -74,6 +79,7 @@ import {
   resumeInterrupted,
   setRuntimePath,
   resolveAgentsDeps,
+  relaunchAgent,
   resumeAgent,
   startAgent,
   startFresh,
@@ -98,7 +104,7 @@ export interface AgentRouteDeps {
 }
 
 const AGENTS_PATH =
-  /^\/api\/workspaces\/([^/]+)\/agents(?:\/([^/]+)\/(stop|resume|fresh|remove))?$/;
+  /^\/api\/workspaces\/([^/]+)\/agents(?:\/([^/]+)\/(stop|resume|fresh|relaunch|remove))?$/;
 
 const RUNTIME_PATH = /^\/api\/agents\/runtimes\/([^/]+)\/path$/;
 /** A start's body is a few short names. */
@@ -282,7 +288,13 @@ export async function handleAgentRoutes(
     return true;
   }
   const id = m[2] === undefined ? undefined : safeDecode(m[2]);
-  const action = m[3] as "stop" | "resume" | "fresh" | "remove" | undefined;
+  const action = m[3] as
+    | "stop"
+    | "resume"
+    | "fresh"
+    | "relaunch"
+    | "remove"
+    | undefined;
 
   if (!action && method === "GET") {
     try {
@@ -364,6 +376,11 @@ export async function handleAgentRoutes(
       what = `start ${s.rec.id} fresh (${s.rec.persona}, ${s.rec.runtime}) in ${ws}`;
       audit(what, s.early ? "exited at once" : undefined);
       sendStarted(res, s);
+    } else if (verb === "relaunch") {
+      const s = await relaunchAgent(d, id!, ws);
+      what = `relaunch ${s.rec.id} from its handoff (${s.why}) in ${ws}`;
+      audit(what, s.early ? "exited at once" : undefined);
+      sendStarted(res, s);
     } else if (verb === "remove") {
       const removed = await removeAgent(d, id!, ws);
       audit(what);

package/src/ui/server/public/agents-page.js

@@ -40,6 +40,15 @@
  * shows only Start fresh, saying so. Clear stopped removes every stopped
  * agent in view. After a restart, one line says how many were interrupted,
  * with Resume all and Review.
+ *
+ * Session rotation (den#4): an agent whose session rotated (after
+ * agents.rotate.after_compactions compactions, or its pull request merged)
+ * and whose handoff.md passes the check reads "Ready to relaunch (3
+ * compactions)" or "(PR merged)", with Relaunch from handoff as its primary
+ * action, then Start fresh and Remove; Resume is not offered. With the
+ * handoff missing or failing the check, the row says so and keeps Resume
+ * and Start fresh. A running one says "Handoff due" or "Ready to relaunch"
+ * as a tag.
  */
 import { fillStartForm } from "/agent-start.js";
 
@@ -181,6 +190,23 @@ export function stopReason(r) {
   return stateText(r.state);
 }
 
+/** Why it rotates, in words: "3 compactions", "PR merged" (den#4). */
+function rotationWhy(rot) {
+  if (rot.due === "pr-merged") return t("ag.rot.merged");
+  return t(
+    rot.compactions === 1 ? "ag.rot.compactions.one" : "ag.rot.compactions",
+    {
+      n: rot.compactions,
+    },
+  );
+}
+
+/** Its rotation, when one is due: "ready" or "due" (den#4). */
+function rotationOf(r) {
+  if (!r.rotation?.due) return "";
+  return r.rotation.ready ? "ready" : "due";
+}
+
 /** A stopped agent's row: its button (it opens an ended pane) and actions. */
 function stoppedHtml(r) {
   const open = st.open.includes(r.id);
@@ -188,26 +214,47 @@ function stoppedHtml(r) {
   const nm = `${esc(name)}${r.persona && r.persona !== r.label ? ` <span class="id">${esc(r.label)}</span>` : ""}`;
   const meta = [r.runtime, r.cwd].filter(Boolean).join(" · ");
   const who = esc(r.agent);
+  const rot = rotationOf(r);
+  const relaunch =
+    rot === "ready"
+      ? `<button type="button" class="den-btn sm primary" data-act="relaunch" aria-label="${esc(t("ag.relaunchName", { id: r.agent }))}">${esc(t("ag.relaunch"))}</button>`
+      : "";
   const resume = r.resumable
     ? `<button type="button" class="den-btn sm primary" data-act="resume" aria-label="${esc(t("ag.resumeName", { id: r.agent }))}">${esc(t("ag.resume"))}</button>`
     : "";
   const fresh = `<button type="button" class="den-btn sm" data-act="fresh" aria-label="${esc(t("ag.freshName", { id: r.agent }))}">${esc(t("ag.fresh"))}</button>`;
   const remove = `<button type="button" class="den-btn sm" data-act="remove" aria-label="${esc(t("ag.removeName", { id: r.agent }))}">${esc(t("ag.remove"))}</button>`;
+  // A rotation due without a handoff that passes: say so (den#4).
+  const handoff =
+    rot === "due"
+      ? `<span class="agcant" data-handoff="${esc(r.rotation.handoff)}">${esc(
+          t(
+            r.rotation.handoff === "missing"
+              ? "ag.rot.noHandoff"
+              : "ag.rot.badHandoff",
+            { why: rotationWhy(r.rotation) },
+          ),
+        )}</span>`
+      : "";
   const cant =
-    !r.resumable && r.noResume
+    !r.resumable && r.noResume && rot !== "ready"
       ? `<span class="agcant" data-no-resume>${esc(r.noResume.startsWith(`${r.runtime} `) ? t("ag.noResume", { runtime: r.runtime }) : r.noResume)}</span>`
       : "";
+  const stText =
+    rot === "ready"
+      ? t("ag.rot.ready", { why: rotationWhy(r.rotation) })
+      : stateText(r.state);
   return (
-    `<div class="agst" data-agent="${who}" data-state="${esc(r.state)}" data-ws="${esc(r.workspace)}">` +
+    `<div class="agst" data-agent="${who}" data-state="${esc(r.state)}" data-ws="${esc(r.workspace)}"${rot ? ` data-rotation="${rot}"` : ""}>` +
     `<button type="button" class="agr" data-id="${esc(r.id)}" data-kind="agent" data-state="${esc(r.state)}"` +
     ` aria-pressed="${open}"${r.attachable ? "" : ' aria-disabled="true"'}` +
     ` aria-label="${esc(t("ag.openName", { id: `${r.workspace} / ${name}` }))}">` +
     `<span class="den-dot ${stateTone(r)}" aria-hidden="true"></span>` +
-    `<span class="nm">${nm}</span><span class="st">${esc(stateText(r.state))}</span>` +
+    `<span class="nm">${nm}</span><span class="st">${esc(stText)}</span>` +
     (meta ? `<span class="meta">${esc(meta)}</span>` : "") +
     `<span class="why">${esc(stopReason(r))}</span>` +
     `</button>` +
-    `<div class="agacts">${cant}${resume}${fresh}${remove}</div>` +
+    `<div class="agacts">${handoff}${cant}${relaunch}${resume}${fresh}${remove}</div>` +
     `</div>`
   );
 }
@@ -223,9 +270,21 @@ function rowHtml(r) {
     ? `<span class="wbdg">${esc(t("ag.waiting"))}</span>`
     : `<span class="st">${esc(stateText(r.state))}</span>`;
   const meta = [r.runtime, r.cwd].filter(Boolean).join(" · ");
-  const tags = r.tokenRevoked
-    ? `<span class="agtags"><span class="tagx warn" title="${esc(t("ag.revokedTip"))}">${esc(t("ag.revoked"))}</span></span>`
+  const rot = rotationOf(r);
+  const rotTag = rot
+    ? `<span class="tagx warn" data-rotation="${rot}">${esc(
+        t(rot === "ready" ? "ag.rot.ready" : "ag.rot.due", {
+          why: rotationWhy(r.rotation),
+        }),
+      )}</span>`
+    : "";
+  const revokedTag = r.tokenRevoked
+    ? `<span class="tagx warn" title="${esc(t("ag.revokedTip"))}">${esc(t("ag.revoked"))}</span>`
     : "";
+  const tags =
+    rotTag || revokedTag
+      ? `<span class="agtags">${revokedTag}${rotTag}</span>`
+      : "";
   return (
     `<button type="button" class="agr" data-id="${esc(r.id)}" data-kind="${esc(r.kind)}" data-state="${esc(r.state)}"` +
     ` aria-pressed="${open}"${r.attachable ? "" : ' aria-disabled="true"'}` +
@@ -760,18 +819,24 @@ async function stopAgent(p, button) {
 const agentPath = (r, verb) =>
   `/api/workspaces/${encodeURIComponent(r.workspace)}/agents/${encodeURIComponent(r.agent)}/${verb}`;
 
-/** Resume (the same conversation) or Start fresh; its pane opens on it. */
+/**
+ * Resume (the same conversation), Start fresh, or Relaunch from handoff
+ * (den#4: a new conversation that starts from handoff.md); its pane opens
+ * on it.
+ */
 async function restartRow(r, verb, button) {
   if (button) button.disabled = true;
   try {
     const out = await api("POST", agentPath(r, verb));
     window.denShell?.toast?.(
       t(
-        verb !== "resume"
-          ? "ag.startedFresh"
-          : out?.fresh
-            ? "ag.resumedFresh"
-            : "ag.resumed",
+        verb === "relaunch"
+          ? "ag.relaunched"
+          : verb !== "resume"
+            ? "ag.startedFresh"
+            : out?.fresh
+              ? "ag.resumedFresh"
+              : "ag.resumed",
         { id: r.agent },
       ),
     );
@@ -1093,7 +1158,7 @@ export async function mountAgentsPage(root) {
         (x) => x.agent === agent && x.workspace === ws,
       );
       if (!r) return;
-      if (which === "resume" || which === "fresh")
+      if (which === "resume" || which === "fresh" || which === "relaunch")
         void restartRow(r, which, act);
       else if (which === "remove") void removeRow(r, act);
       return;

package/src/ui/server/public/i18n/es.js

@@ -414,6 +414,18 @@
     "ag.fresh": "Empezar de cero",
     "ag.freshName": "Empezar {id} de cero",
     "ag.startedFresh": "{id} empezó de cero",
+    "ag.rot.ready": "Listo para relanzar ({why})",
+    "ag.rot.due": "Falta el traspaso ({why})",
+    "ag.rot.compactions": "{n} compactaciones",
+    "ag.rot.compactions.one": "{n} compactación",
+    "ag.rot.merged": "PR fusionado",
+    "ag.rot.noHandoff":
+      "Su sesión rotó ({why}), pero no escribió handoff.md. Reanúdalo para que lo escriba, o empieza de cero.",
+    "ag.rot.badHandoff":
+      "Su sesión rotó ({why}), pero su handoff.md no está completo. Reanúdalo para arreglarlo, o empieza de cero.",
+    "ag.relaunch": "Relanzar desde el traspaso",
+    "ag.relaunchName": "Relanzar {id} desde el traspaso",
+    "ag.relaunched": "{id} relanzado desde su traspaso",
     "ag.remove": "Quitar",
     "ag.removeName": "Quitar {id}",
     "ag.removed": "{id} quitado",

package/src/ui/server/public/i18n/ja.js

@@ -401,6 +401,17 @@
     "ag.fresh": "新しく始める",
     "ag.freshName": "{id} を新しく始める",
     "ag.startedFresh": "{id} を新しく始めました",
+    "ag.rot.ready": "再起動の準備ができました（{why}）",
+    "ag.rot.due": "引き継ぎが必要です（{why}）",
+    "ag.rot.compactions": "圧縮 {n} 回",
+    "ag.rot.merged": "PR がマージされました",
+    "ag.rot.noHandoff":
+      "セッションは交代しました（{why}）が、handoff.md がありません。再開して書かせるか、新しく始めてください。",
+    "ag.rot.badHandoff":
+      "セッションは交代しました（{why}）が、handoff.md が不完全です。再開して直すか、新しく始めてください。",
+    "ag.relaunch": "引き継ぎから再起動",
+    "ag.relaunchName": "{id} を引き継ぎから再起動",
+    "ag.relaunched": "{id} を引き継ぎから再起動しました",
     "ag.remove": "削除",
     "ag.removeName": "{id} を削除",
     "ag.removed": "{id} を削除しました",

package/src/ui/server/public/shell.js

@@ -534,6 +534,19 @@
     "ag.restored": "Back in the list: {ids}",
     "ag.clear": "Clear stopped",
     "ag.noResume": "{runtime} can't resume a conversation",
+    // Session rotation (den#4).
+    "ag.rot.ready": "Ready to relaunch ({why})",
+    "ag.rot.due": "Handoff due ({why})",
+    "ag.rot.compactions": "{n} compactions",
+    "ag.rot.compactions.one": "{n} compaction",
+    "ag.rot.merged": "PR merged",
+    "ag.rot.noHandoff":
+      "Its session rotated ({why}), but it wrote no handoff.md. Resume it to write one, or start fresh.",
+    "ag.rot.badHandoff":
+      "Its session rotated ({why}), but its handoff.md is not complete. Resume it to fix it, or start fresh.",
+    "ag.relaunch": "Relaunch from handoff",
+    "ag.relaunchName": "Relaunch {id} from handoff",
+    "ag.relaunched": "Relaunched {id} from its handoff",
     "ag.interrupted": "{n} agents were interrupted when {name} restarted",
     "ag.interrupted.one": "{n} agent was interrupted when {name} restarted",
     "ag.resumeAll": "Resume all",

package/src/ui/server/route-classes.ts

@@ -318,6 +318,11 @@ export const ROUTES: readonly RouteEntry[] = [
     "/api/workspaces/:ws/agents/:id/fresh",
     "starts an agent afresh: a runtime in a PTY",
   ),
+  S(
+    ["POST"],
+    "/api/workspaces/:ws/agents/:id/relaunch",
+    "relaunches a rotated agent from its handoff: a runtime in a PTY (den#4)",
+  ),
   S(
     ["POST"],
     "/api/agents/resume-interrupted",
@@ -400,6 +405,7 @@ export const REGEX_ROUTES: Readonly<Record<string, readonly string[]>> = {
     "/api/workspaces/:ws/agents/:id/stop",
     "/api/workspaces/:ws/agents/:id/resume",
     "/api/workspaces/:ws/agents/:id/fresh",
+    "/api/workspaces/:ws/agents/:id/relaunch",
     "/api/workspaces/:ws/agents/:id/remove",
   ],
   "agent-routes.ts:RUNTIME_PATH": ["/api/agents/runtimes/:id/path"],

package/src/ui/server/session-routes.ts

@@ -43,6 +43,7 @@ import { getStateDir } from "../../shared/paths.js";
 import { product } from "../../shared/product.js";
 import { revokedAgentIds } from "../../shared/actor-token.js";
 import { listRecords } from "../../shared/agents/records.js";
+import type { RotationInfo } from "../../shared/agents/rotation.js";
 import {
   connectHost,
   noHost,
@@ -153,6 +154,11 @@ export interface ListedSession {
   tokenRevoked?: boolean;
   /** An approval is pending (AG-6a; only when the host knows). */
   waiting?: boolean;
+  /**
+   * Session rotation (den#4): why it rotates and its handoff.md. `ready`:
+   * Relaunch from handoff is its action, not Resume.
+   */
+  rotation?: RotationInfo;
 }
 
 /** The list, from the host's sessions and the agent records. */
@@ -176,7 +182,7 @@ export function listedSessions(
   const out: ListedSession[] = [];
   const agentSessions = new Set<string>();
   noteEnded(d.stateDir(), mine, records);
-  for (const r of agentRows(mine, records)) {
+  for (const r of agentRows(mine, records, d.stateDir())) {
     const rec = records.find((x) => x.id === r.agent)!;
     const s = r.session;
     if (s) agentSessions.add(s.ref.id);
@@ -201,6 +207,7 @@ export function listedSessions(
       ...(r.stoppedAt ? { stoppedAt: r.stoppedAt } : {}),
       ...(r.endedAt ? { endedAt: r.endedAt } : {}),
       ...(r.interruptedAt ? { interruptedAt: r.interruptedAt } : {}),
+      ...(r.rotation?.due ? { rotation: r.rotation } : {}),
       ...(revoked.has(rec.id) && s && !s.exited ? { tokenRevoked: true } : {}),
     });
   }