@teamvibe/poller 0.8.3 → 0.8.4-rc.2

package/dist/usage-probe-job.js

@@ -3,7 +3,7 @@ import { mkdtemp, rm, mkdir } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { normalizePassiveUsage } from './subscription-selection.js';
-import { safeRateLimitInfo, } from './subscription-usage-store.js';
+import { safeRateLimitInfo, usageStateForSelection, } from './subscription-usage-store.js';
 import { parseClaudeRateLimitInfo, } from './claude-rate-limit.js';
 export function isUsageProbe(value) {
     return (!!value &&
@@ -40,12 +40,25 @@ export async function handleUsageProbe(job, options) {
         const pool = await options.fetchPool();
         const account = pool.kind === 'ready'
             ? pool.accounts.find((a) => a.workspaceId === job.workspaceId &&
-                a.accountId === job.accountId &&
-                a.credentialVersion === job.credentialVersion &&
-                a.enabled)
+                a.accountId === job.accountId)
             : undefined;
-        if (!account)
+        if (!account) {
+            result =
+                pool.kind === 'probe_account_unavailable'
+                    ? pool.reason
+                    : pool.kind === 'ready' || pool.kind === 'no_accounts_configured'
+                        ? 'account_missing'
+                        : 'unknown';
             return;
+        }
+        if (!account.enabled) {
+            result = 'account_disabled';
+            return;
+        }
+        if (account.credentialVersion !== job.credentialVersion) {
+            result = 'account_changed';
+            return;
+        }
         if (options.isAtCapacity()) {
             result = 'cli_at_capacity';
             return;
@@ -163,7 +176,7 @@ export async function handleUsageProbe(job, options) {
             ...metadata,
             accountLabel: account.label ?? account.accountId,
             reportedAt: now,
-            usage,
+            usage: usageStateForSelection(await options.store.read(account), now).usage,
             lastRateLimitInfo: safe,
             probeStatus: 'ok',
             probeObservedAt: now,
@@ -181,6 +194,6 @@ export async function handleUsageProbe(job, options) {
                 reason: result,
             });
         if (!duplicate)
-            options.log(`[Pool] usage probe account=${job.accountId} result=${result}`);
+            options.log(`[Pool] usage probe request=${job.requestId} result=${result}`);
     }
 }

package/dist/worktree-manager.d.ts

@@ -21,7 +21,8 @@ export declare function cleanupOrphanWorktrees(brainPath: string, maxAgeMs?: num
     removed: string[];
 }>;
 /**
- * Sweep orphan worktrees across every brain directory under `brainsRoot`.
+ * Sweep orphan worktrees under `brainsRoot/<workspaceId>/<brainId>`.
+ * Top-level legacy clones are left untouched.
  * Intended to run once at poller startup. Tolerates the entries that aren't
  * brain repos (no `.git` subdir) by skipping them silently.
  */

package/dist/worktree-manager.js

@@ -1,7 +1,9 @@
+import { existsSync } from 'fs';
 import { mkdir, readdir, stat, appendFile, readFile } from 'fs/promises';
 import { join } from 'path';
 import { execFile } from 'child_process';
 import { promisify } from 'util';
+import { validateBrainId, resolveBrainDir } from './brain-path.js';
 import { readInboxRuntime } from './inbox-manager.js';
 const execFileAsync = promisify(execFile);
 const WORKTREES_SUBDIR = '.worktrees';
@@ -112,7 +114,8 @@ export async function cleanupOrphanWorktrees(brainPath, maxAgeMs = 24 * 60 * 60
     return { removed };
 }
 /**
- * Sweep orphan worktrees across every brain directory under `brainsRoot`.
+ * Sweep orphan worktrees under `brainsRoot/<workspaceId>/<brainId>`.
+ * Top-level legacy clones are left untouched.
  * Intended to run once at poller startup. Tolerates the entries that aren't
  * brain repos (no `.git` subdir) by skipping them silently.
  */
@@ -126,19 +129,44 @@ export async function cleanupOrphanWorktreesForAllBrains(brainsRoot, maxAgeMs =
     }
     let scanned = 0;
     let removed = 0;
-    for (const entry of entries) {
-        const brainPath = join(brainsRoot, entry);
+    for (const workspace of entries) {
         try {
-            const gitStat = await stat(join(brainPath, '.git'));
-            if (!gitStat.isDirectory())
-                continue;
+            validateBrainId(workspace);
+        }
+        catch {
+            continue;
+        }
+        const workspacePath = join(brainsRoot, workspace);
+        // A top-level repo is a legacy clone and must remain untouched.
+        if (existsSync(join(workspacePath, '.git')))
+            continue;
+        let brains;
+        try {
+            brains = await readdir(workspacePath);
         }
         catch {
-            continue; // not a brain repo
+            continue;
+        }
+        for (const brain of brains) {
+            let brainPath;
+            try {
+                brainPath = resolveBrainDir(workspace, brain, brainsRoot);
+            }
+            catch {
+                continue;
+            }
+            try {
+                const gitStat = await stat(join(brainPath, '.git'));
+                if (!gitStat.isDirectory())
+                    continue;
+            }
+            catch {
+                continue;
+            }
+            scanned++;
+            const { removed: gone } = await cleanupOrphanWorktrees(brainPath, maxAgeMs);
+            removed += gone.length;
         }
-        scanned++;
-        const { removed: gone } = await cleanupOrphanWorktrees(brainPath, maxAgeMs);
-        removed += gone.length;
     }
     return { scanned, removed };
 }

package/npm-shrinkwrap.json

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