@archme/cli 0.11.2 → 0.11.3

package/dist/cli.js

@@ -17291,6 +17291,16 @@ var init_defaultBranch = __esm({
 });
 
 // ../shared/prRefs.ts
+function parsePrRefs(message) {
+  if (!message) return [];
+  const refs = [...message.matchAll(PR_REF)].map((m) => Number(m[1]));
+  const bare = refs.length ? null : bareMergePrNumber(message);
+  return bare === null ? refs : [bare];
+}
+function lastPrRef(message) {
+  const refs = parsePrRefs(message);
+  return refs[refs.length - 1] ?? null;
+}
 function pushCommitSubject(message) {
   if (message == null) return null;
   const [subject = "", ...body] = message.split("\n");
@@ -17298,10 +17308,15 @@ function pushCommitSubject(message) {
   const title = body.find((line) => line.trim())?.trim();
   return pr && title && !TRAILER_LINE.test(title) ? `${title} (#${pr[1]})` : subject;
 }
-var MERGE_PR_SUBJECT, TRAILER_LINE;
+function bareMergePrNumber(subject) {
+  const pr = subject ? MERGE_PR_SUBJECT.exec(subject.trim()) : null;
+  return pr ? Number(pr[1]) : null;
+}
+var PR_REF, MERGE_PR_SUBJECT, TRAILER_LINE;
 var init_prRefs = __esm({
   "../shared/prRefs.ts"() {
     init_repoContainer();
+    PR_REF = /\(#(\d+)\)/g;
     MERGE_PR_SUBJECT = /^Merge pull request #(\d+) from \S+$/;
     TRAILER_LINE = /^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)+:\s/;
   }
@@ -17676,6 +17691,87 @@ var init_localPrAdapters = __esm({
   }
 });
 
+// ../shared/pushSubject.ts
+async function resolvePushSubject(message, push, lookup, timeoutMs = PUSH_SUBJECT_TIMEOUT_MS) {
+  const subject = pushCommitSubject(message);
+  if (!subject) return subject;
+  const bare = bareMergePrNumber(subject);
+  if (bare === null && lastPrRef(subject) !== null) return subject;
+  try {
+    const found = await withTimeout(findPr(subject, bare, push, lookup), timeoutMs);
+    return found ? `${found.title} (#${found.number})` : subject;
+  } catch {
+    return subject;
+  }
+}
+async function findPr(subject, bare, push, lookup) {
+  if (bare !== null) {
+    const title = (await lookup.pullTitle(bare))?.trim();
+    return title ? { number: bare, title } : null;
+  }
+  const pr = mergedPrForCommit(await lookup.pullsForCommit(push.sha), push);
+  return pr ? { number: pr.number, title: pr.title?.trim() || subject } : null;
+}
+function mergedPrForCommit(prs, push) {
+  const merged = prs.filter((p) => p.mergedAt && (!p.baseRef || p.baseRef === push.branch));
+  const exact = merged.filter((p) => p.mergeCommitSha === push.sha);
+  if (exact.length === 1) return exact[0] ?? null;
+  return merged.length === 1 ? merged[0] ?? null : null;
+}
+function withTimeout(work, ms) {
+  let timer;
+  const expired = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error("timed out")), ms);
+  });
+  return Promise.race([work, expired]).finally(() => clearTimeout(timer));
+}
+function githubPrLookup(opts) {
+  const doFetch = opts.fetch ?? fetch;
+  let tokens = null;
+  async function get(path7) {
+    tokens ??= opts.tokens();
+    for (const token of await tokens) {
+      const res = await doFetch(`${GITHUB_API}/repos/${opts.repo}${path7}`, {
+        headers: {
+          Accept: "application/vnd.github+json",
+          "X-GitHub-Api-Version": "2022-11-28",
+          "User-Agent": "archme",
+          ...token ? { Authorization: `Bearer ${token}` } : {}
+        }
+      });
+      if (REFUSED.has(res.status)) continue;
+      return res.ok ? await res.json() : null;
+    }
+    return null;
+  }
+  return {
+    async pullTitle(prNumber) {
+      const pr = await get(`/pulls/${prNumber}`);
+      return typeof pr?.title === "string" ? pr.title : null;
+    },
+    async pullsForCommit(sha) {
+      const prs = await get(`/commits/${sha}/pulls`);
+      if (!Array.isArray(prs)) return [];
+      return prs.map((p) => ({
+        number: Number(p.number),
+        title: typeof p.title === "string" ? p.title : null,
+        mergedAt: p.merged_at ?? null,
+        mergeCommitSha: p.merge_commit_sha ?? null,
+        baseRef: p.base?.ref ?? null
+      }));
+    }
+  };
+}
+var PUSH_SUBJECT_TIMEOUT_MS, GITHUB_API, REFUSED;
+var init_pushSubject = __esm({
+  "../shared/pushSubject.ts"() {
+    init_prRefs();
+    PUSH_SUBJECT_TIMEOUT_MS = 3e3;
+    GITHUB_API = "https://api.github.com";
+    REFUSED = /* @__PURE__ */ new Set([401, 403, 404]);
+  }
+});
+
 // src/daemon/localPoller.ts
 async function pollRepoOnce(entry, deps) {
   const repo = `${entry.repoOwner}/${entry.repoName}`;
@@ -17849,6 +17945,14 @@ function makePollerDeps(client, log, gateTimeoutMs) {
     },
     async enqueue(entry, row, beforeSha, afterSha) {
       const meta = await readCommitMeta(entry.mirrorPath, afterSha);
+      const subject = await resolvePushSubject(
+        meta.message || null,
+        { sha: afterSha, branch: row.repoBranch },
+        githubPrLookup({
+          repo: `${entry.repoOwner}/${entry.repoName}`,
+          tokens: async () => (await resolveGithubTokens()).map((t) => t.token)
+        })
+      );
       const { data, error } = await client.rpc("enqueue_local_archme_job", {
         p_watched_repo_id: entry.watchedRepoId,
         // From the ROW, not the registry: these decide which lane the job lands
@@ -17857,7 +17961,7 @@ function makePollerDeps(client, log, gateTimeoutMs) {
         p_archme_branch: row.archmeBranch,
         p_before_sha: beforeSha,
         p_after_sha: afterSha,
-        p_commit_message: meta.message || null,
+        p_commit_message: subject,
         p_head_commit_timestamp: meta.committedAt,
         p_author_name: meta.authorName,
         // `author_login` is a GitHub concept with no git equivalent. The webhook
@@ -17884,6 +17988,7 @@ var init_localPoller = __esm({
     init_branchMarker();
     init_localGit();
     init_localPrAdapters();
+    init_pushSubject();
     DEFAULT_POLL_INTERVAL_MS = 6e4;
     DEFAULT_GATE_TIMEOUT_MS = 4 * 60 * 60 * 1e3;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archme/cli",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Map your codebase into a living architecture diagram: run `archme init` in a repo to scan it, `archme daemon start` to keep it current on every commit.",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",