@teamvibe/poller 0.8.7 → 0.8.9-rc.1

package/dist/usage-limit-messages.js

@@ -1,6 +1,17 @@
 import { USAGE_THRESHOLD_PERCENT } from './subscription-selection.js';
 /** Owner-facing account policy location. */
 export const FULL_QUOTA_SETTINGS_PATH = 'Connections (account menu → Use until exhausted)';
+/** Quota notices include a calendar date and zone across multi-day holds. */
+function formatQuotaTime(at, timeZone) {
+    try {
+        const parts = new Intl.DateTimeFormat('en-GB', { timeZone: timeZone || 'UTC', weekday: 'short', day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit', hourCycle: 'h23', timeZoneName: 'short' }).formatToParts(at);
+        const part = (type) => parts.find(p => p.type === type)?.value;
+        return `${part('weekday')} ${part('day')} ${part('month')} ${part('hour')}:${part('minute')} ${part('timeZoneName')}`;
+    }
+    catch {
+        return formatQuotaTime(at, 'UTC');
+    }
+}
 export function formatUsageReset(input) {
     if (input.resetAt === undefined || !Number.isFinite(input.resetAt))
         return undefined;
@@ -43,6 +54,17 @@ export function formatPoolUsageLimitMessage(input) {
         const labels = headroom.filter(a => a.label && a.remaining > 0).map(a => `${a.label} ${Number(a.remaining.toFixed(2))} %`).join(', ');
         return `⏳ All Claude accounts in this workspace are above ${USAGE_THRESHOLD_PERCENT} % of their usage limit, so I'm waiting for the next reset${reset ? ` at ${reset}` : ''}. Your message is saved and will run automatically.\n💡 There is still some capacity left${labels ? ` (${labels})` : ''}. A workspace owner can allow the full quota per account in ${FULL_QUOTA_SETTINGS_PATH}.`;
     }
+    if (input.blockedWindows?.length) {
+        const windows = [...new Map(input.blockedWindows.map(w => [`${w.window}:${w.scope}`, w])).values()];
+        const names = windows.map(w => `${w.scope === 'global' ? 'global' : w.scope === 'uncertain' ? 'Claude' : w.scope[0].toUpperCase() + w.scope.slice(1)} ${w.window === 'seven_day' ? 'weekly' : 'five-hour'} quota`);
+        const global = windows.some(w => w.scope === 'global' || w.scope === 'uncertain');
+        const resets = input.resetAt !== undefined ? `resets ${formatQuotaTime(input.resetAt, input.timeZone)}` : 'reset time unavailable';
+        const retry = input.eligibleAt !== undefined ? `I'll retry automatically at ${formatQuotaTime(input.eligibleAt, input.timeZone)}` : "I'll retry automatically after the next reset";
+        const blocked = windows.length === 1 && !global
+            ? `${names[0]} is exhausted on every account in this workspace (${resets}).`
+            : `All Claude accounts in this workspace have hit their usage limit (${names.join(', ')}; ${resets}).`;
+        return `⏳ ${blocked} Your message is saved. ${retry}${global ? '.' : '; other models keep working.'}`;
+    }
     return `⏳ All Claude accounts in this workspace have hit their usage limit. Your message is saved and will run automatically after ${reset ? `the earliest reset at ${reset}` : 'the next reset'}.`;
 }
 export function formatLegacyUsageLimitMessage(input) {

package/dist/usage-probe-job.js

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 import { mkdtemp, rm, mkdir } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { selectSubscriptionAccount, normalizePassiveUsage } from './subscription-selection.js';
+import { selectSubscriptionAccount, normalizePassiveUsage, reactiveUsageWindow } from './subscription-selection.js';
 import { safeRateLimitInfo, usageStateForSelection, } from './subscription-usage-store.js';
 import { parseClaudeRateLimitInfo, } from './claude-rate-limit.js';
 import { formatPoolUsageWindows, poolInfo, poolLabel } from './pool-logging.js';
@@ -210,18 +210,46 @@ export async function runUsageProbe(account, options, context = {}) {
             return result;
         const now = Date.now();
         const safe = safeRateLimitInfo(info);
+        const normalized = normalizePassiveUsage(safe, now);
         const usage = {
-            ...normalizePassiveUsage(safe, now),
+            ...normalized,
             source: 'probe',
+            windows: normalized.windows.map(w => ({ ...w,
+                ...(w.status === undefined && w.percent !== undefined && (safe.status === 'allowed' || safe.status === 'allowed_warning') ? { status: safe.status } : {}),
+            })),
         };
         measuredWindows = formatPoolUsageWindows(usage.windows);
+        const before = usageStateForSelection(await options.store.read(account), now);
         await options.store.finishProbe(account, {
             status: 'ok',
             observedAt: now,
             usage,
         });
         const stored = await options.store.read(account);
-        if (selectSubscriptionAccount({ pool: { kind: 'ready', accounts: [account] }, states: { [account.accountId]: usageStateForSelection(stored, now) }, model: undefined, now }).kind === 'selected') {
+        const after = usageStateForSelection(stored, now);
+        // Keep the combined comparison, and compare each rejected scope/window
+        // independently so an unrelated, later hold cannot hide an improvement.
+        const pairs = new Map();
+        for (const state of [before, after])
+            for (const w of [...(state.usage?.windows ?? []), ...(state.reactive ?? []).map(reactiveUsageWindow)]) {
+                if (w.status === 'rejected')
+                    pairs.set(`${w.scope}.${w.window}`, w);
+            }
+        const eligibility = (state, pair) => {
+            const matches = (w) => !pair || w.scope === pair.scope && w.window === pair.window;
+            const scoped = pair ? {
+                usage: state.usage ? { ...state.usage, windows: state.usage.windows.filter(matches) } : undefined,
+                reactive: state.reactive?.filter(r => matches(reactiveUsageWindow(r))),
+            } : state;
+            return selectSubscriptionAccount({ pool: { kind: 'ready', accounts: [account] }, states: { [account.accountId]: scoped }, model: pair?.scope, now });
+        };
+        const improved = [undefined, ...pairs.values()].some(pair => {
+            const previous = eligibility(before, pair);
+            const current = eligibility(after, pair);
+            return current.kind === 'selected' && (!pair || previous.kind === 'deferred') ||
+                current.kind === 'deferred' && previous.kind === 'deferred' && current.eligibleAt < previous.eligibleAt;
+        });
+        if (improved) {
             try {
                 options.onHeadroom?.(account.workspaceId);
             }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@teamvibe/poller",
-  "version": "0.8.7",
+  "version": "0.8.9-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@teamvibe/poller",
-      "version": "0.8.7",
+      "version": "0.8.9-rc.1",
       "dependencies": {
         "@aws-sdk/client-dynamodb": "3.1108.0",
         "@aws-sdk/client-sqs": "3.1108.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamvibe/poller",
-  "version": "0.8.7",
+  "version": "0.8.9-rc.1",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {