@teamvibe/poller 0.8.4-rc.2 → 0.8.4

package/README.md

@@ -74,23 +74,23 @@ All configuration is via environment variables (or `~/.teamvibe/.env`):
 |----------|----------|---------|-------------|
 | `TEAMVIBE_POLLER_TOKEN` | Yes | — | Your poller authentication token |
 | `CLAUDE_CODE_OAUTH_TOKEN` | No | — | Claude Code OAuth token (from `claude setup-token`) |
-| `EXPOSE_CLAUDE_TOKEN_TO_AGENT` | No | `false` | Opt in per poller to exposing the session token to agent subprocesses; accepts `1`/`true`/`yes`/`on` (case-insensitive) |
-| `TEAMVIBE_CLAUDE_OAUTH_TOKEN` | Injected | Unset | In the poller-injected env: with opt-in, the selected pool account's token, otherwise the poller's non-empty `CLAUDE_CODE_OAUTH_TOKEN`; inherited aliases are cleared. Claude settings can override this |
-| `TEAMVIBE_POOL_ACCOUNT_ID` | Injected | Unset | In the poller-injected env: with opt-in and a selected pool account, its account ID (no secret); absent without a pool account. Claude settings can override this |
+| `EXPOSE_CLAUDE_TOKEN_TO_AGENT` | No | `true` | Expose the session token to agent subprocesses by default; only `0`/`false`/`no`/`off` (case-insensitive) opt out. Unset or any other value is on |
+| `TEAMVIBE_CLAUDE_OAUTH_TOKEN` | Injected | Session token | In the poller-injected env: the selected pool account's token or the poller's non-empty `CLAUDE_CODE_OAUTH_TOKEN`; unset on explicit opt-out or without a token. Inherited aliases are cleared. Claude settings can override this |
+| `TEAMVIBE_POOL_ACCOUNT_ID` | Injected | Selected account ID | In the poller-injected env: the selected pool account ID (no secret); unset on explicit opt-out or without a pool account. Claude settings can override this |
 | `TEAMVIBE_API_URL` | No | `https://poller.api.teamvibe.ai` | API endpoint |
 | `MAX_CONCURRENT_SESSIONS` | No | `5` | Max parallel Claude sessions |
 | `CLAUDE_CLI_PATH` | No | `claude` | Path to Claude Code CLI |
 | `TEAMVIBE_DATA_DIR` | No | `~/.teamvibe` | Data directory for brains and state |
 
-Set `EXPOSE_CLAUDE_TOKEN_TO_AGENT=true` in the poller's environment to let agents run nested Claude sessions on the current session's account. Claude CLI strips `CLAUDE_CODE_OAUTH_TOKEN` from Bash subprocess environments by name, so agents can restore it from the alias:
+Agents can run nested Claude sessions on the current session's account by default, for both pool and non-pool sessions. Set `EXPOSE_CLAUDE_TOKEN_TO_AGENT=false` in the poller's environment to opt out (`0`, `no`, and `off` also disable it, case-insensitively); unset or any other value keeps it on. Claude CLI strips `CLAUDE_CODE_OAUTH_TOKEN` from Bash subprocess environments by name, so agents can restore it from the alias:
 
 ```bash
 CLAUDE_CODE_OAUTH_TOKEN="$TEAMVIBE_CLAUDE_OAUTH_TOKEN" claude -p "…"
 ```
 
