agent-relay-server 0.88.1 → 0.88.2

package/docs/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.1.0",
   "info": {
     "title": "Agent Relay API",
-    "version": "0.88.1",
+    "version": "0.88.2",
     "description": "Real-time message bus for inter-agent communication. Agent-first: this spec is designed for machine consumption — agents can self-discover the full API surface via GET /api/spec.",
     "license": {
       "name": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.88.1",
+  "version": "0.88.2",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",

package/src/db/provider-quotas.ts

@@ -45,6 +45,10 @@ type ProviderQuotaSnapshotRow = {
   last_error?: string | null;
 };
 
+type StoredQuotaState = QuotaState & {
+  _windowUpdatedAt?: Record<string, number>;
+};
+
 function cleanKey(value: string): string {
   return value.trim();
 }
@@ -189,8 +193,48 @@ function quotaWindowKey(window: QuotaState["windows"][number]): string {
   return `${window.name}:${window.unit}`;
 }
 
-function quotaWindowSampleTimes(provider: string, accountKey: string, fallback?: QuotaState): Map<string, number> {
+function publicQuotaState(quota: StoredQuotaState): QuotaState {
+  return {
+    windows: quota.windows.map((window) => ({ ...window })),
+    source: quota.source,
+    updatedAt: quota.updatedAt,
+  };
+}
+
+function parseStoredQuotaState(value: string, fallback: QuotaState): StoredQuotaState {
+  const quota = parseJson<StoredQuotaState>(value, fallback);
+  return {
+    ...publicQuotaState(quota),
+    ...(quota._windowUpdatedAt && typeof quota._windowUpdatedAt === "object" ? { _windowUpdatedAt: quota._windowUpdatedAt } : {}),
+  };
+}
+
+function storedQuotaWindowSampleTimes(quota: StoredQuotaState): Map<string, number> {
   const times = new Map<string, number>();
+  const rawTimes = quota._windowUpdatedAt && typeof quota._windowUpdatedAt === "object" ? quota._windowUpdatedAt : {};
+  for (const window of quota.windows) {
+    const key = quotaWindowKey(window);
+    const value = rawTimes[key];
+    if (typeof value === "number" && Number.isFinite(value)) times.set(key, value);
+  }
+  return times;
+}
+
+function quotaWithWindowSampleTimes(quota: QuotaState, times: Map<string, number>): StoredQuotaState {
+  const windowUpdatedAt: Record<string, number> = {};
+  for (const window of quota.windows) {
+    const timestamp = times.get(quotaWindowKey(window));
+    if (timestamp !== undefined) windowUpdatedAt[quotaWindowKey(window)] = timestamp;
+  }
+  return Object.keys(windowUpdatedAt).length > 0
+    ? { ...quota, _windowUpdatedAt: windowUpdatedAt }
+    : quota;
+}
+
+function quotaWindowSampleTimes(provider: string, accountKey: string, fallback?: StoredQuotaState): Map<string, number> {
+  const times = new Map<string, number>();
+  const storedTimes = fallback ? storedQuotaWindowSampleTimes(fallback) : new Map<string, number>();
+  for (const [key, timestamp] of storedTimes) times.set(key, timestamp);
   const rows = getDb().query(`
     SELECT quota_state FROM quota_snapshots
     WHERE provider = ? AND account_key = ? AND unavailable = 0
@@ -200,6 +244,7 @@ function quotaWindowSampleTimes(provider: string, accountKey: string, fallback?:
     const quota = parseJson<QuotaState>(row.quota_state, { windows: [], source: "probe", updatedAt: 0 });
     for (const window of quota.windows) {
       const key = quotaWindowKey(window);
+      if (storedTimes.has(key)) continue;
       times.set(key, Math.max(times.get(key) ?? 0, quota.updatedAt));
     }
   }
@@ -212,25 +257,36 @@ function quotaWindowSampleTimes(provider: string, accountKey: string, fallback?:
   return times;
 }
 
-function mergeQuotaWindows(existing: QuotaState | undefined, incoming: QuotaState, provider: string, accountKey: string): {
-  quota: QuotaState;
+function mergeQuotaWindows(existing: StoredQuotaState | undefined, incoming: QuotaState, provider: string, accountKey: string): {
+  quota: StoredQuotaState;
   acceptedIncomingWindow: boolean;
 } {
-  if (!existing) return { quota: incoming, acceptedIncomingWindow: true };
+  if (!existing) {
+    const times = new Map(incoming.windows.map((window) => [quotaWindowKey(window), incoming.updatedAt]));
+    return { quota: quotaWithWindowSampleTimes(incoming, times), acceptedIncomingWindow: true };
+  }
   const existingTimes = quotaWindowSampleTimes(provider, accountKey, existing);
   const incomingByKey = new Map(incoming.windows.map((window) => [quotaWindowKey(window), window]));
+  const mergedTimes = new Map<string, number>();
   let acceptedIncomingWindow = false;
   let updatedAt = existing.updatedAt;
   let source = existing.source;
   const windows = existing.windows.map((window) => {
     const key = quotaWindowKey(window);
     const incomingWindow = incomingByKey.get(key);
-    if (!incomingWindow) return window;
     const existingUpdatedAt = existingTimes.get(key) ?? existing.updatedAt;
-    if (incoming.updatedAt < existingUpdatedAt) return window;
+    if (!incomingWindow) {
+      mergedTimes.set(key, existingUpdatedAt);
+      return window;
+    }
+    if (incoming.updatedAt < existingUpdatedAt) {
+      mergedTimes.set(key, existingUpdatedAt);
+      return window;
+    }
     acceptedIncomingWindow = true;
     updatedAt = Math.max(updatedAt, incoming.updatedAt);
     source = incoming.source;
+    mergedTimes.set(key, incoming.updatedAt);
     return incomingWindow;
   });
   const existingKeys = new Set(existing.windows.map(quotaWindowKey));
@@ -240,8 +296,9 @@ function mergeQuotaWindows(existing: QuotaState | undefined, incoming: QuotaStat
     windows.push(window);
     updatedAt = Math.max(updatedAt, incoming.updatedAt);
     source = incoming.source;
+    mergedTimes.set(quotaWindowKey(window), incoming.updatedAt);
   }
-  return { quota: { windows, source, updatedAt }, acceptedIncomingWindow };
+  return { quota: quotaWithWindowSampleTimes({ windows, source, updatedAt }, mergedTimes), acceptedIncomingWindow };
 }
 
 function rowToSnapshot(row: ProviderQuotaSnapshotRow): ProviderQuotaSnapshot {
@@ -258,14 +315,14 @@ function rowToSnapshot(row: ProviderQuotaSnapshotRow): ProviderQuotaSnapshot {
   }
   return {
     ...base,
-    quota: parseJson<QuotaState>(row.quota_state, { windows: [], source: "probe", updatedAt: row.captured_at }),
+    quota: publicQuotaState(parseStoredQuotaState(row.quota_state, { windows: [], source: "probe", updatedAt: row.captured_at })),
   };
 }
 
 function rowToRecord(row: ProviderQuotaRow, history: ProviderQuotaSnapshot[], now: number): ProviderQuotaRecord {
   const lastError = parseJson<ProviderQuotaError | undefined>(row.last_error, undefined);
   const lastUpdatedAt = row.last_updated_at ?? undefined;
-  const quota = row.quota_state ? parseJson<QuotaState>(row.quota_state, { windows: [], source: "probe", updatedAt: lastUpdatedAt ?? row.last_attempt_at }) : undefined;
+  const quota = row.quota_state ? publicQuotaState(parseStoredQuotaState(row.quota_state, { windows: [], source: "probe", updatedAt: lastUpdatedAt ?? row.last_attempt_at })) : undefined;
   return {
     provider: row.provider,
     accountKey: row.account_key,
@@ -322,7 +379,7 @@ export function upsertProviderQuota(input: ProviderQuotaUpdateInput, now = Date.
   const existing = getDb().query("SELECT * FROM provider_quotas WHERE provider = ? AND account_key = ?").get(provider, accountKey) as ProviderQuotaRow | undefined;
   const sourceAgentIds = normalizeSourceAgentIds(existing?.source_agent_ids);
   if (input.sourceAgentId && !sourceAgentIds.includes(input.sourceAgentId)) sourceAgentIds.push(input.sourceAgentId);
-  const existingQuota = existing?.quota_state ? parseJson<QuotaState>(existing.quota_state, { windows: [], source: "probe", updatedAt: existing.last_updated_at ?? 0 }) : undefined;
+  const existingQuota = existing?.quota_state ? parseStoredQuotaState(existing.quota_state, { windows: [], source: "probe", updatedAt: existing.last_updated_at ?? 0 }) : undefined;
   const mergedQuota = input.quota ? mergeQuotaWindows(existingQuota, input.quota, provider, accountKey) : undefined;
   const lastUpdatedAt = mergedQuota ? mergedQuota.quota.updatedAt : existing?.last_updated_at ?? undefined;
   const lastAttemptAt = input.lastAttemptAt ?? input.quota?.updatedAt ?? now;
@@ -356,8 +413,9 @@ export function upsertProviderQuota(input: ProviderQuotaUpdateInput, now = Date.
     now,
   );
 
-  if (input.quota && latestSnapshotFingerprint(provider, accountKey) !== quotaFingerprint(input.quota)) {
-    recordProviderQuotaSnapshot({ provider, accountKey, quota: input.quota, sourceAgentId: input.sourceAgentId }, now);
+  const snapshotQuota = mergedQuota?.acceptedIncomingWindow ? publicQuotaState(mergedQuota.quota) : undefined;
+  if (snapshotQuota && latestSnapshotFingerprint(provider, accountKey) !== quotaFingerprint(snapshotQuota)) {
+    recordProviderQuotaSnapshot({ provider, accountKey, quota: snapshotQuota, sourceAgentId: input.sourceAgentId }, now);
   } else if (!input.quota && input.lastError?.type === "unavailable" && !latestSnapshotIsUnavailable(provider, accountKey)) {
     // #609 — the provider couldn't be collected (orchestrator skip, #601). Record one explicit gap
     // marker on the transition into unavailable (deduped while it stays unavailable) so history shows
@@ -368,7 +426,7 @@ export function upsertProviderQuota(input: ProviderQuotaUpdateInput, now = Date.
     const quotaAdvisoryState = providerQuotaAdvisoryHandler?.({
       provider,
       accountKey,
-      previousQuota: existingQuota,
+      previousQuota: existingQuota ? publicQuotaState(existingQuota) : undefined,
       quota: input.quota,
       sourceAgentIds,
       previousAdvisoryState: existing?.quota_advisory_state,