@trentapps/manager-protocol 1.1.2 → 1.2.0

package/dist/engine/GitHubClient.js

@@ -0,0 +1,411 @@
+/**
+ * Enterprise Agent Supervisor - GitHub Client
+ *
+ * Provides a clean wrapper around the GitHub API via Octokit.
+ * Used by TaskManager for GitHub Issues operations.
+ *
+ * Features:
+ * - Singleton pattern for connection reuse
+ * - Automatic authentication via GITHUB_TOKEN
+ * - Repository auto-detection from git remote
+ * - Proper TypeScript types
+ * - Structured error handling
+ */
+import { Octokit } from '@octokit/rest';
+import { exec } from 'child_process';
+import { promisify } from 'util';
+const execAsync = promisify(exec);
+/**
+ * GitHub API client using Octokit
+ */
+export class GitHubClient {
+    static instance = null;
+    octokit;
+    cachedRepo = null;
+    authenticated = false;
+    constructor() {
+        const token = process.env.GITHUB_TOKEN;
+        if (!token) {
+            console.warn('[GitHubClient] GITHUB_TOKEN not set - some operations may fail');
+        }
+        this.octokit = new Octokit({
+            auth: token,
+            userAgent: 'enterprise-agent-supervisor/1.1.3',
+        });
+    }
+    /**
+     * Get singleton instance
+     */
+    static getInstance() {
+        if (!GitHubClient.instance) {
+            GitHubClient.instance = new GitHubClient();
+        }
+        return GitHubClient.instance;
+    }
+    /**
+     * Reset singleton instance (for testing)
+     */
+    static resetInstance() {
+        GitHubClient.instance = null;
+    }
+    /**
+     * Verify authentication and get current user
+     */
+    async verifyAuth() {
+        if (this.authenticated) {
+            return { ok: true };
+        }
+        try {
+            const { data } = await this.octokit.users.getAuthenticated();
+            this.authenticated = true;
+            return { ok: true, user: data.login };
+        }
+        catch (error) {
+            const err = error;
+            if (err.status === 401) {
+                return { ok: false, error: 'GitHub authentication failed. Set GITHUB_TOKEN environment variable.' };
+            }
+            return { ok: false, error: err.message || 'Unknown authentication error' };
+        }
+    }
+    /**
+     * Parse owner/repo string into components
+     */
+    parseRepo(repoString) {
+        const parts = repoString.split('/');
+        if (parts.length !== 2) {
+            throw new Error(`Invalid repository format: ${repoString}. Expected "owner/repo".`);
+        }
+        return { owner: parts[0], repo: parts[1] };
+    }
+    /**
+     * Get current repository from git remote
+     */
+    async getCurrentRepo() {
+        if (this.cachedRepo) {
+            return this.cachedRepo;
+        }
+        try {
+            // Try to get repo from git remote
+            const { stdout } = await execAsync('git remote get-url origin 2>/dev/null');
+            const url = stdout.trim();
+            // Parse various git remote URL formats:
+            // https://github.com/owner/repo.git
+            // git@github.com:owner/repo.git
+            // https://github.com/owner/repo
+            let match = url.match(/github\.com[:/]([^/]+)\/([^/.]+)/);
+            if (match) {
+                this.cachedRepo = { owner: match[1], repo: match[2] };
+                return this.cachedRepo;
+            }
+        }
+        catch {
+            // Git command failed
+        }
+        return null;
+    }
+    /**
+     * Handle API errors consistently
+     */
+    handleError(error, operation) {
+        const err = error;
+        if (err.status === 401) {
+            throw new Error(`Authentication failed for ${operation}. Check GITHUB_TOKEN.`);
+        }
+        if (err.status === 403) {
+            throw new Error(`Permission denied for ${operation}. Check repository access.`);
+        }
+        if (err.status === 404) {
+            throw new Error(`Not found during ${operation}. Check repository/issue exists.`);
+        }
+        if (err.status === 422) {
+            throw new Error(`Validation failed for ${operation}: ${err.message}`);
+        }
+        throw new Error(`GitHub API error during ${operation}: ${err.message || 'Unknown error'}`);
+    }
+    // ============================================================================
+    // ISSUE OPERATIONS
+    // ============================================================================
+    /**
+     * Create a new issue
+     */
+    async createIssue(params) {
+        try {
+            const { data } = await this.octokit.issues.create({
+                owner: params.owner,
+                repo: params.repo,
+                title: params.title,
+                body: params.body,
+                labels: params.labels,
+                assignees: params.assignees,
+                milestone: params.milestone,
+            });
+            return this.normalizeIssue(data);
+        }
+        catch (error) {
+            this.handleError(error, 'createIssue');
+        }
+    }
+    /**
+     * Get a single issue by number
+     */
+    async getIssue(owner, repo, issueNumber) {
+        try {
+            const { data } = await this.octokit.issues.get({
+                owner,
+                repo,
+                issue_number: issueNumber,
+            });
+            return this.normalizeIssue(data);
+        }
+        catch (error) {
+            this.handleError(error, 'getIssue');
+        }
+    }
+    /**
+     * List issues for a repository
+     */
+    async listIssues(params) {
+        try {
+            const { data } = await this.octokit.issues.listForRepo({
+                owner: params.owner,
+                repo: params.repo,
+                state: params.state || 'all',
+                labels: params.labels,
+                assignee: params.assignee,
+                per_page: params.per_page || 100,
+                page: params.page || 1,
+            });
+            // Filter out pull requests (GitHub API returns PRs in issues endpoint)
+            return data
+                .filter((issue) => !('pull_request' in issue))
+                .map((issue) => this.normalizeIssue(issue));
+        }
+        catch (error) {
+            this.handleError(error, 'listIssues');
+        }
+    }
+    /**
+     * Update an existing issue
+     */
+    async updateIssue(params) {
+        try {
+            const { data } = await this.octokit.issues.update({
+                owner: params.owner,
+                repo: params.repo,
+                issue_number: params.issue_number,
+                title: params.title,
+                body: params.body,
+                state: params.state,
+                state_reason: params.state_reason,
+                labels: params.labels,
+                assignees: params.assignees,
+                milestone: params.milestone,
+            });
+            return this.normalizeIssue(data);
+        }
+        catch (error) {
+            this.handleError(error, 'updateIssue');
+        }
+    }
+    /**
+     * Close an issue
+     */
+    async closeIssue(owner, repo, issueNumber, reason = 'completed') {
+        return this.updateIssue({
+            owner,
+            repo,
+            issue_number: issueNumber,
+            state: 'closed',
+            state_reason: reason,
+        });
+    }
+    /**
+     * Reopen an issue
+     */
+    async reopenIssue(owner, repo, issueNumber) {
+        return this.updateIssue({
+            owner,
+            repo,
+            issue_number: issueNumber,
+            state: 'open',
+            state_reason: 'reopened',
+        });
+    }
+    // ============================================================================
+    // COMMENT OPERATIONS
+    // ============================================================================
+    /**
+     * Add a comment to an issue
+     */
+    async addComment(owner, repo, issueNumber, body) {
+        try {
+            await this.octokit.issues.createComment({
+                owner,
+                repo,
+                issue_number: issueNumber,
+                body,
+            });
+        }
+        catch (error) {
+            this.handleError(error, 'addComment');
+        }
+    }
+    // ============================================================================
+    // LABEL OPERATIONS
+    // ============================================================================
+    /**
+     * Get a label
+     */
+    async getLabel(owner, repo, labelName) {
+        try {
+            const { data } = await this.octokit.issues.getLabel({
+                owner,
+                repo,
+                name: labelName,
+            });
+            return {
+                name: data.name,
+                color: data.color,
+                description: data.description,
+            };
+        }
+        catch (error) {
+            const err = error;
+            if (err.status === 404) {
+                return null;
+            }
+            this.handleError(error, 'getLabel');
+        }
+    }
+    /**
+     * Create a label
+     */
+    async createLabel(owner, repo, name, color, description) {
+        try {
+            const { data } = await this.octokit.issues.createLabel({
+                owner,
+                repo,
+                name,
+                color,
+                description,
+            });
+            return {
+                name: data.name,
+                color: data.color,
+                description: data.description,
+            };
+        }
+        catch (error) {
+            const err = error;
+            // If label already exists, ignore the error
+            if (err.status === 422) {
+                return { name, color, description: description || null };
+            }
+            this.handleError(error, 'createLabel');
+        }
+    }
+    /**
+     * Add labels to an issue
+     */
+    async addLabels(owner, repo, issueNumber, labels) {
+        try {
+            await this.octokit.issues.addLabels({
+                owner,
+                repo,
+                issue_number: issueNumber,
+                labels,
+            });
+        }
+        catch (error) {
+            this.handleError(error, 'addLabels');
+        }
+    }
+    /**
+     * Remove a label from an issue
+     */
+    async removeLabel(owner, repo, issueNumber, label) {
+        try {
+            await this.octokit.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: issueNumber,
+                name: label,
+            });
+        }
+        catch (error) {
+            const err = error;
+            // Ignore if label doesn't exist on the issue
+            if (err.status === 404) {
+                return;
+            }
+            this.handleError(error, 'removeLabel');
+        }
+    }
+    // ============================================================================
+    // SEARCH OPERATIONS
+    // ============================================================================
+    /**
+     * Search issues
+     */
+    async searchIssues(params) {
+        try {
+            const { data } = await this.octokit.search.issuesAndPullRequests({
+                q: params.query + ' is:issue',
+                per_page: params.per_page || 50,
+                page: params.page || 1,
+            });
+            return data.items.map((item) => this.normalizeIssue(item));
+        }
+        catch (error) {
+            this.handleError(error, 'searchIssues');
+        }
+    }
+    // ============================================================================
+    // REPOSITORY OPERATIONS
+    // ============================================================================
+    /**
+     * List repositories for authenticated user
+     */
+    async listRepos(limit = 20) {
+        try {
+            const { data } = await this.octokit.repos.listForAuthenticatedUser({
+                per_page: limit,
+                sort: 'pushed',
+            });
+            return data.map((repo) => ({ nameWithOwner: repo.full_name }));
+        }
+        catch (error) {
+            this.handleError(error, 'listRepos');
+        }
+    }
+    // ============================================================================
+    // HELPERS
+    // ============================================================================
+    /**
+     * Normalize issue data to our interface
+     */
+    normalizeIssue(data) {
+        return {
+            number: data.number,
+            title: data.title,
+            body: data.body,
+            state: data.state,
+            state_reason: data.state_reason,
+            labels: (data.labels || []).map((label) => ({
+                name: typeof label === 'string' ? label : label.name,
+                color: typeof label === 'string' ? undefined : label.color,
+                description: typeof label === 'string' ? null : label.description,
+            })),
+            assignees: data.assignees || [],
+            created_at: data.created_at,
+            updated_at: data.updated_at,
+            closed_at: data.closed_at,
+            html_url: data.html_url,
+            milestone: data.milestone ? { title: data.milestone.title } : null,
+        };
+    }
+}
+// Export singleton getter for convenience
+export const gitHubClient = GitHubClient.getInstance();
+//# sourceMappingURL=GitHubClient.js.map

package/dist/engine/GitHubClient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GitHubClient.js","sourceRoot":"","sources":["../../src/engine/GitHubClient.ts"],"names":[],"mappings":"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"}

package/dist/engine/RateLimiter.d.ts

@@ -2,6 +2,8 @@
  * Enterprise Agent Supervisor - Rate Limiter
  *
  * Token bucket rate limiting with multiple scopes and configurations.
+ * Uses extracted utilities from src/utils/rate-limiting.ts for
+ * bucket key building and sliding window logic.
  */
 import type { RateLimitConfig, RateLimitState, ActionCategory } from '../types/index.js';
 export declare class RateLimiter {
@@ -62,11 +64,11 @@ export declare class RateLimiter {
      */
     clearBuckets(): void;
     /**
-     * Build a bucket key based on scope
+     * Convert params to BucketIdentifiers for the utility function
      */
-    private buildBucketKey;
+    private toIdentifiers;
     /**
-     * Get or create a bucket
+     * Get or create a bucket with SlidingWindow
      */
     private getOrCreateBucket;
     /**

package/dist/engine/RateLimiter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RateLimiter.d.ts","sourceRoot":"","sources":["../../src/engine/RateLimiter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQzF,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,iBAAiB,CAAyB;IAElD;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAI5C;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI;IAMhD;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAItC;;OAEG;IACH,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,cAAc,CAAA;KAAE;IAgElE;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IA2BR;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE;QACjC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,cAAc,GAAG,IAAI;IAsCzB;;OAEG;IACH,UAAU,IAAI,eAAe,EAAE;IAI/B;;OAEG;IACH,YAAY,IAAI,IAAI;IAIpB;;OAEG;IACH,OAAO,CAAC,cAAc;IA0BtB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAgC9B;AAGD,eAAO,MAAM,WAAW,aAAoB,CAAC"}
+{"version":3,"file":"RateLimiter.d.ts","sourceRoot":"","sources":["../../src/engine/RateLimiter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAWzF,qBAAa,WAAW;IACtB,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,iBAAiB,CAAyB;IAElD;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI;IAI5C;;OAEG;IACH,cAAc,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI;IAMhD;;OAEG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAItC;;OAEG;IACH,UAAU,CAAC,MAAM,EAAE;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,cAAc,CAAA;KAAE;IAyDlE;;OAEG;IACH,aAAa,CAAC,MAAM,EAAE;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,CAAC,EAAE,cAAc,CAAC;QAChC,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GAAG,IAAI;IAqBR;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE;QACjC,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,cAAc,GAAG,IAAI;IA8BzB;;OAEG;IACH,UAAU,IAAI,eAAe,EAAE;IAI/B;;OAEG;IACH,YAAY,IAAI,IAAI;IAIpB;;OAEG;IACH,OAAO,CAAC,aAAa;IAcrB;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAmBzB;;;OAGG;IACH,OAAO,CAAC,qBAAqB;CAmC9B;AAGD,eAAO,MAAM,WAAW,aAAoB,CAAC"}

package/dist/engine/RateLimiter.js

@@ -2,7 +2,10 @@
  * Enterprise Agent Supervisor - Rate Limiter
  *
  * Token bucket rate limiting with multiple scopes and configurations.
+ * Uses extracted utilities from src/utils/rate-limiting.ts for
+ * bucket key building and sliding window logic.
  */
+import { buildBucketKey, SlidingWindow } from '../utils/rate-limiting.js';
 export class RateLimiter {
     configs = new Map();
     buckets = new Map();
@@ -44,43 +47,37 @@ export class RateLimiter {
                     continue;
                 }
             }
-            // Build bucket key based on scope
-            const bucketKey = this.buildBucketKey(configId, config.scope, params);
-            const bucket = this.getOrCreateBucket(bucketKey, now, config.windowMs);
-            // Check if within window
-            if (now - bucket.windowStart >= config.windowMs) {
-                // Reset window
-                bucket.count = 0;
-                bucket.windowStart = now;
-                bucket.burstCount = 0;
-            }
-            // Check limits
-            if (bucket.count >= config.maxRequests) {
-                const resetAt = new Date(bucket.windowStart + config.windowMs);
+            // Build bucket key using extracted utility
+            const identifiers = this.toIdentifiers(params);
+            const bucketKey = buildBucketKey(config.scope, identifiers, configId);
+            const bucket = this.getOrCreateBucket(bucketKey, config);
+            // Check if window can accept using SlidingWindow
+            if (!bucket.window.canAccept(now)) {
+                const stats = bucket.window.getStats(now);
                 return {
                     allowed: false,
                     limitId: configId,
                     state: {
                         key: bucketKey,
-                        count: bucket.count,
-                        windowStart: bucket.windowStart,
+                        count: stats.count,
+                        windowStart: stats.windowStart,
                         remaining: 0,
-                        resetAt: resetAt.toISOString()
+                        resetAt: stats.resetAtISO
                     }
                 };
             }
             // Check burst limit if configured
-            if (config.burstLimit && bucket.burstCount >= config.burstLimit) {
-                const resetAt = new Date(bucket.windowStart + config.windowMs);
+            if (config.burstLimit && !bucket.window.canAcceptBurst(now)) {
+                const stats = bucket.window.getStats(now);
                 return {
                     allowed: false,
                     limitId: configId,
                     state: {
                         key: bucketKey,
-                        count: bucket.count,
-                        windowStart: bucket.windowStart,
+                        count: stats.count,
+                        windowStart: stats.windowStart,
                         remaining: 0,
-                        resetAt: resetAt.toISOString()
+                        resetAt: stats.resetAtISO
                     }
                 };
             }
@@ -100,16 +97,11 @@ export class RateLimiter {
                     continue;
                 }
             }
-            const bucketKey = this.buildBucketKey(configId, config.scope, params);
-            const bucket = this.getOrCreateBucket(bucketKey, now, config.windowMs);
-            // Reset if window expired
-            if (now - bucket.windowStart >= config.windowMs) {
-                bucket.count = 0;
-                bucket.windowStart = now;
-                bucket.burstCount = 0;
-            }
-            bucket.count++;
-            bucket.burstCount++;
+            const identifiers = this.toIdentifiers(params);
+            const bucketKey = buildBucketKey(config.scope, identifiers, configId);
+            const bucket = this.getOrCreateBucket(bucketKey, config);
+            // Record the request in the sliding window
+            bucket.window.record(now);
         }
     }
     /**
@@ -120,7 +112,8 @@ export class RateLimiter {
         if (!config)
             return null;
         const now = Date.now();
-        const bucketKey = this.buildBucketKey(configId, config.scope, params);
+        const identifiers = this.toIdentifiers(params);
+        const bucketKey = buildBucketKey(config.scope, identifiers, configId);
         const bucket = this.buckets.get(bucketKey);
         if (!bucket) {
             return {
@@ -131,22 +124,13 @@ export class RateLimiter {
                 resetAt: new Date(now + config.windowMs).toISOString()
             };
         }
-        // Check if window has expired
-        if (now - bucket.windowStart >= config.windowMs) {
-            return {
-                key: bucketKey,
-                count: 0,
-                windowStart: now,
-                remaining: config.maxRequests,
-                resetAt: new Date(now + config.windowMs).toISOString()
-            };
-        }
+        const stats = bucket.window.getStats(now);
         return {
             key: bucketKey,
-            count: bucket.count,
-            windowStart: bucket.windowStart,
-            remaining: Math.max(0, config.maxRequests - bucket.count),
-            resetAt: new Date(bucket.windowStart + config.windowMs).toISOString()
+            count: stats.count,
+            windowStart: stats.windowStart,
+            remaining: stats.remaining,
+            resetAt: stats.resetAtISO
         };
     }
     /**
@@ -162,34 +146,30 @@ export class RateLimiter {
         this.buckets.clear();
     }
     /**
-     * Build a bucket key based on scope
+     * Convert params to BucketIdentifiers for the utility function
      */
-    buildBucketKey(configId, scope, params) {
-        switch (scope) {
-            case 'global':
-                return `${configId}:global`;
-            case 'agent':
-                return `${configId}:agent:${params.agentId || 'unknown'}`;
-            case 'session':
-                return `${configId}:session:${params.sessionId || 'unknown'}`;
-            case 'user':
-                return `${configId}:user:${params.userId || 'unknown'}`;
-            case 'action_type':
-                return `${configId}:action:${params.actionType || 'unknown'}`;
-            default:
-                return `${configId}:unknown`;
-        }
+    toIdentifiers(params) {
+        return {
+            agentId: params.agentId,
+            sessionId: params.sessionId,
+            userId: params.userId,
+            actionType: params.actionType
+        };
     }
     /**
-     * Get or create a bucket
+     * Get or create a bucket with SlidingWindow
      */
-    getOrCreateBucket(key, now, _windowMs) {
+    getOrCreateBucket(key, config) {
         let bucket = this.buckets.get(key);
         if (!bucket) {
             bucket = {
-                count: 0,
-                windowStart: now,
-                burstCount: 0
+                key,
+                window: new SlidingWindow({
+                    windowMs: config.windowMs,
+                    maxRequests: config.maxRequests,
+                    burstLimit: config.burstLimit,
+                    algorithm: 'fixed' // Use fixed window for consistent behavior with original implementation
+                })
             };
             this.buckets.set(key, bucket);
         }
@@ -213,11 +193,14 @@ export class RateLimiter {
             }
         }
         // Remove buckets that are older than the maximum window
-        // (bucket is expired if now - windowStart > maxWindowMs)
-        const expireThreshold = now - maxWindowMs * 2; // 2x window for safety margin
+        // This uses >= for consistency with window expiration checks
+        // A bucket is expired when: now - windowStart >= 2*maxWindowMs (2x safety margin)
         let removedCount = 0;
         for (const [key, bucket] of this.buckets.entries()) {
-            if (bucket.windowStart < expireThreshold) {
+            const state = bucket.window.getState();
+            // Off-by-one fix: use consistent >= comparison for boundary calculation
+            // Window boundary semantics: now - windowStart >= threshold means expired
+            if (now - state.windowStart >= maxWindowMs * 2) {
                 this.buckets.delete(key);
                 removedCount++;
             }