-In the environment the poller injects, the alias and account ID follow the selected account on resume and failover; without opt-in, the poller leaves both variables unset. **This guarantee applies only to the injected process environment.** Claude CLI subsequently applies settings-file `env` entries: a brain's `CLAUDE_CONFIG_DIR/settings.json` can restore either variable when the flag is off or override it with a stale value when the flag is on. Project `.claude/settings.json` and `.claude/settings.local.json` can also override them. `settings.local.json` is a project source, not a user file next to `CLAUDE_CONFIG_DIR/settings.json`; recent CLI versions also read project-local settings from the main checkout for worktree sessions ([Claude settings sources](https://code.claude.com/docs/en/settings)). Before each spawn, the poller emits one warning listing the keys and files defining either variable in these settings sources, never their values. It never edits brain settings. Remove conflicting entries yourself to preserve the injected values in the agent's environment.
+In the environment the poller injects, the alias and account ID follow the selected account on resume and failover; with explicit opt-out, the poller leaves both variables unset. **This guarantee applies only to the injected process environment.** Claude CLI subsequently applies settings-file `env` entries: a brain's `CLAUDE_CONFIG_DIR/settings.json` can restore either variable when the flag is off or override it with a stale value when the flag is on. Project `.claude/settings.json` and `.claude/settings.local.json` can also override them. `settings.local.json` is a project source, not a user file next to `CLAUDE_CONFIG_DIR/settings.json`; recent CLI versions also read project-local settings from the main checkout for worktree sessions ([Claude settings sources](https://code.claude.com/docs/en/settings)). Before each spawn, the poller emits one warning listing the keys and files defining either variable in these settings sources, never their values. It never edits brain settings. Remove conflicting entries yourself to preserve the injected values in the agent's environment.
 
-**Security trade-off:** with opt-in, the agent and its subprocesses can read and use the token, bypassing Claude CLI's credential filtering. Enable this only for agents you trust with that credential. With no settings override, nested sessions use the selected session account; this option adds no nested-session usage accounting. Poller-side Claude output logs, returned output/errors, typing status and fallback Slack replies redact the actual injected Claude token and alias values, plus assignments to either token variable name, whether or not opt-in is enabled. This does not prevent agents from using credentials or sending them directly through their own tools.
+**Security trade-off:** by default, the agent and its subprocesses can read and use the token, bypassing Claude CLI's credential filtering. Opt out for agents you do not trust with that credential. With no settings override, nested sessions use the selected session account; this option adds no nested-session usage accounting. Poller-side Claude output logs, returned output/errors, typing status and fallback Slack replies redact the actual injected Claude token and alias values, plus assignments to either token variable name, whether exposure is enabled or explicitly disabled. This does not prevent agents from using credentials or sending them directly through their own tools.
 
 ## How It Works
 

package/dist/claude-rate-limit.d.ts

