clay-server 4.6.0 → 4.6.1-beta.1

package/lib/project-session-github.js

@@ -1,9 +1,43 @@
 var github = require("./session-github");
 var buildShape = require("./session-spawn-mcp-server").buildShape;
-var CONTRACT = "GitHub work links: when an issue is clearly the task this session is implementing, or you create/work on its PR, call link_session_github with its exact GitHub URL. Mere mentions, examples, and reference material must not be linked. Do not infer a session's PR from the repository's current branch: sessions may share a checkout. This records local metadata only and does not post to GitHub. Use get_session_github to inspect/refresh linked status and discover accessible sessions already working on the same reference before starting duplicate work. Keep Issues as quiet background records, not a mandatory workflow. Unlink an incorrect association with unlink_session_github.";
+var CONTRACT = "GitHub work links: proactively call link_session_github as soon as conversation context or tool results reasonably establish that an issue or PR is part of this session's work. Do not wait for an explicit linking request, implementation to begin, or work to finish. Investigating an issue, reviewing a PR or its requested changes, addressing review feedback, and checking CI or merge readiness all count as work. When a working PR is connected to an issue and both are relevant to the task, link both. Resolve a known repository and issue/PR number to the exact GitHub URL; if the repository is uncertain, verify it with a read-only lookup instead of silently skipping the link. Incidental mentions, examples, and unrelated reference material alone do not qualify. The current branch alone is insufficient evidence because sessions may share a checkout; combine it with conversation or verified task evidence. This records local metadata only and does not post to GitHub, so no separate linking approval is needed. Use get_session_github to inspect/refresh linked status and discover accessible sessions already working on the same reference before starting duplicate work. When the work shifts to another issue or PR, check that the relevant links are present before reporting progress or completion. Keep Issues as quiet background records, not a mandatory workflow. Unlink an incorrect association with unlink_session_github.";
 function attachSessionGithub(ctx) {
   var inflight = new Map();
   var attempts = new Map();
+  var statusCache = new Map();
+  var statusQueue = Promise.resolve();
+  function readStatus(session, link, stillAllowed) {
+    var identity = authorize(session);
+    var key = JSON.stringify([session.ownerId || null, identity && identity.uid, identity && identity.home, link.url.toLowerCase()]);
+    var cached = statusCache.get(key);
+    if (cached && (cached.pending || cached.until > Date.now())) return cached.pending || (cached.error ? Promise.reject(cached.error) : Promise.resolve(cached.value));
+    var entry = { failures: cached ? cached.failures : 0 };
+    statusCache.set(key, entry);
+    entry.pending = statusQueue.then(async function () {
+      try {
+        var currentIdentity = authorize(session);
+        if (JSON.stringify(currentIdentity) !== JSON.stringify(identity) || (stillAllowed && !stillAllowed())) throw new Error("Session access changed.");
+        entry.value = await github.readReference(ctx.cwd, link.url, identity, ctx.run, true);
+        entry.failures = 0;
+        entry.until = Date.now() + (entry.value.state === "closed" || entry.value.state === "merged" ? 300000 : 45000);
+        return entry.value;
+      } catch (error) {
+        entry.error = error;
+        entry.failures++;
+        entry.until = Date.now() + Math.min(900000, 60000 * Math.pow(2, entry.failures - 1));
+        throw error;
+      } finally {
+        entry.pending = null;
+        if (statusCache.size > 1000) {
+          for (var pair of statusCache) {
+            if (!pair[1].pending && pair[1].until <= Date.now()) statusCache.delete(pair[0]);
+          }
+        }
+      }
+    });
+    statusQueue = entry.pending.catch(function () {});
+    return entry.pending;
+  }
   function authorize(session) {
     if (!session || ctx.sm.sessions.get(session.localId) !== session || ctx.isMate || !ctx.canUse(session)) throw new Error("GitHub links require an authorized project session.");
     var identity = ctx.identity(session);
@@ -15,26 +49,36 @@ function attachSessionGithub(ctx) {
     if (ctx.sm.saveSessionFile(session) === false) throw new Error("Could not save GitHub links.");
     ctx.sm.broadcastSessionList();
   }
-  async function refresh(session, force) {
+  async function refresh(session, force, statusOnly, stillAllowed) {
     var identity = authorize(session);
-    var id = session.localId;
+    var id = session.localId + (statusOnly ? ":status" : ":full");
     if (inflight.has(id)) return inflight.get(id);
-    if (!force && Date.now() - (attempts.get(id) || 0) < 60000) return session.githubLinks || [];
+    if (!force && Date.now() - (attempts.get(id) || 0) < (statusOnly ? 30000 : 60000)) return session.githubLinks || [];
     attempts.set(id, Date.now());
     var pending = (async function () {
       var links = (session.githubLinks || []).slice();
       var updated = [];
       for (var link of links) {
-        try { updated.push(await github.readReference(ctx.cwd, link.url, identity, ctx.run)); }
+        try {
+          if (stillAllowed && !stillAllowed()) throw new Error("Session access changed.");
+          updated.push(statusOnly ? Object.assign({}, link, await readStatus(session, link, stillAllowed), { stale: false }) : await github.readReference(ctx.cwd, link.url, identity, ctx.run));
+        }
         catch (error) { updated.push(Object.assign({}, link, { stale: true })); }
       }
       authorize(session);
+      if (stillAllowed && !stillAllowed()) throw new Error("Session access changed.");
+      var changed = false;
       // A link/unlink during the request wins over the refresh snapshot.
       session.githubLinks = (session.githubLinks || []).map(function (link) {
         var index = links.indexOf(link);
-        return index < 0 ? link : updated[index];
+        if (index < 0) return link;
+        var next = updated[index];
+        var before = Object.assign({}, link, { checkedAt: null, stale: !!link.stale });
+        var after = Object.assign({}, next, { checkedAt: null, stale: !!next.stale });
+        if (JSON.stringify(before) !== JSON.stringify(after)) changed = true;
+        return next;
       });
-      if (links.length) persist(session);
+      if (changed) persist(session);
       return session.githubLinks || [];
     })();
     inflight.set(id, pending);
@@ -83,9 +127,12 @@ function attachSessionGithub(ctx) {
     callBridgeTool: function (session, name, args) { var tool = defs(session).find(function (item) { return item.name === name; }); return tool ? tool.handler(args) : Promise.reject(new Error("GitHub tool unavailable.")); },
     handleMessage: function (ws, msg) {
       if (msg.type !== "session_github_refresh") return false;
-      var session = ctx.sm.sessions.get(ws._clayActiveSession);
-      if (!session || !ctx.canRefresh(ws, session) || !(session.githubLinks || []).length) return true;
-      refresh(session, false).catch(function () {});
+      var ids = Array.isArray(msg.sessionIds) ? msg.sessionIds.slice(0, 100) : [ws._clayActiveSession];
+      Array.from(new Set(ids)).forEach(function (id) {
+        var session = ctx.sm.sessions.get(id);
+        if (!session || !ctx.canRefresh(ws, session) || !(session.githubLinks || []).length) return;
+        refresh(session, false, true, function () { return ctx.canRefresh(ws, session); }).catch(function () {});
+      });
       return true;
     },
   };

package/lib/public/modules/app-messages.js

@@ -712,10 +712,10 @@ export function processMessage(msg) {
         break;
 
       case "session_list":
-        syncGithubSessions(msg.sessions || []);
         markProjectSessionListHydrated();
         renderMateSessionList(msg.sessions || []);
         renderSessionList(msg.sessions || []);
+        syncGithubSessions(msg.sessions || []);
         syncPaneTitles();
         var panePin = resolvePaneSession(store.get('paneMode'), store.get('panePinPending'), store.get('paneSessionId'), msg.sessions);
         if (panePin.consumed) {

package/lib/public/modules/session-github.js

@@ -40,7 +40,7 @@ export function githubWorkMarkup(session, detailed, expanded, sessionRow) {
     var state = ['open', 'closed', 'merged', 'draft'].indexOf(link.state) >= 0 ? link.state : 'unknown';
     var icon = link.kind === 'pr' ? (state === 'merged' ? 'git-merge' : state === 'closed' ? 'git-pull-request-closed' : state === 'draft' ? 'git-pull-request-draft' : 'git-pull-request') : (state === 'closed' ? 'circle-check' : 'circle-dot');
     var description = link.repository + ' · ' + label(link) + ' · ' + link.title + ' · ' + state + (link.checkedAt ? ' · Checked ' + new Date(link.checkedAt).toLocaleString() : '') + (link.stale ? ' (last known status; refresh unavailable)' : '');
-    var html = anchor(link.url, description, iconHtml('github', 'github-work-brand') + iconHtml(icon, 'github-work-status') + '<span><span class="github-work-kind">' + (link.kind === 'pr' ? 'PR ' : 'Issue ') + '</span>#' + escapeHtml(String(link.number)) + '</span>', 'session-github-link github-kind-' + (link.kind === 'pr' ? 'pr' : 'issue') + ' github-state-' + (link.stale ? 'unknown' : state));
+    var html = anchor(link.url, description, iconHtml('github', 'github-work-brand') + iconHtml(icon, 'github-work-status') + '<span><span class="github-work-kind">' + (link.kind === 'pr' ? 'PR ' : 'Issue ') + '</span>#' + escapeHtml(String(link.number)) + '</span>', 'session-github-link github-kind-' + (link.kind === 'pr' ? 'pr' : 'issue') + ' github-state-' + state);
     if (expanded) html = '<span class="github-work-entry">' + html + '<span class="github-work-entry-title">' + escapeHtml(link.title || '') + '</span><span class="github-work-entry-meta">' + escapeHtml(link.repository + ' · ' + state + (link.stale ? ' · Last known status' : '')) + '</span></span>';
     if (detailed && link.kind === 'pr') {
       html += anchor(link.url + '/files', 'View PR changes on GitHub', 'Changes', 'github-work-action');
@@ -56,6 +56,7 @@ export function appendGithubWork(row, session, title) {
   var html = githubWorkMarkup(session, false, false, true);
   bindGithubWorkPopover();
   if (!html) return;
+  row.dataset.githubSessionId = session.id;
   var column = document.createElement('span');
   column.className = 'session-work-column';
   row.insertBefore(column, title);
@@ -92,15 +93,22 @@ export function currentGithubWorkMarkup() {
 export function refreshGithubWork() {
   if (document.hidden || store.get('dmMode') || !store.get('connected')) return;
   if (store.get('githubWorkProject') !== store.get('currentSlug')) return;
-  var session = (store.get('githubWorkSessions') || []).find(function (item) { return item.active; });
-  if (!safeLinks(session).length) return;
-  var key = store.get('currentSlug') + ':' + session.id;
+  var ids = [];
+  document.querySelectorAll('[data-github-session-id]').forEach(function (row) {
+    var rect = row.getBoundingClientRect();
+    if (rect.width && rect.height && rect.bottom > 0 && rect.top < window.innerHeight && rect.right > 0 && rect.left < window.innerWidth) ids.push(Number(row.dataset.githubSessionId));
+  });
+  var active = (store.get('githubWorkSessions') || []).find(function (item) { return item.active; });
+  if (safeLinks(active).length) ids.unshift(active.id);
+  ids = Array.from(new Set(ids)).slice(0, 100);
+  if (!ids.length) return;
+  var key = store.get('currentSlug') + ':' + ids.join(',');
   var previous = store.get('githubWorkRefresh') || {};
   if (previous.key === key && Date.now() - previous.at < 60000) return;
   var ws = getWs();
   if (!ws || ws.readyState !== 1) return;
   store.set({ githubWorkRefresh: { key: key, at: Date.now() } });
-  ws.send(JSON.stringify({ type: 'session_github_refresh' }));
+  ws.send(JSON.stringify({ type: 'session_github_refresh', sessionIds: ids }));
 }
 
 export function resetGithubWork() {
@@ -154,6 +162,8 @@ function bindGithubWorkPopover() {
     refreshIcons();
   }, true);
   window.addEventListener('resize', closeGithubWorkPopover);
+  window.addEventListener('focus', refreshGithubWork);
+  document.addEventListener('visibilitychange', refreshGithubWork);
   store.subscribe(function (state, previous) {
     if (state.currentSlug !== previous.currentSlug || state.activeSessionId !== previous.activeSessionId || state.dmMode !== previous.dmMode) closeGithubWorkPopover();
   });

package/lib/session-github.js

@@ -31,16 +31,16 @@ function runGh(cwd, args, identity, input) {
     child.stdin.end(input || '');
   });
 }
-async function readReference(cwd, url, identity, run) {
+async function readReference(cwd, url, identity, run, statusOnly) {
   var ref = parseReference(url);
-  var fields = "title,state,url" + (ref.kind === "pr" ? ",isDraft,headRefName,reviewDecision,statusCheckRollup" : "");
+  var fields = "title,state,url" + (ref.kind === "pr" ? (statusOnly ? ",isDraft" : ",isDraft,headRefName,reviewDecision,statusCheckRollup") : "");
   var data = await (run || runGh)(cwd, [ref.kind === "pr" ? "pr" : "issue", "view", String(ref.number), "--repo", ref.repository, "--json", fields], identity);
   var verified = parseReference(data.url);
   if (verified.url.toLowerCase() !== ref.url.toLowerCase()) throw new Error("GitHub returned a different reference.");
   ref.title = String(data.title || "").slice(0, 200);
   ref.state = data.state === "MERGED" ? "merged" : data.state === "CLOSED" ? "closed" : data.state === "OPEN" ? (data.isDraft ? "draft" : "open") : "unknown";
   ref.checkedAt = Date.now();
-  if (ref.kind === "pr") {
+  if (ref.kind === "pr" && !statusOnly) {
     ref.branch = String(data.headRefName || "").slice(0, 200);
     ref.review = ["APPROVED", "CHANGES_REQUESTED", "REVIEW_REQUIRED"].indexOf(data.reviewDecision) >= 0 ? data.reviewDecision : "";
     ref.checks = (data.statusCheckRollup || []).slice(0, 30).map(function (check) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clay-server",
-  "version": "4.6.0",
+  "version": "4.6.1-beta.1",
   "description": "Self-hosted team workspace for Claude Code and Codex. Multi-user, browser-based, with persistent AI mates.",
   "bin": {
     "clay-server": "./bin/cli.js"