@monster-orange/den 0.4.9 → 0.4.10

package/CHANGELOG.md

@@ -4,6 +4,31 @@ All notable changes to Den are documented here. Each release lists the
 config and manifest changes a distribution must make to move to it under
 **Migrations**.
 
+## [0.4.10] - 2026-11-07
+
+### Changed
+
+- **A confirmed merge stays confirmed.** Once `gh pr view` says an agent's
+  pull request is MERGED, its record keeps that (`prMergeConfirmed`), and
+  `usage` doesn't ask GitHub about it again. A later run that can't check
+  no longer drops it. A merged flag from before 0.4.10, with no
+  confirmation, is checked again.
+- **`usage agents` counts only real asks.** "Asked GitHub for the state of
+  N pull requests" counts the times gh ran. When gh is not installed, it
+  says "Couldn't check N merges: gh is not installed." instead.
+- **The PR column** shows the confirmed pull request, with "(merged)", when
+  the agent merged one it didn't open.
+- **A bare `gh pr merge`** (the branch's own pull request) is confirmed by
+  the number gh gives: the check is now `gh pr view --json number,state`.
+  With no number, it is not marked; an empty ref is never a key.
+- **Dropping a mark drops its rotation.** When gh no longer confirms a
+  merged flag, a "PR merged" rotation it made due is cleared too. A
+  rotation due after compactions is left alone.
+
+### Migrations
+
+None.
+
 ## [0.4.9] - 2026-11-07
 
 A session ends when its pull request merges, or after 3 compactions. The

package/README.md

@@ -10,8 +10,8 @@
 </p>
 
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="docs/images/0.4.9/hero-dark.png">
-  <img src="docs/images/0.4.9/hero-light.png" width="100%" alt="Den's Graph page: the demo workspace's services grouped by application, all healthy, with the status chip and the left rail">
+  <source media="(prefers-color-scheme: dark)" srcset="docs/images/0.4.10/hero-dark.png">
+  <img src="docs/images/0.4.10/hero-light.png" width="100%" alt="Den's Graph page: the demo workspace's services grouped by application, all healthy, with the status chip and the left rail">
 </picture>
 
 ## Set up by your agent
@@ -38,7 +38,7 @@ It doesn't replace your tools. Your repos, Docker, your test runners, your secre
 yours. Den connects them and turns on good practice from the start.
 
 <p align="center">
-  <img src="docs/images/0.4.9/up.gif" width="100%" alt="make up in the Graph page: every stack down, then demo-api, demo-web and demo-notes come up in dependency order until the status chip reads All 3 healthy">
+  <img src="docs/images/0.4.10/up.gif" width="100%" alt="make up in the Graph page: every stack down, then demo-api, demo-web and demo-notes come up in dependency order until the status chip reads All 3 healthy">
 </p>
 
 ## How it helps
@@ -68,10 +68,10 @@ yours. Den connects them and turns on good practice from the start.
   lives in your own repo.
 
 <p align="center">
-  <img src="docs/images/0.4.9/agents.png" width="49%" alt="The Agents tab: the demo workspace's sessions on the left, and one open in a terminal pane on the right, running demo-api's test and then the service">
-  <img src="docs/images/0.4.9/workspaces.png" width="49%" alt="The Workspaces page: the demo workspace's repos with their health, mode and Start, Stop, Restart and Logs actions">
-  <img src="docs/images/0.4.9/status-drawer.png" width="49%" alt="The status drawer: nothing needs attention, and every service in the demo workspace, by application, with its latency">
-  <img src="docs/images/0.4.9/edge.png" width="49%" alt="The Edge page: the edge container up, its ports and TLS, and every route it serves, Den's own and each stack's, with its upstream">
+  <img src="docs/images/0.4.10/agents.png" width="49%" alt="The Agents tab: the demo workspace's sessions on the left, and one open in a terminal pane on the right, running demo-api's test and then the service">
+  <img src="docs/images/0.4.10/workspaces.png" width="49%" alt="The Workspaces page: the demo workspace's repos with their health, mode and Start, Stop, Restart and Logs actions">
+  <img src="docs/images/0.4.10/status-drawer.png" width="49%" alt="The status drawer: nothing needs attention, and every service in the demo workspace, by application, with its latency">
+  <img src="docs/images/0.4.10/edge.png" width="49%" alt="The Edge page: the edge container up, its ports and TLS, and every route it serves, Den's own and each stack's, with its upstream">
 </p>
 
 ## Get started

package/docs/distributions.md

@@ -2482,7 +2482,7 @@ report. It works on den-claude for personas with Den's hooks on.
    A merge is never taken from text. The agent must have run `gh pr merge`
    as a command (after any `cd` or `VAR=value` prefix; not `--help`, not
    `echo gh pr merge`), and it must have exited 0. Then `usage` asks
-   `gh pr view <ref> --json state` in the agent's folder, and only
+   `gh pr view <ref> --json number,state` in the agent's folder, and only
    `MERGED` counts. With no gh, or on any error, it is not marked. That
    query is the one thing `usage` asks outside this machine; it says so
    when it does.
@@ -2762,9 +2762,13 @@ and its wall-clock time. It matches transcripts to agents by the
 conversation id Den saved at start. It prints the share of agents with
 both. Transcripts never leave the machine, and their text is never kept:
 only counts. "Whether it merged" is checked: when an agent ran
-`gh pr merge`, `usage` asks `gh pr view <ref> --json state` to confirm it.
+`gh pr merge`, `usage` asks `gh pr view <ref> --json number,state` to confirm it.
 That query, the pull request's number or URL, is the only thing it asks
-outside, and the output says when it asked.
+outside, and the output says when it asked (or that it couldn't, because
+gh is not installed). A merge gh confirmed is kept in the record
+(`prMergeConfirmed`, the pull request's ref or, for a bare `gh pr merge`,
+the number gh gave) and not asked about again. A mark gh no longer
+confirms is dropped, with the "PR merged" rotation it made due.
 
 `<cli> usage report [--days 7] [--json]` writes a weekly summary to
 `<state dir>/usage/<date>.json` and `.md`, compared with the last one:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monster-orange/den",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Den: a local multi-repo dev orchestrator, HTTPS edge and E2E harness",
   "type": "module",
   "bin": {

package/src/shared/agents/records.ts

@@ -80,6 +80,11 @@ export interface AgentOutcome {
   prOpened?: string;
   /** That pull request merged in the run. */
   prMerged?: boolean;
+  /**
+   * The pull request gh said is MERGED (0.4.10): a merge confirmed once
+   * stays, and is not asked again.
+   */
+  prMergeConfirmed?: string;
   /** The last test run it made passed (true) or failed (false). */
   testsGreen?: boolean;
   /** From its start to its last activity, in milliseconds. */

package/src/shared/agents/rotation.ts

@@ -235,6 +235,15 @@ export function markDue(
   return true;
 }
 
+/** Clear a rotation due for `reason` (a merge mark gh no longer confirms). */
+export function clearDue(filesDir: string, reason: RotateReason): boolean {
+  const s = readRotation(filesDir);
+  if (!s || s.due !== reason) return false;
+  const { due: _d, dueAt: _a, ...rest } = s;
+  writeRotation(filesDir, rest);
+  return true;
+}
+
 /** Whether the state says a rotation is due, for this conversation. */
 export function dueFor(
   s: RotationState | null,

package/src/shared/git/gh-pr-state.ts

@@ -6,27 +6,39 @@
 import { execFile } from "child_process";
 
 /**
- * `gh pr view [<ref>] [-R <repo>] --json state -q .state`;
- * rejects on any error. Only the ref and repo go out, to GitHub, by gh.
+ * `gh pr view [<ref>] [-R <repo>] --json number,state`: the state and the
+ * number (a bare ref is the branch's PR, and the number names it). Rejects
+ * on any error, or an answer that isn't that JSON. Only the ref and repo
+ * go out, to GitHub, by gh.
  */
 export function ghPrState(env: NodeJS.ProcessEnv) {
   return (ref: string, o: { repo?: string; cwd: string }) =>
-    new Promise<string | undefined>((res, rej) => {
+    new Promise<{ state: string; number?: number }>((res, rej) => {
       const args = [
         "pr",
         "view",
         ...(ref ? [ref] : []),
         ...(o.repo ? ["-R", o.repo] : []),
         "--json",
-        "state",
-        "-q",
-        ".state",
+        "number,state",
       ];
       execFile(
         "gh",
         args,
         { cwd: o.cwd, env, timeout: 15_000, maxBuffer: 64 * 1024 },
-        (e, stdout) => (e ? rej(e) : res(String(stdout).trim())),
+        (e, stdout) => {
+          if (e) return rej(e);
+          try {
+            const o = JSON.parse(String(stdout)) as Record<string, unknown>;
+            if (typeof o.state !== "string") throw new Error("no state");
+            res({
+              state: o.state,
+              ...(typeof o.number === "number" ? { number: o.number } : {}),
+            });
+          } catch (err) {
+            rej(err);
+          }
+        },
       );
     });
 }

package/src/shared/usage/report.ts

@@ -102,6 +102,19 @@ export function outcomeOf(
   return out;
 }
 
+/**
+ * What a pull request check answers: its state ("MERGED"), and its number
+ * when gh gave one (a bare `gh pr merge` is the branch's PR: the number is
+ * how it is kept).
+ */
+export type PrStateAnswer = string | { state: string; number?: number };
+
+/** Checks one pull request's state (gh pr view), in the agent's folder. */
+export type PrStateCheck = (
+  ref: string,
+  o: { repo?: string; cwd: string },
+) => Promise<PrStateAnswer | undefined>;
+
 /**
  * Whether one of the transcripts' `gh pr merge` claims is a pull request
  * gh says is MERGED. A bare `gh pr merge` (the branch's PR) is checked by
@@ -111,12 +124,9 @@ async function mergeVerified(
   rec: AgentRecord,
   stats: readonly TranscriptStats[],
   outcome: AgentOutcome,
-  prState?: (
-    ref: string,
-    o: { repo?: string; cwd: string },
-  ) => Promise<string | undefined>,
-): Promise<boolean> {
-  if (!prState) return false;
+  prState?: PrStateCheck,
+): Promise<string | undefined> {
+  if (!prState) return undefined;
   const seen = new Set<string>();
   for (const c of stats.flatMap((s) => s.prMerges)) {
     const ref = c.ref || outcome.prOpened || "";
@@ -128,12 +138,17 @@ async function mergeVerified(
         ...(c.repo ? { repo: c.repo } : {}),
         cwd: rec.cwd,
       });
-      if (st?.trim().toUpperCase() === "MERGED") return true;
+      const state = typeof st === "string" ? st : st?.state;
+      if (state?.trim().toUpperCase() !== "MERGED") continue;
+      // Kept by its ref, or by the number gh gave; never by "".
+      const n = typeof st === "object" ? st.number : undefined;
+      const key = ref || (Number.isInteger(n) && n! > 0 ? String(n) : "");
+      if (key) return key;
     } catch {
       // Not checked: not marked.
     }
   }
-  return false;
+  return undefined;
 }
 
 /**
@@ -146,14 +161,11 @@ export async function agentUsage(
     env?: NodeJS.ProcessEnv;
     source?: (runtime: string) => UsageSource | undefined;
     /**
-     * A pull request's state (`gh pr view <ref> --json state`), run in the
+     * A pull request's state (`gh pr view <ref> --json number,state`), run in the
      * agent's folder: "MERGED" marks the outcome merged. Without it, or on
      * any error, nothing is marked: a merge is never taken from text.
      */
-    prState?: (
-      ref: string,
-      o: { repo?: string; cwd: string },
-    ) => Promise<string | undefined>;
+    prState?: PrStateCheck;
   } = {},
 ): Promise<AgentUsageRow[]> {
   const pick = opts.source ?? sourceFor;
@@ -198,8 +210,15 @@ export async function agentUsage(
     }
     const usage = sumUsage(stats);
     const outcome = outcomeOf(rec, stats);
-    if (await mergeVerified(rec, stats, outcome, opts.prState))
+    // Confirmed once, kept: GitHub is not asked again.
+    const confirmed =
+      rec.outcome?.prMerged && rec.outcome.prMergeConfirmed
+        ? rec.outcome.prMergeConfirmed
+        : await mergeVerified(rec, stats, outcome, opts.prState);
+    if (confirmed) {
       outcome.prMerged = true;
+      outcome.prMergeConfirmed = confirmed;
+    }
     rows.push({
       ...base,
       transcripts: files.length,

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

@@ -3,7 +3,7 @@
  * runtimes' own transcripts on this machine (usage sources, plugin kind
  * `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 state` confirms the merge
+ * `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
@@ -22,8 +22,9 @@ import {
   readRecord,
   writeRecord,
 } from "../../shared/agents/records.js";
-import { markDue } from "../../shared/agents/rotation.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";
@@ -77,24 +78,31 @@ export interface UsageDeps {
   rotateAfter?: () => { afterCompactions: number } | undefined;
   /**
    * A pull request's state, to confirm a `gh pr merge` the agent ran
-   * (default: `gh pr view <ref> --json state` in the agent's folder).
+   * (default: `gh pr view <ref> --json number,state` in the agent's folder).
    */
-  prState?: (
-    ref: string,
-    o: { repo?: string; cwd: string },
-  ) => Promise<string | undefined>;
+  prState?: PrStateCheck;
 }
 
-/** The check, counting how often it asked (the summary line says so). */
+/**
+ * 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 } {
+): NonNullable<UsageDeps["prState"]> & { asked: number; missing: number } {
   const g = Object.assign(
-    (ref: string, o: { repo?: string; cwd: string }) => {
-      g.asked++;
-      return f(ref, o);
+    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 },
+    { asked: 0, missing: 0 },
   );
   return g;
 }
@@ -144,6 +152,9 @@ function save(stateDir: string, rows: readonly AgentUsageRow[]): void {
     });
     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");
   }
 }
 
@@ -211,7 +222,9 @@ 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),
     ]),
@@ -226,6 +239,10 @@ async function agents(
     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;
 }