@@ -9,7 +9,7 @@ export interface ClaudeRateLimitWindow {
 export interface ClaudeRateLimitInfo extends ClaudeRateLimitWindow {
     status?: string;
     rateLimitType?: string;
-    unifiedWindows?: Partial<Record<ClaudeQuotaWindow, ClaudeRateLimitWindow>>;
+    unifiedWindows?: Partial<Record<string, ClaudeRateLimitWindow>>;
     overageStatus?: string;
     overageDisabledReason?: string;
     isUsingOverage?: boolean;

package/dist/claude-rate-limit.js

@@ -32,7 +32,9 @@ export function parseClaudeRateLimitInfo(value) {
     const windows = record(obj['unifiedWindows']);
     if (windows) {
         const parsed = {};
-        for (const key of ['five_hour', 'seven_day']) {
+        for (const key of Object.keys(windows).slice(0, 128)) {
+            if (key.length > 128 || !/^(five_hour|seven_day)(?:_[a-z_]+)?$/.test(key))
+                continue;
             const data = record(windows[key]);
             if (data)
                 parsed[key] = windowInfo(data);

package/dist/claude-spawner.js

@@ -460,7 +460,7 @@ export function sweepProcessGroup(proc, graceMs, options = {}) {
  * would look like if left uncapped.
  */
 export function buildSpawnEnv(params) {
-    const exposeToken = /^(1|true|yes|on)$/i.test(params.processEnv['EXPOSE_CLAUDE_TOKEN_TO_AGENT'] ?? '');
+    const exposeToken = !/^(0|false|no|off)$/i.test(params.processEnv['EXPOSE_CLAUDE_TOKEN_TO_AGENT'] ?? '');
     const accountToken = params.subscriptionAccount?.credential.unwrap();
     const sessionToken = accountToken ?? params.processEnv['CLAUDE_CODE_OAUTH_TOKEN'];
     return {
@@ -513,7 +513,7 @@ export function buildSpawnEnv(params) {
         // watched after the session (and worktree) is gone. See tv#265.
         POLLER_BRAIN_PATH: params.brainPath,
         // Claude strips its own token name from Bash subprocesses. This alias
-        // deliberately opts out of that protection, only at the poller level.
+        // exposes the session token by default; the poller can explicitly opt out.
         // Explicit undefined values also clear inherited/overlay aliases.
         TEAMVIBE_CLAUDE_OAUTH_TOKEN: exposeToken ? sessionToken || undefined : undefined,
         TEAMVIBE_POOL_ACCOUNT_ID: exposeToken ? params.subscriptionAccount?.accountId : undefined,

package/dist/pool-telemetry.d.ts

@@ -31,10 +31,11 @@ export declare function poolRunTelemetry(attempts: readonly PoolAttempt[], quota
         score?: number | undefined;
         reason?: "headroom_per_hour" | undefined;
         rateWindow?: {
-            window: "five_hour" | "seven_day";
             scope: "opus" | "haiku" | "global" | "sonnet" | "fable" | "uncertain";
             percent: number | undefined;
             resetAt: number | undefined;
+            kind?: "seven_day_overage_included" | "legacy-uncertain-seven-day" | undefined;
+            window: "five_hour" | "seven_day";
         } | undefined;
         accountId: string;
         accountLabel: string;
@@ -48,10 +49,11 @@ export declare function poolRunTelemetry(attempts: readonly PoolAttempt[], quota
     score?: number | undefined;
     reason?: "headroom_per_hour" | undefined;
     rateWindow?: {
-        window: "five_hour" | "seven_day";
         scope: "opus" | "haiku" | "global" | "sonnet" | "fable" | "uncertain";
         percent: number | undefined;
         resetAt: number | undefined;
+        kind?: "seven_day_overage_included" | "legacy-uncertain-seven-day" | undefined;
+        window: "five_hour" | "seven_day";
     } | undefined;
     accountId?: string | undefined;
     accountLabel?: string | undefined;

package/dist/pool-telemetry.js

@@ -86,6 +86,7 @@ export function poolRunTelemetry(attempts, quotaDeferEpisodes = 0) {
                 reason: a.reason,
                 rateWindow: {
                     window: a.rateWindow.window,
+                    ...(a.rateWindow.kind ? { kind: a.rateWindow.kind } : {}),
                     scope: a.rateWindow.scope,
                     percent: a.rateWindow.percent,
                     resetAt: a.rateWindow.resetAt,

package/dist/redact-text.d.ts

@@ -0,0 +1,2 @@
+/** Redact credentials in diagnostics without initializing poller authentication. */
+export declare function redactStartupText(text: string, configuredTokens?: readonly string[]): string;

package/dist/redact-text.js

@@ -0,0 +1,15 @@
+/** Redact credentials in diagnostics without initializing poller authentication. */
+export function redactStartupText(text, configuredTokens = []) {
+    let safe = text
+        .replace(/https?:\/\/[^\s/@]+@/gi, 'https://[REDACTED]@')
+        .replace(/\b(?:Authorization\s*:\s*)?Bearer\s+[^\s,;]+/gi, 'Bearer [REDACTED]')
+        .replace(/\bx-access-token\s*:\s*[^\s/@,;]+/gi, 'x-access-token:[REDACTED]')
+        // Cover both Claude's token name and the opt-in subprocess alias in
+        // shell assignments and JSON env diagnostics, even without a token list.
+        .replace(/(\b(?:CLAUDE_CODE_OAUTH_TOKEN|TEAMVIBE_CLAUDE_OAUTH_TOKEN)["']?\s*[:=]\s*)(?:"(?:\\.|[^"\\])*"|'[^']*'|[^\s,;]+)/gi, '$1[REDACTED]');
+    for (const token of configuredTokens) {
+        if (token)
+            safe = safe.split(token).join('[REDACTED]');
+    }
+    return safe;
+}

package/dist/startup-auth.d.ts

@@ -7,7 +7,7 @@ export declare class UnknownStartupFailureError extends Error {
     constructor(attempts: number);
 }
 /** The only formatter used for startup retry and terminal failure logs. */
-export declare function redactStartupText(text: string, configuredTokens?: readonly string[]): string;
+export { redactStartupText } from './redact-text.js';
 export declare function startupFailureDetail(error: unknown, operation: string, configuredTokens?: readonly string[]): string;
 export declare function isPermanentStartupFailure(error: unknown): boolean;
 /** Returns false when shutdown cancels startup. Permanent errors propagate to the caller. */

package/dist/startup-auth.js

@@ -1,3 +1,4 @@
+import { redactStartupText } from './redact-text.js';
 import { AuthHttpError, StartupConfigurationError } from './auth-provider.js';
 export class UnknownStartupFailureError extends Error {
     attempts;
@@ -34,20 +35,7 @@ function isTransient(error) {
     return false;
 }
 /** The only formatter used for startup retry and terminal failure logs. */
-export function redactStartupText(text, configuredTokens = []) {
-    let safe = text
-        .replace(/https?:\/\/[^\s/@]+@/gi, 'https://[REDACTED]@')
-        .replace(/\b(?:Authorization\s*:\s*)?Bearer\s+[^\s,;]+/gi, 'Bearer [REDACTED]')
-        .replace(/\bx-access-token\s*:\s*[^\s/@,;]+/gi, 'x-access-token:[REDACTED]')
-        // Cover both Claude's token name and the opt-in subprocess alias in
-        // shell assignments and JSON env diagnostics, even without a token list.
-        .replace(/(\b(?:CLAUDE_CODE_OAUTH_TOKEN|TEAMVIBE_CLAUDE_OAUTH_TOKEN)["']?\s*[:=]\s*)(?:"(?:\\.|[^"\\])*"|'[^']*'|[^\s,;]+)/gi, '$1[REDACTED]');
-    for (const token of configuredTokens) {
-        if (token)
-            safe = safe.split(token).join('[REDACTED]');
-    }
-    return safe;
-}
+export { redactStartupText } from './redact-text.js';
 export function startupFailureDetail(error, operation, configuredTokens = []) {
     let detail;
     if (error instanceof AuthHttpError)

package/dist/subscription-selection.d.ts

@@ -35,6 +35,8 @@ export type PoolFetchResult<A extends AccountIdentity = AccountIdentity> = {
 export interface UsageWindow {
     window: 'five_hour' | 'seven_day';
     scope: 'global' | 'sonnet' | 'opus' | 'haiku' | 'fable' | 'uncertain';
+    /** CLI kind, or the server compatibility provenance for a legacy Fable allowance. */
+    kind?: 'seven_day_overage_included' | 'legacy-uncertain-seven-day';
     status?: 'allowed' | 'allowed_warning' | 'rejected';
     /** Retained rejections keep their own clock when merged into newer measurements. */
     observedAt?: number;

package/dist/subscription-selection.js

@@ -56,29 +56,24 @@ function date(value) {
     const ms = Date.parse(value);
     return Number.isFinite(ms) && ms > 0 ? ms : undefined;
 }
+/** Undocumented CLI stream kinds: only explicit model names and the measured Fable alias. */
+function passiveWindowKind(kind) {
+    if (kind === 'seven_day_overage_included')
+        return { window: 'seven_day', scope: 'fable', kind };
+    const legacy = kind.match(/^(five_hour|seven_day)(?:_(sonnet|opus|haiku|fable))?$/);
+    return {
+        window: legacy?.[1] === 'five_hour' ? 'five_hour' : 'seven_day',
+        scope: legacy ? (legacy[2] ?? 'global') : 'uncertain',
+    };
+}
 export function normalizePassiveUsage(value, observedAt) {
     const info = record(value);
     const windows = [];
-    const unified = record(info['unifiedWindows']);
-    for (const window of ['five_hour', 'seven_day']) {
-        const raw = unified[window];
-        if (raw == null)
-            continue;
-        const item = record(raw);
-        windows.push({ window, scope: 'global', percent: percent(item['utilization'], 1), resetAt: epoch(item['resetsAt']) });
-    }
-    const type = info['rateLimitType'];
-    if (typeof type === 'string') {
-        const legacy = type.match(/^(five_hour|seven_day)(?:_(sonnet|opus|haiku|fable))?$/);
-        const candidate = {
-            window: legacy?.[1] === 'five_hour' ? 'five_hour' : 'seven_day',
-            scope: legacy ? (legacy[2] ?? 'global') : 'uncertain',
-            percent: percent(info['utilization'], 1), resetAt: epoch(info['resetsAt']),
-            ...(info['status'] === 'allowed' || info['status'] === 'allowed_warning' || info['status'] === 'rejected'
-                ? { status: info['status'] } : {}),
-        };
+    const add = (candidate) => {
         const existing = windows.find(w => w.window === candidate.window && w.scope === candidate.scope);
         if (existing) {
+            if (candidate.kind !== undefined)
+                existing.kind = candidate.kind;
             if (candidate.status !== undefined)
                 existing.status = candidate.status;
             // Collapse the same quota while retaining conservative conflict evidence.
@@ -90,6 +85,21 @@ export function normalizePassiveUsage(value, observedAt) {
         else {
             windows.push(candidate);
         }
+    };
+    for (const [kind, raw] of Object.entries(record(info['unifiedWindows'])).slice(0, 128)) {
+        if (raw == null)
+            continue;
+        const item = record(raw);
+        add({ ...passiveWindowKind(kind), percent: percent(item['utilization'], 1), resetAt: epoch(item['resetsAt']) });
+    }
+    const type = info['rateLimitType'];
+    if (typeof type === 'string') {
+        add({
+            ...passiveWindowKind(type),
+            percent: percent(info['utilization'], 1), resetAt: epoch(info['resetsAt']),
+            ...(info['status'] === 'allowed' || info['status'] === 'allowed_warning' || info['status'] === 'rejected'
+                ? { status: info['status'] } : {}),
+        });
     }
     return { source: 'passive', observedAt, windows };
 }

package/dist/subscription-usage-store.js

@@ -1,3 +1,4 @@
+import { redactStartupText } from './redact-text.js';
 import { createHash, randomUUID } from 'node:crypto';
 import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
@@ -34,12 +35,20 @@ function validTime(now) {
     if (typeof now !== 'number' || !Number.isFinite(now) || now <= 0 || now > 253402300799000)
         throw new SubscriptionUsageStoreError();
 }
+const loggedUnknownRateLimitKinds = new Set();
+const knownRateLimitKind = /^(?:(five_hour|seven_day)(?:_(sonnet|opus|haiku|fable))?|seven_day_overage_included)$/;
 export function safeRateLimitInfo(info) {
     const parsed = parseClaudeRateLimitInfo(info) ?? {};
     // Never persist arbitrary status strings or incidental stream fields.
     if (parsed.status !== 'allowed' && parsed.status !== 'allowed_warning' && parsed.status !== 'rejected')
         delete parsed.status;
-    if (parsed.rateLimitType && !/^(five_hour|seven_day)(?:_(sonnet|opus|haiku|fable))?$/.test(parsed.rateLimitType))
+    for (const kind of [parsed.rateLimitType, ...Object.keys(parsed.unifiedWindows ?? {})]) {
+        if (!kind || kind === 'uncertain' || knownRateLimitKind.test(kind) || !/^[a-z_]{1,128}$/.test(kind) || loggedUnknownRateLimitKinds.has(kind))
+            continue;
+        loggedUnknownRateLimitKinds.add(kind);
+        console.warn(redactStartupText(`[Pool] unknown rate limit kind=${kind}`));
+    }
+    if (parsed.rateLimitType && !knownRateLimitKind.test(parsed.rateLimitType))
         parsed.rateLimitType = 'uncertain';
     delete parsed.overageStatus;
     delete parsed.overageDisabledReason;
@@ -71,7 +80,7 @@ function safeUsage(value, source) {
         if (observedAt !== undefined)
             validTime(observedAt);
         const source = w['source'] === 'passive' || w['source'] === 'probe' ? w['source'] : undefined;
-        return { window, scope, percent, resetAt, ...(status ? { status } : {}), ...(observedAt ? { observedAt } : {}), ...(source ? { source } : {}) };
+        return { window, scope, ...(w['kind'] === 'seven_day_overage_included' ? { kind: w['kind'] } : {}), percent, resetAt, ...(status ? { status } : {}), ...(observedAt ? { observedAt } : {}), ...(source ? { source } : {}) };
     });
     if (usage['windows'].length > 133)
         windows.push({ window: 'seven_day', scope: 'uncertain' });

package/npm-shrinkwrap.json

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