agents-relay 2.0.2 → 2.0.4

package/dist/dashboard-actions.js

@@ -2,6 +2,7 @@ import { applyJobGraphTarget, applyTaskGraphTarget } from './workflow/runtime.js
 import { jobLifecycleV2, taskLifecycleV2 } from './workflow/definitions-v2.js';
 import { dispatchWorkflowTargetOverride } from './workflow/dispatcher.js';
 import { dispatchTaskAction } from './task-actions.js';
+import { applyJobCancelAction } from './job-actions.js';
 export function dashboardTaskAction(store, reconciler, action) {
     return async (jobId, taskId) => {
         const job = await store.load(jobId);
@@ -20,6 +21,12 @@ export function dashboardTaskAction(store, reconciler, action) {
 export function dashboardJobSetState(store) {
     return async (jobId, state) => {
         const job = await store.load(jobId);
+        if (state === 'CANCELLED') {
+            if (job.state !== 'CANCELLED')
+                await applyJobCancelAction(store, job);
+            await store.closePullRequest?.();
+            return await store.load(job.id);
+        }
         if (job.state === state)
             return job;
         await dispatchWorkflowTargetOverride(jobLifecycleV2, {

package/dist/dashboard-html.js

@@ -397,36 +397,53 @@ function githubBucket(label,bucket){const row=element('div','usage-row');const h
 function githubCounterLine(label,values){const entries=Object.entries(values||{}).sort((a,b)=>Number(b[1])-Number(a[1])).slice(0,8);return entries.length?element('div','subtle',text(label+' · '+entries.map(([key,count])=>key+' '+count).join(' · '))):null;}
 function githubObserved(label,observed){
   if(!observed)return null;
+  if(Number.isFinite(observed.limit)&&Number.isFinite(observed.remaining)){const row=githubBucket(label,observed);if(observed.reason)row.title=observed.reason;return row;}
   const state=observed.throttled?'Throttled':observed.available===true?'Available':observed.available===false?'Unavailable':'Unknown';
   const parts=[label+' observed',state];
   if(observed.status!==null)parts.push('status '+observed.status);
-  if(observed.remaining!==null)parts.push('remaining '+observed.remaining);
-  if(observed.headersCaptured&&observed.reset!==null)parts.push(shortReset(observed.reset));
   if(observed.retryAfterSeconds!==null)parts.push('retry '+observed.retryAfterSeconds+'s');
   const row=element('div',observed.throttled?'usage-row error-state':'usage-row subtle');
   row.textContent=parts.filter(Boolean).join(' · ');
   if(observed.reason)row.title=observed.reason;
   return row;
 }
+function githubSecondary(status){
+  const rejection=status?.runtimeRateUsage?.rejection;
+  const row=element('div','usage-row');
+  const heading=element('div','usage-label');
+  if(rejection?.kind!=='secondary'){heading.append(element('span','',text('Secondary protection')),element('span','',text('No active cooldown')));row.append(heading);return row;}
+  const start=Date.parse(rejection.observedAt);
+  const until=Date.parse(rejection.cooldownUntil||status?.cooldownUntil||'');
+  if(!Number.isFinite(start)||!Number.isFinite(until)||until<=start){heading.append(element('span','',text('Secondary protection')),element('span','',text('Throttled')));row.classList.add('error-state');row.append(heading);return row;}
+  const total=until-start;
+  const remaining=Math.max(0,until-Date.now());
+  const percent=Math.max(0,Math.min(100,100*remaining/total));
+  heading.append(element('span','',text('Secondary cooldown')),element('span','',text(Math.ceil(remaining/1000)+'s')));
+  const track=element('div','usage-track');track.setAttribute('role','progressbar');track.setAttribute('aria-label','Secondary cooldown remaining');track.setAttribute('aria-valuemin','0');track.setAttribute('aria-valuemax','100');track.setAttribute('aria-valuenow',String(Math.round(percent)));const fill=element('div','usage-fill');fill.style.width=percent+'%';track.append(fill);
+  const hint=element('div','subtle',text('Retry '+new Date(until).toLocaleString()));hint.title=new Date(until).toLocaleString();
+  row.append(heading,track,hint);
+  return row;
+}
 function githubDiagnostics(status){const body=element('div','usage-details-body');if(status?.calls)body.append(element('div','subtle',text('Calls · GraphQL '+(status.calls.graphql||0)+' · REST '+(status.calls.rest||0)+' · quota '+(status.calls.rateLimit||0))));const operations=githubCounterLine('GraphQL operations',status?.graphql?.operations);if(operations)body.append(operations);const contexts=githubCounterLine('GraphQL contexts',status?.graphql?.contexts);if(contexts)body.append(contexts);if(status?.readPaths){body.append(element('div','subtle',text('Reads · scans '+(status.readPaths.workspaceScans||0)+' · PR '+(status.readPaths.prRefreshes||0)+' · coalesced '+(status.readPaths.prRefreshCoalesced||0))));const triggers=githubCounterLine('Refresh triggers',status.readPaths.prRefreshesByTrigger);if(triggers)body.append(triggers);const coalesced=githubCounterLine('Coalesced',status.readPaths.prRefreshCoalescedByTrigger);if(coalesced)body.append(coalesced);}if(!body.children.length)return null;const details=element('details','usage-details');details.append(element('summary','',text('Diagnostics')),body);return details;}
 function githubUsageCard(snapshot,status){
   const card=element('section','usage-provider');
   card.append(element('h3','',text('GitHub API')));
   const resources=snapshot?.resources||{};
+  const observed=status?.runtimeRateUsage?.resources||{};
   const bars=element('div','usage-bars');
+  bars.append(githubSecondary(status),element('div','usage-label',text('Request-time X-RateLimit headers')));
+  let observedCount=0;
+  for(const row of [githubObserved('REST',observed.core),githubObserved('GraphQL',observed.graphql),githubObserved('Search',observed.search)])if(row){bars.append(row);observedCount++;}
+  if(!observedCount)bars.append(element('p','empty',text('No request-time headers observed')));
   bars.append(element('div','usage-label',text('Primary quota (/rate_limit)')));
-  if(resources.core)bars.append(githubBucket('REST',resources.core));
-  if(resources.graphql)bars.append(githubBucket('GraphQL',resources.graphql));
-  if(resources.search)bars.append(githubBucket('Search',resources.search));
-  if(!bars.children.length)bars.append(element('p','empty',text('Quota unavailable')));
-  const observed=status?.runtimeRateUsage?.resources||{};
-  for(const row of [githubObserved('REST',observed.core),githubObserved('GraphQL',observed.graphql),githubObserved('Search',observed.search)])if(row)bars.append(row);
-  if(status?.runtimeRateUsage?.rejection){
+  let quotaCount=0;
+  for(const pair of [['REST',resources.core],['GraphQL',resources.graphql],['Search',resources.search]])if(pair[1]){bars.append(githubBucket(pair[0],pair[1]));quotaCount++;}
+  if(!quotaCount)bars.append(element('p','empty',text('Quota unavailable')));
+  if(status?.runtimeRateUsage?.rejection&&status.runtimeRateUsage.rejection.kind!=='secondary'){
     const rejection=status.runtimeRateUsage.rejection;
-    const cooldown=rejection.cooldownUntil?' · cooldown '+new Date(rejection.cooldownUntil).toLocaleTimeString():'';
-    bars.append(element('div','error-state',text('Throttled · '+(rejection.kind==='unknown'?'rate limit':rejection.kind)+' limit'+cooldown)));
+    bars.append(element('div','error-state',text('Throttled · '+(rejection.kind==='unknown'?'rate limit':rejection.kind)+' limit')));
   }
-  if(status?.limited){
+  if(status?.limited&&status?.runtimeRateUsage?.rejection?.kind!=='secondary'){
     const until=status.cooldownUntil?' until '+new Date(status.cooldownUntil).toLocaleTimeString():'';
     bars.append(element('div','error-state',text('Cooldown active'+until)));
   }

package/dist/github-runtime-usage.js

@@ -14,12 +14,13 @@ function transportResource(requestChannel, headers) {
     return requestChannel === 'graphql' ? 'graphql' : 'core';
 }
 function rejectionKind(headers, reason) {
-    if (/secondary rate|graphql_rate_limit/i.test(reason))
+    const remaining = headerNumber(headers['x-ratelimit-remaining']);
+    if (remaining === 0)
+        return 'primary';
+    if (/secondary rate/i.test(reason) || headerNumber(headers['retry-after']) !== null)
         return 'secondary';
-    if (/rate limit/i.test(reason) && headerNumber(headers['x-ratelimit-remaining']) !== 0)
+    if (/rate limit/i.test(reason) && remaining !== null && remaining > 0)
         return 'secondary';
-    if (/rate limit/i.test(reason))
-        return 'primary';
     return 'unknown';
 }
 function isThrottled(status, reason) {
@@ -51,6 +52,8 @@ export function runtimeRejection(observation) {
     const headers = {};
     if (observation.remaining !== null)
         headers['x-ratelimit-remaining'] = String(observation.remaining);
+    if (observation.retryAfterSeconds !== null)
+        headers['retry-after'] = String(observation.retryAfterSeconds);
     const retryAfterSeconds = observation.retryAfterSeconds;
     return {
         resource: observation.resource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agents-relay",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Durable async agent jobs coordinated through GitHub pull requests",
   "type": "module",
   "bin": {