@teamvibe/poller 0.8.6-rc.1 → 0.8.6-rc.2

package/dist/pool-logging.d.ts

@@ -1,7 +1,7 @@
 import type { PoolFetchDiagnostics } from './subscription-pool-client.js';
 import type { SessionLogger } from './logger.js';
 import type { ClaudeRateLimitInfo } from './claude-rate-limit.js';
-import { type AccountIdentity, type AccountUsageState, type PoolFetchResult, type SelectionOutcome } from './subscription-selection.js';
+import { type AccountIdentity, type AccountUsageState, type PoolFetchResult, type SelectionOutcome, type UsageWindow } from './subscription-selection.js';
 export type PoolInfoLogger = Pick<SessionLogger, 'info'>;
 type LabeledAccount = AccountIdentity & {
     label?: string;
@@ -15,6 +15,7 @@ export declare function poolErrorClass(error: unknown): string;
 export declare function poolErrorDiagnostic(error: unknown): string;
 export declare function logPoolFetch(log: PoolInfoLogger, pool: PoolFetchResult & PoolFetchDiagnostics): void;
 export declare function logPoolSelection<A extends LabeledAccount>(log: PoolInfoLogger, pool: PoolFetchResult<A>, states: Readonly<Record<string, AccountUsageState>>, model: string | undefined, now: number, selected: SelectionOutcome<A>, logAllExhausted?: boolean): void;
+export declare function formatPoolUsageWindows(windows: readonly UsageWindow[], includeScope?: boolean): string;
 /** Log the real store promise without changing its rejection or retry behavior. */
 export declare function logPoolUsageWrite(log: PoolInfoLogger, account: {
     label?: string;

package/dist/pool-logging.js

@@ -87,9 +87,12 @@ export function logPoolSelection(log, pool, states, model, now, selected, logAll
         poolInfo(log, `selected account=${poolLabel(selected.account)} model=${JSON.stringify(model ?? 'CLI default')} score=${score}`);
     }
 }
+export function formatPoolUsageWindows(windows, includeScope = true) {
+    return windows.map(w => `${w.window}${includeScope ? `/${w.scope}` : ''}:${w.percent === undefined ? 'unknown' : `${Number(w.percent.toFixed(2))}%`}`).join(',') || 'none';
+}
 /** Log the real store promise without changing its rejection or retry behavior. */
 export async function logPoolUsageWrite(log, account, info, write, source = 'passive') {
-    const windows = info ? normalizePassiveUsage(safeRateLimitInfo(info), Date.now()).windows.map(w => `${w.window}${source === 'passive' ? `/${w.scope}` : ''}:${w.percent === undefined ? 'unknown' : `${Number(w.percent.toFixed(2))}%`}`).join(',') : '';
+    const windows = formatPoolUsageWindows(info ? normalizePassiveUsage(safeRateLimitInfo(info), Date.now()).windows : [], source === 'passive');
     try {
         await write();
         poolInfo(log, `usage write account=${poolLabel(account)} result=ok windows=${windows || 'none'} source=${source}`);

package/dist/subscription-runtime.js

@@ -93,7 +93,7 @@ function probeUnknownAccounts(accounts, selectedAccountId, resolved, store, opti
                     poolInfo({ info: options.log }, `local probe account=${poolLabel(account)} result=cli_at_capacity`);
                     return;
                 }
-                await runUsageProbe(account, { ...options, timeoutMs: LOCAL_PROBE_TIMEOUT_MS }, {
+                await runUsageProbe(account, { ...options, model: resolved.model, timeoutMs: LOCAL_PROBE_TIMEOUT_MS }, {
                     channelId, signal: probe.controller.signal,
                     onMeasurementComplete: () => {
                         if (localProbesInFlight.get(key) === probe)

package/dist/subscription-selection.d.ts

@@ -5,6 +5,7 @@ export declare const PIN_HEADROOM_SWITCH_RELATIVE = 0.25;
 export declare const USAGE_THRESHOLD_PERCENT = 90;
 /** Fallback freshness for passive windows without a reset time. */
 export declare const PASSIVE_USAGE_TTL_MS: number;
+/** Fallback freshness for probe windows without a reset time. */
 export declare const PROBE_USAGE_TTL_MS = 60000;
 export declare const POOL_RECHECK_MS: number;
 /** Safety hold from the rejection observation when the provider gives no reset. */
@@ -51,7 +52,7 @@ export interface UsageObservation {
     observedAt: number;
     windows: readonly UsageWindow[];
 }
-/** Passive percentages remain lower bounds until reset; probes retain their short TTL. */
+/** Passive and probe percentages remain lower bounds until each window resets. */
 export declare function usageWindowExpiresAt(usage: UsageObservation, window: UsageWindow): number;
 /** Latest measurements plus durable rejections; omission or success never clears a hold. */
 export declare function mergeUsageObservations(observations: readonly (UsageObservation | undefined)[], now: number): UsageObservation | undefined;

package/dist/subscription-selection.js

@@ -3,14 +3,15 @@ export const PIN_HEADROOM_SWITCH_RELATIVE = 0.25;
 export const USAGE_THRESHOLD_PERCENT = 90;
 /** Fallback freshness for passive windows without a reset time. */
 export const PASSIVE_USAGE_TTL_MS = 5 * 60_000;
+/** Fallback freshness for probe windows without a reset time. */
 export const PROBE_USAGE_TTL_MS = 60_000;
 export const POOL_RECHECK_MS = 15 * 60_000;
 /** Safety hold from the rejection observation when the provider gives no reset. */
 export const REJECTED_BLOCK_MS = 15 * 60_000;
-/** Passive percentages remain lower bounds until reset; probes retain their short TTL. */
+/** Passive and probe percentages remain lower bounds until each window resets. */
 export function usageWindowExpiresAt(usage, window) {
     const ttlExpiry = usage.observedAt + (usage.source === 'passive' ? PASSIVE_USAGE_TTL_MS : PROBE_USAGE_TTL_MS);
-    return usage.source === 'passive' ? window.resetAt ?? ttlExpiry : Math.min(window.resetAt ?? ttlExpiry, ttlExpiry);
+    return window.resetAt ?? ttlExpiry;
 }
 /** Latest measurements plus durable rejections; omission or success never clears a hold. */
 export function mergeUsageObservations(observations, now) {

package/dist/usage-probe-job.d.ts

@@ -8,6 +8,8 @@ type ProbeResult = Reason | 'ok' | 'cancelled';
 export interface UsageProbeOptions {
     store: SubscriptionUsageStore;
     cliPath: string;
+    /** Use the session's resolved model for local probes; platform jobs default to CLI behavior. */
+    model?: string;
     timeoutMs?: number;
     /** Injectable child for deterministic tests; production uses node spawn. */
     spawn?: typeof spawn;

package/dist/usage-probe-job.js

@@ -5,7 +5,7 @@ import { join } from 'node:path';
 import { normalizePassiveUsage } from './subscription-selection.js';
 import { safeRateLimitInfo, usageStateForSelection, } from './subscription-usage-store.js';
 import { parseClaudeRateLimitInfo, } from './claude-rate-limit.js';
-import { poolInfo, poolLabel } from './pool-logging.js';
+import { formatPoolUsageWindows, poolInfo, poolLabel } from './pool-logging.js';
 export function isUsageProbe(value) {
     return (!!value &&
         typeof value === 'object' &&
@@ -84,6 +84,7 @@ export async function handleUsageProbe(job, options) {
 export async function runUsageProbe(account, options, context = {}) {
     let result = 'unknown';
     let cwd;
+    let measuredWindows;
     const cancelled = () => context.signal?.aborted === true;
     try {
         if (cancelled())
@@ -109,6 +110,7 @@ export async function runUsageProbe(account, options, context = {}) {
             const child = (options.spawn ?? spawn)(options.cliPath, [
                 '-p',
                 'Reply OK.',
+                ...(options.model ? ['--model', options.model] : []),
                 '--output-format',
                 'stream-json',
                 '--verbose',
@@ -212,6 +214,7 @@ export async function runUsageProbe(account, options, context = {}) {
             ...normalizePassiveUsage(safe, now),
             source: 'probe',
         };
+        measuredWindows = formatPoolUsageWindows(usage.windows);
         await options.store.finishProbe(account, {
             status: 'ok',
             observedAt: now,
@@ -245,6 +248,6 @@ export async function runUsageProbe(account, options, context = {}) {
         const description = context.requestId
             ? `usage probe request=${context.requestId}`
             : `local probe account=${poolLabel(account)}`;
-        poolInfo({ info: options.log }, `${description} result=${result}${result === 'cancelled' ? ' reason=account selected' : ''}`);
+        poolInfo({ info: options.log }, `${description} result=${result}${result === 'ok' && !context.requestId ? ` windows=${measuredWindows}` : ''}${result === 'cancelled' ? ' reason=account selected' : ''}`);
     }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@teamvibe/poller",
-  "version": "0.8.6-rc.1",
+  "version": "0.8.6-rc.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@teamvibe/poller",
-      "version": "0.8.6-rc.1",
+      "version": "0.8.6-rc.2",
       "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.6-rc.1",
+  "version": "0.8.6-rc.2",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {