agent-trace 0.2.9 → 0.2.11

package/agent-trace.cjs

@@ -24122,6 +24122,10 @@ th{color:var(--text-dim);font-size:10px;text-transform:uppercase;letter-spacing:
 .outcome-prs{border-top:1px solid var(--panel-border);padding-top:6px;margin-top:4px}
 .outcome-pr{display:flex;align-items:center;gap:8px;padding:3px 0;font-size:12px}
 .pr-badge{font-size:10px;padding:1px 5px;border-radius:3px;font-weight:600;text-transform:uppercase;border:1px solid rgba(74,222,128,.3);color:var(--green)}
+.pr-badge.open{border-color:rgba(34,211,238,.3);color:var(--cyan)}
+.pr-badge.merged{border-color:rgba(192,132,252,.3);color:var(--purple)}
+.pr-badge.closed{border-color:rgba(248,113,113,.3);color:var(--red)}
+.pr-badge.draft{border-color:rgba(102,102,102,.3);color:var(--text-muted)}
 .pr-label{color:var(--cyan);font-weight:600}
 .pr-repo{color:var(--text-muted)}
 .pr-link{color:var(--text-dim);text-decoration:none;font-size:11px}
@@ -24470,7 +24474,7 @@ function renderReplay() {
     }
     if (replay.pullRequests.length > 0) {
       h += '<div class="outcome-prs">';
-      replay.pullRequests.forEach(function(pr){ h += '<div class="outcome-pr"><span class="pr-badge">' + esc(pr.state) + '</span><span class="pr-label">PR #' + pr.prNumber + '</span><span class="pr-repo">' + esc(pr.repo) + '</span>' + (pr.url ? '<a class="pr-link" href="' + esc(pr.url) + '" target="_blank" rel="noopener noreferrer">' + esc(pr.url) + '</a>' : '') + '</div>'; });
+      replay.pullRequests.forEach(function(pr){ h += '<div class="outcome-pr"><span class="pr-badge ' + esc(pr.state) + '">' + esc(pr.state) + '</span><span class="pr-label">PR #' + pr.prNumber + '</span><span class="pr-repo">' + esc(pr.repo) + '</span>' + (pr.url ? '<a class="pr-link" href="' + esc(pr.url) + '" target="_blank" rel="noopener noreferrer">' + esc(pr.url) + '</a>' : '') + '</div>'; });
       h += '</div>';
     }
     h += '</div>';
@@ -25073,6 +25077,18 @@ CREATE TABLE IF NOT EXISTS commits (
 );
 
 CREATE INDEX IF NOT EXISTS idx_commits_session ON commits(session_id);
+
+CREATE TABLE IF NOT EXISTS pull_requests (
+  session_id TEXT NOT NULL,
+  repo TEXT NOT NULL,
+  pr_number INTEGER NOT NULL,
+  state TEXT NOT NULL DEFAULT 'open',
+  url TEXT,
+  merged_at TEXT,
+  PRIMARY KEY (session_id, repo, pr_number)
+);
+
+CREATE INDEX IF NOT EXISTS idx_pull_requests_session ON pull_requests(session_id);
 `;
 function toJsonArray(value) {
   return JSON.stringify(value);
@@ -25255,6 +25271,37 @@ var SqliteClient = class {
     });
     transaction(rows);
   }
+  async upsertPullRequests(rows) {
+    if (rows.length === 0) return;
+    const upsert = this.db.prepare(`
+      INSERT INTO pull_requests
+        (session_id, repo, pr_number, state, url, merged_at)
+      VALUES (?, ?, ?, ?, ?, ?)
+      ON CONFLICT(session_id, repo, pr_number) DO UPDATE SET
+        state = excluded.state,
+        url = COALESCE(excluded.url, pull_requests.url),
+        merged_at = COALESCE(excluded.merged_at, pull_requests.merged_at)
+    `);
+    const transaction = this.db.transaction((prRows) => {
+      for (const row of prRows) {
+        upsert.run(
+          row.session_id,
+          row.repo,
+          row.pr_number,
+          row.state,
+          row.url,
+          row.merged_at
+        );
+      }
+    });
+    transaction(rows);
+  }
+  listPullRequestsBySessionId(sessionId) {
+    const rows = this.db.prepare(
+      "SELECT session_id, repo, pr_number, state, url, merged_at FROM pull_requests WHERE session_id = ? ORDER BY pr_number ASC"
+    ).all(sessionId);
+    return rows;
+  }
   listCommitsBySessionId(sessionId) {
     const rows = this.db.prepare(
       "SELECT sha, session_id, prompt_id, message, lines_added, lines_removed, committed_at FROM commits WHERE session_id = ? ORDER BY committed_at ASC"
@@ -25972,6 +26019,19 @@ function toPostgresCommitRow(trace, commit) {
 function toPostgresCommitRows(trace) {
   return trace.git.commits.map((commit) => toPostgresCommitRow(trace, commit));
 }
+function toPostgresPullRequestRow(trace, pr) {
+  return {
+    session_id: trace.sessionId,
+    repo: pr.repo,
+    pr_number: pr.prNumber,
+    state: pr.state,
+    url: toNullableString(pr.url),
+    merged_at: toNullableString(pr.mergedAt)
+  };
+}
+function toPostgresPullRequestRows(trace) {
+  return trace.git.pullRequests.map((pr) => toPostgresPullRequestRow(trace, pr));
+}
 function dedupeBySessionId(rows) {
   const bySession = /* @__PURE__ */ new Map();
   rows.forEach((row) => {
@@ -25986,6 +26046,13 @@ function dedupeBySha(rows) {
   });
   return [...bySha.values()];
 }
+function dedupePullRequests(rows) {
+  const byKey = /* @__PURE__ */ new Map();
+  rows.forEach((row) => {
+    byKey.set(`${row.session_id}:${row.repo}:${String(row.pr_number)}`, row);
+  });
+  return [...byKey.values()];
+}
 var PostgresSessionWriter = class {
   client;
   constructor(client) {
@@ -26003,9 +26070,11 @@ var PostgresSessionWriter = class {
     }
     const sessions = dedupeBySessionId(traces.map(toPostgresSessionRow));
     const commitRows = dedupeBySha(traces.flatMap((trace) => toPostgresCommitRows(trace)));
+    const prRows = dedupePullRequests(traces.flatMap((trace) => toPostgresPullRequestRows(trace)));
     const sessionsPromise = this.client.upsertSessions(sessions);
     const commitsPromise = this.client.upsertCommits(commitRows);
-    await Promise.all([sessionsPromise, commitsPromise]);
+    const prsPromise = this.client.upsertPullRequests(prRows);
+    await Promise.all([sessionsPromise, commitsPromise, prsPromise]);
     return {
       writtenSessions: sessions.length,
       writtenCommits: commitRows.length
@@ -28222,6 +28291,7 @@ var InMemoryRuntimeClickHouseClient = class {
 var InMemoryRuntimePostgresClient = class {
   sessionsById = /* @__PURE__ */ new Map();
   commitsBySha = /* @__PURE__ */ new Map();
+  pullRequestsByKey = /* @__PURE__ */ new Map();
   async upsertSessions(rows) {
     rows.forEach((row) => {
       this.sessionsById.set(row.session_id, row);
@@ -28232,12 +28302,20 @@ var InMemoryRuntimePostgresClient = class {
       this.commitsBySha.set(row.sha, row);
     });
   }
+  async upsertPullRequests(rows) {
+    rows.forEach((row) => {
+      this.pullRequestsByKey.set(`${row.session_id}:${row.repo}:${String(row.pr_number)}`, row);
+    });
+  }
   listSessions() {
     return [...this.sessionsById.values()];
   }
   listCommits() {
     return [...this.commitsBySha.values()];
   }
+  listPullRequests() {
+    return [...this.pullRequestsByKey.values()];
+  }
 };
 var InMemoryRuntimeSessionTraceClient = class {
   rows = [];
@@ -28545,15 +28623,35 @@ function toUpdatedTrace(existing, envelope) {
   const prUrl = readString4(payload, ["pr_url", "prUrl"]);
   const prRepo = readString4(payload, ["pr_repo", "prRepo"]);
   const prNumberRaw = readNumber3(payload, ["pr_number", "prNumber"]);
+  const prState = readString4(payload, ["pr_state", "prState"]) ?? "open";
+  const prMergedAt = readString4(payload, ["pr_merged_at", "prMergedAt"]);
   if (prUrl !== void 0 && prRepo !== void 0 && prNumberRaw !== void 0) {
-    const alreadyTracked = existingPullRequests.some((pr) => pr.prNumber === prNumberRaw && pr.repo === prRepo);
-    if (!alreadyTracked) {
+    const trackedIndex = existingPullRequests.findIndex((pr) => pr.prNumber === prNumberRaw && pr.repo === prRepo);
+    if (trackedIndex === -1) {
       existingPullRequests.push({
         repo: prRepo,
         prNumber: prNumberRaw,
-        state: "open",
-        url: prUrl
+        state: prState,
+        url: prUrl,
+        ...prState === "merged" && prMergedAt !== void 0 ? { mergedAt: prMergedAt } : {}
       });
+    } else if (prState !== "open") {
+      const tracked = existingPullRequests[trackedIndex];
+      existingPullRequests[trackedIndex] = {
+        ...tracked,
+        state: prState,
+        ...prState === "merged" && prMergedAt !== void 0 ? { mergedAt: prMergedAt } : {}
+      };
+    }
+  } else if (prState !== "open" && prRepo !== void 0 && prNumberRaw !== void 0) {
+    const trackedIndex = existingPullRequests.findIndex((pr) => pr.prNumber === prNumberRaw && pr.repo === prRepo);
+    if (trackedIndex !== -1) {
+      const tracked = existingPullRequests[trackedIndex];
+      existingPullRequests[trackedIndex] = {
+        ...tracked,
+        state: prState,
+        ...prState === "merged" && prMergedAt !== void 0 ? { mergedAt: prMergedAt } : {}
+      };
     }
   }
   return {
@@ -28827,10 +28925,21 @@ function hydrateFromSqlite(runtime, sqlite, limit, eventLimit) {
       const extra = commits.filter((c) => !pgShas.has(c.sha));
       commits = [...mapped, ...extra];
     }
+    let pullRequests = trace.git.pullRequests;
+    const pgPrs = sqlite.listPullRequestsBySessionId(row.session_id);
+    if (pgPrs.length > 0) {
+      pullRequests = pgPrs.map((pr) => ({
+        repo: pr.repo,
+        prNumber: pr.pr_number,
+        state: pr.state,
+        ...pr.url !== null ? { url: pr.url } : {},
+        ...pr.merged_at !== null ? { mergedAt: pr.merged_at } : {}
+      }));
+    }
     let hydratedTrace = {
       ...trace,
       timeline,
-      git: { ...trace.git, commits }
+      git: { ...trace.git, commits, pullRequests }
     };
     if (hydratedTrace.metrics.totalCostUsd === 0 && (hydratedTrace.metrics.totalInputTokens > 0 || hydratedTrace.metrics.totalOutputTokens > 0) && hydratedTrace.metrics.modelsUsed.length > 0) {
       const model = String(hydratedTrace.metrics.modelsUsed[0]);
@@ -29426,6 +29535,40 @@ function extractPrUrl(payload) {
   if (prUrlMatch !== null && prUrlMatch[0] !== void 0) return prUrlMatch[0];
   return void 0;
 }
+function extractPrState(payload) {
+  const record = payload;
+  const explicit = readString5(record, "pr_state") ?? readString5(record, "prState");
+  if (explicit !== void 0) return explicit;
+  const output = readString5(record, "tool_response") ?? readString5(record, "toolResponse") ?? readString5(record, "stdout") ?? readString5(record, "output");
+  const command = pickCommand2(payload);
+  const combined = [command, output].filter((s) => s !== void 0).join("\n");
+  if (combined.length === 0) return void 0;
+  const isGhPr = /\bgh\s+pr\b/.test(combined);
+  if (!isGhPr) return void 0;
+  const jsonState = combined.match(/"state"\s*:\s*"(MERGED|CLOSED|OPEN|DRAFT)"/i);
+  if (jsonState?.[1] !== void 0) {
+    const s = jsonState[1].toLowerCase();
+    return s === "open" ? "open" : s;
+  }
+  const isDraft = /"isDraft"\s*:\s*true/i.test(combined);
+  if (isDraft) return "draft";
+  if (/\bgh\s+pr\s+merge\b/.test(combined) && output !== void 0 && !/error|failed|not merged/i.test(output)) {
+    return "merged";
+  }
+  if (/\bMerged\b/.test(combined)) return "merged";
+  if (/\bClosed\b/.test(combined)) return "closed";
+  if (/\bDraft\b/.test(combined)) return "draft";
+  return void 0;
+}
+function extractPrMergedAt(payload) {
+  const record = payload;
+  const explicit = readString5(record, "pr_merged_at") ?? readString5(record, "prMergedAt");
+  if (explicit !== void 0) return explicit;
+  const output = readString5(record, "tool_response") ?? readString5(record, "toolResponse") ?? readString5(record, "stdout") ?? readString5(record, "output");
+  if (output === void 0) return void 0;
+  const match = output.match(/"mergedAt"\s*:\s*"([^"]+)"/);
+  return match?.[1] ?? void 0;
+}
 function parsePrFromUrl(url) {
   const match = url.match(/https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/);
   if (match === null || match[1] === void 0 || match[2] === void 0) return void 0;
@@ -29831,6 +29974,14 @@ function enrichHookPayloadWithGitContext(payload, provider, baselineStore, now)
       }
     }
   }
+  const prState = extractPrState(payload);
+  if (prState !== void 0) {
+    patch["pr_state"] = prState;
+  }
+  const prMergedAt = extractPrMergedAt(payload);
+  if (prMergedAt !== void 0) {
+    patch["pr_merged_at"] = prMergedAt;
+  }
   if (Object.keys(patch).length === 0) {
     return {
       payload,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-trace",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Self-hosted observability for AI coding agents. One command, zero config.",
   "license": "Apache-2.0",
   "bin": {