rivet-design 0.11.13 → 0.11.15

package/dist/mcp/server.d.ts

@@ -1,8 +1,10 @@
-import { type DevServerHealth } from '../services/SessionBridgeService';
+import { SessionBridgeService, type ActiveLeaseMetadata, type DevServerHealth } from '../services/SessionBridgeService';
 import type { LeasedBatchRecord } from '../services/BridgeBatchPipeline';
+import { TelemetryService } from '../services/TelemetryService';
 import { type DroppedRefinement, type VisualEditorWatchAction } from './agent-variants';
 import { type ImageContent } from './changeBatchClassification';
 import type { ChangeRequest, CommentChangeItem, StaticPreviewChangeTarget } from '../types/change-request-types';
+import type { WorkItemStatus } from './agent-variants/contracts';
 import type { RivetMcpHandle } from './types';
 type McpStdioLoggingDeps = {
     env: Partial<Pick<NodeJS.ProcessEnv, 'RIVET_LOG_LEVEL'>>;
@@ -53,7 +55,7 @@ type StaticPreviewRefineTargetInstruction = {
     requestId?: string;
 };
 export declare const buildMixedVariantBatchResponse: (rejectedRequest: ChangeRequest | null | undefined) => MCPTextResponse;
-export declare const buildVariantRequestBatchResponse: (intent: ChangeRequest | null | undefined, lease?: LeasedBatchRecord) => MCPChangeResponse;
+export declare const buildVariantRequestBatchResponse: (intent: ChangeRequest | null | undefined, lease?: LeasedBatchRecord, projectPath?: string | null) => MCPChangeResponse;
 /**
  * Resolves whether `watch_for_changes` / `get_pending_changes` should pass
  * `requestId` into lease pickup. requestId is only for idempotent re-poll of
@@ -64,6 +66,14 @@ export declare const resolveLeasePickupRequestId: (args: {
     ack_batch?: boolean;
     requestId?: string;
 }) => string | undefined;
+/**
+ * Lease work for a poll. A matching requestId keeps idempotent re-polls on the
+ * same in-flight batch; a stale requestId must not strand unrelated queued work.
+ */
+export declare const leaseAvailableBatchForPoll: (args: {
+    bridge: SessionBridgeService;
+    requestId?: string;
+}) => LeasedBatchRecord | null;
 /**
  * Builds a poll response for an empty apply queue.
  */
@@ -71,6 +81,7 @@ export declare const buildNoPendingChangesResponse: (params?: {
     message?: string;
     devServerHealth?: DevServerHealth | null;
     pendingVariantRequests?: number;
+    activeLeases?: ActiveLeaseMetadata[];
 }) => MCPTextResponse;
 /**
  * Builds a poll response for a normal apply batch.
@@ -90,7 +101,48 @@ export declare const buildLeasedVariantResponse: (params: {
     isFreshStaticPreviewVariantRequestBatch: (intent: ChangeRequest) => boolean;
     handleStaticPreviewRefineBatch: (intent: ChangeRequest, lease: LeasedBatchRecord) => MCPChangeResponse;
     withPendingVariantRequests: (response: MCPChangeResponse) => MCPChangeResponse;
+    projectPath?: string | null;
 }) => MCPChangeResponse;
+type VariantRequestLeaseTracker = {
+    claim(args: {
+        requestId?: string;
+        sessionId: string;
+        workItemIds: string[];
+    }): void;
+    complete(args: {
+        sessionId: string;
+        workItemId: string;
+        status: WorkItemStatus;
+        requeuedForRegeneration?: boolean;
+        aborted?: boolean;
+    }): void;
+};
+/**
+ * Tracks a UI-originated variant request lease across the variant work items
+ * that satisfy it, releasing the bridge lease once the whole batch has
+ * finished.
+ */
+export declare const createVariantRequestLeaseTracker: (params: {
+    leaseRequest: (requestId: string) => LeasedBatchRecord | null;
+    ackRequest: (args: {
+        leaseId: string;
+        requestId?: string;
+    }) => void;
+}) => VariantRequestLeaseTracker;
+type MCPAckTelemetry = Pick<TelemetryService, 'trackMCPChangeAcked' | 'trackMCPChangeAckFailed'>;
+export declare const ackApplyBridgeLease: (args: {
+    bridge: SessionBridgeService;
+    telemetry: MCPAckTelemetry;
+    sessionId: string;
+    leaseId: string;
+    requestId?: string;
+}) => void;
+export declare const ackVariantBridgeLease: (args: {
+    bridge: SessionBridgeService;
+    telemetry: MCPAckTelemetry;
+    leaseId?: string;
+    requestId?: string;
+}) => void;
 export type RivetMcpOptions = {
     mcpEditor?: string;
     revokeBearerToken?: (token: string) => void;

package/dist/mcp/server.d.ts.map

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

package/dist/mcp/server.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startMCPServer = exports.createRivetMcp = exports.buildLeasedVariantResponse = exports.buildStaticPreviewRefineResponse = exports.collectStaticPreviewRefineTargetInstructions = exports.buildApplyChangesResponse = exports.buildNoPendingChangesResponse = exports.resolveLeasePickupRequestId = exports.buildVariantRequestBatchResponse = exports.buildMixedVariantBatchResponse = exports.startParentProcessMonitor = exports.buildVisualEditorWatchAction = exports.configureMcpStdioLogging = void 0;
+exports.startMCPServer = exports.createRivetMcp = exports.ackVariantBridgeLease = exports.ackApplyBridgeLease = exports.createVariantRequestLeaseTracker = exports.buildLeasedVariantResponse = exports.buildStaticPreviewRefineResponse = exports.collectStaticPreviewRefineTargetInstructions = exports.buildApplyChangesResponse = exports.buildNoPendingChangesResponse = exports.leaseAvailableBatchForPoll = exports.resolveLeasePickupRequestId = exports.buildVariantRequestBatchResponse = exports.buildMixedVariantBatchResponse = exports.startParentProcessMonitor = exports.buildVisualEditorWatchAction = exports.configureMcpStdioLogging = void 0;
 const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
 const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
 const v3_1 = require("zod/v3");
@@ -15,9 +15,11 @@ const TelemetryService_1 = require("../services/TelemetryService");
 const AuthService_1 = require("../services/AuthService");
 const IntegrationsClient_1 = require("../services/IntegrationsClient");
 const tools_1 = require("./auth/tools");
+const toolAnalytics_1 = require("./toolAnalytics");
 const tools_2 = require("./integrations/tools");
 const instructions_1 = require("./instructions");
 const ConfigManager_1 = require("../services/ConfigManager");
+const MCPOnboardingTelemetry_1 = require("../services/MCPOnboardingTelemetry");
 const open_1 = __importDefault(require("open"));
 const index_1 = require("../index");
 const evaluateFlags_1 = require("../config/evaluateFlags");
@@ -414,16 +416,16 @@ const requestHasResolvedReferences = (request) => request.changes.some((c) => c.
     Array.isArray(c.resolvedReferences) &&
     c.resolvedReferences.length > 0);
 const VARIANT_REQUEST_GUIDE = 'This batch is a Rivet variant request — do NOT edit files directly. ' +
-    'The pending change is a single CommentChangeItem; `variantRequest.count` is only the editor\'s default placeholder count — YOU own the real number. Decide how many directions to generate from the user\'s `instruction` text (honor an explicit ask like "give me 5"; otherwise default to 3-4). ' +
+    'The pending change is a single CommentChangeItem; `variantRequest.count` is only the editor\'s default placeholder count — YOU own the real number. Decide how many directions to generate from the user\'s `instruction` text — honor an explicit number ("give me 5"), a relative ask ("more options"), or a qualitative cue ("lots of variety"); default to 3 only when the instruction gives no count signal. ' +
     "Derive the structured `start_variants.target` from the comment's `element` using this priority: " +
     '(a) `{ type: "file", ref: filePaths[0] }` when `filePaths.length === 1`; otherwise ' +
     '(b) `{ type: "element", ref: `[data-rivet-id="${rivetId}"]` }` when `rivetId` is present, then ' +
     '(c) `{ type: "element", ref: `#${id}` }` when `id` has no whitespace, then ' +
     '(d) `{ type: "element", ref: xpath }`, then ' +
     '(e) `{ type: "element", ref: `.${token}` }` for a single-token `className`. ' +
-    'When you set a `target` from the comment\'s `element`, scope each variant\'s change to THAT element and its immediate section/card — do not restyle the rest of the page. ' +
+    "When you set a `target` from the comment's `element`, scope each variant's change to THAT element and its immediate section/card — do not restyle the rest of the page. " +
     'If the comment has imageCount > 0, inspect the following image content items before calling `start_variants`; pass each image through `userContext` as `{ transport: "upload", dataUrl, label: "Reference image N", userIntent: "Inline variant visual reference" }` when your client exposes a data URL, or pass concise visual observations as `{ transport: "text", content, label: "Reference image observations", userIntent: "Inline variant visual reference" }` when it does not. ' +
-    'Then call `start_variants` with `{ mode: "existing", prompt: instruction, target, userContext, requestId, briefs }`, passing this batch\'s `requestId` through verbatim so the editor can map its loading placeholders to the new cards. Set the count by supplying `briefs` (one distinct `{ label, body }` per variant — `briefs.length` is the count, and each card is named by what it changes); the editor seeds a few placeholders and reconciles to however many you actually generate. Do NOT use the older `propose_variants` chain for this path. ' +
+    'Then call `start_variants` with `{ mode: "existing", prompt: instruction, projectPath, target, userContext, requestId, briefs }`, passing this batch\'s `projectPath` and `requestId` through verbatim so the run stays attached to the visual editor project and the editor can map its loading placeholders to the new cards. Set the count by supplying `briefs` (one distinct `{ label, body }` per variant — `briefs.length` is the count, and each card is named by what it changes); the editor seeds a few placeholders and reconciles to however many you actually generate. Do NOT use the older `propose_variants` chain for this path. ' +
     'ACCUMULATION: when a variants session is already live for this project, calling `start_variants` again does NOT discard it — Rivet APPENDS the new directions to that same active session (they show up alongside the existing ones), so just call `start_variants` per Vary; never try to reuse a prior sessionId or worry about orphaning earlier variants. ' +
     '`start_variants` returns leased work items; generate each variant in its worktree and call `report_variant_complete` for each leased item. ' +
     'After the user picks a variant via `commit_variant`, STOP and tell the user their variant has been committed.';
@@ -435,7 +437,7 @@ const VARIANT_MIXED_BATCH_GUIDE = 'Mixed batch rejected: a `variantRequest` comm
 const STATIC_PREVIEW_REFINE_GUIDE_PREAMBLE = 'STATIC_PREVIEW_REFINE_GUIDE: These changes target static_preview variant(s). ' +
     'Do NOT edit base project files. ' +
     "Lease ONLY this batch's work items: call `continue_variants({ action: 'request_work', workItemIds: <the response.workItemIds array> })`. " +
-    'Passing workItemIds (rather than a bare requestedLeaseCount) keeps concurrent runs from leasing each other\'s work, so several batches can be handled in parallel. ' +
+    "Passing workItemIds (rather than a bare requestedLeaseCount) keeps concurrent runs from leasing each other's work, so several batches can be handled in parallel. " +
     'When input.targetElement is present it is the specific element the user selected (match it in the HTML by tagName/className/id/textContent): ' +
     'scope the change to THAT element and its immediate section/card — do not restyle the rest of the page. ';
 // "Vary" flow: the server forked N NEW sibling variants; the original is left
@@ -476,6 +478,7 @@ const buildLeasePayloadFields = (lease) => ({
     mergedRequestIds: lease.mergedRequestIds,
     mergedFrom: lease.mergedFrom,
 });
+const getActiveLeaseMetadata = (bridge) => bridge.getActiveLeaseMetadata();
 const buildSupersededChangesResponse = () => ({
     content: [
         {
@@ -508,7 +511,7 @@ const buildMixedVariantBatchResponse = (rejectedRequest) => {
     };
 };
 exports.buildMixedVariantBatchResponse = buildMixedVariantBatchResponse;
-const buildVariantRequestBatchResponse = (intent, lease) => {
+const buildVariantRequestBatchResponse = (intent, lease, projectPath) => {
     if (!intent) {
         return buildSupersededChangesResponse();
     }
@@ -523,6 +526,7 @@ const buildVariantRequestBatchResponse = (intent, lease) => {
                     kind: 'variant_request',
                     changes,
                     sourceFiles: intent.sourceFiles,
+                    ...(projectPath ? { projectPath } : {}),
                     ...(requestId ? { requestId } : {}),
                     ...(intent.target ? { target: intent.target } : {}),
                     ...(lease ? buildLeasePayloadFields(lease) : {}),
@@ -541,6 +545,20 @@ exports.buildVariantRequestBatchResponse = buildVariantRequestBatchResponse;
  */
 const resolveLeasePickupRequestId = (args) => args.refresh_git || args.ack_batch ? undefined : args.requestId;
 exports.resolveLeasePickupRequestId = resolveLeasePickupRequestId;
+/**
+ * Lease work for a poll. A matching requestId keeps idempotent re-polls on the
+ * same in-flight batch; a stale requestId must not strand unrelated queued work.
+ */
+const leaseAvailableBatchForPoll = (args) => {
+    if (args.requestId) {
+        const requestedLease = args.bridge.leaseBatch(args.requestId);
+        if (requestedLease) {
+            return requestedLease;
+        }
+    }
+    return args.bridge.leaseBatch();
+};
+exports.leaseAvailableBatchForPoll = leaseAvailableBatchForPoll;
 /**
  * Builds a poll response for an empty apply queue.
  */
@@ -557,6 +575,9 @@ const buildNoPendingChangesResponse = (params = {}) => ({
                 ...(params.pendingVariantRequests !== undefined
                     ? { pendingVariantRequests: params.pendingVariantRequests }
                     : {}),
+                ...(params.activeLeases !== undefined
+                    ? { activeLeases: params.activeLeases }
+                    : {}),
             }),
         },
     ],
@@ -651,7 +672,9 @@ const buildStaticPreviewRefineResponse = (consumedRequest, droppedRefinements =
                     // The exact work items THIS batch created. Lease ONLY these (pass them
                     // as `workItemIds` to request_work) so concurrent runs each pick up
                     // their own batch instead of one greedily leasing everything.
-                    ...(createdWorkItemIds.length > 0 ? { workItemIds: createdWorkItemIds } : {}),
+                    ...(createdWorkItemIds.length > 0
+                        ? { workItemIds: createdWorkItemIds }
+                        : {}),
                     // In-place refinements the server could not apply (the variant was
                     // already sent / no longer editable). Surfaced structurally so the
                     // agent knows the instruction was NOT applied, instead of the poll
@@ -675,14 +698,136 @@ const buildLeasedVariantResponse = (params) => {
         return params.withPendingVariantRequests(params.handleStaticPreviewRefineBatch(intent, params.lease));
     }
     if ((0, changeBatchClassification_1.isSingleVariantRequestBatch)(intent)) {
-        return params.withPendingVariantRequests((0, exports.buildVariantRequestBatchResponse)(intent, params.lease));
+        return params.withPendingVariantRequests((0, exports.buildVariantRequestBatchResponse)(intent, params.lease, params.projectPath));
     }
     if ((0, changeBatchClassification_1.isStaticPreviewRefineBatch)(intent)) {
         return params.withPendingVariantRequests(params.handleStaticPreviewRefineBatch(intent, params.lease));
     }
-    return params.withPendingVariantRequests((0, exports.buildVariantRequestBatchResponse)(intent, params.lease));
+    return params.withPendingVariantRequests((0, exports.buildVariantRequestBatchResponse)(intent, params.lease, params.projectPath));
 };
 exports.buildLeasedVariantResponse = buildLeasedVariantResponse;
+const FINISHED_VARIANT_REPORT_STATUSES = new Set([
+    'succeeded',
+    'failed',
+    'cancelled',
+]);
+const variantRequestWorkKey = (sessionId, workItemId) => `${sessionId}:${workItemId}`;
+/**
+ * Tracks a UI-originated variant request lease across the variant work items
+ * that satisfy it, releasing the bridge lease once the whole batch has
+ * finished.
+ */
+const createVariantRequestLeaseTracker = (params) => {
+    const trackedByWorkItem = new Map();
+    const trackedByRequest = new Map();
+    return {
+        claim(args) {
+            if (!args.requestId) {
+                return;
+            }
+            const lease = params.leaseRequest(args.requestId);
+            if (!lease || lease.kind !== 'variant') {
+                return;
+            }
+            if (args.workItemIds.length === 0) {
+                if (trackedByRequest.has(lease.requestId)) {
+                    return;
+                }
+                params.ackRequest({
+                    leaseId: lease.leaseId,
+                    requestId: lease.requestId,
+                });
+                return;
+            }
+            const tracked = trackedByRequest.get(lease.requestId) ??
+                {
+                    leaseId: lease.leaseId,
+                    requestId: lease.requestId,
+                    remainingWorkItemIds: new Set(),
+                };
+            trackedByRequest.set(lease.requestId, tracked);
+            for (const workItemId of args.workItemIds) {
+                tracked.remainingWorkItemIds.add(workItemId);
+                trackedByWorkItem.set(variantRequestWorkKey(args.sessionId, workItemId), tracked);
+            }
+        },
+        complete(args) {
+            if (args.requeuedForRegeneration ||
+                (!args.aborted && !FINISHED_VARIANT_REPORT_STATUSES.has(args.status))) {
+                return;
+            }
+            const key = variantRequestWorkKey(args.sessionId, args.workItemId);
+            const tracked = trackedByWorkItem.get(key);
+            if (!tracked) {
+                return;
+            }
+            tracked.remainingWorkItemIds.delete(args.workItemId);
+            trackedByWorkItem.delete(key);
+            if (tracked.remainingWorkItemIds.size > 0) {
+                return;
+            }
+            trackedByRequest.delete(tracked.requestId);
+            params.ackRequest({
+                leaseId: tracked.leaseId,
+                requestId: tracked.requestId,
+            });
+        },
+    };
+};
+exports.createVariantRequestLeaseTracker = createVariantRequestLeaseTracker;
+const ackApplyBridgeLease = (args) => {
+    const ackResult = args.bridge.ackBatch({
+        leaseId: args.leaseId,
+        requestId: args.requestId,
+    });
+    if (ackResult.kind === 'apply' && ackResult.mergedRequestIds.length > 0) {
+        args.telemetry.trackMCPChangeAcked({
+            channel: 'apply',
+            leaseId: args.leaseId,
+            requestId: args.requestId ?? ackResult.mergedRequestIds[0],
+            changeCount: ackResult.mergedRequestIds.length,
+            sessionId: args.sessionId,
+        });
+        return;
+    }
+    args.telemetry.trackMCPChangeAckFailed({
+        channel: 'apply',
+        leaseId: args.leaseId,
+        requestId: args.requestId,
+        changeCount: 0,
+        sessionId: args.sessionId,
+        failureReason: 'ack_failed',
+    });
+};
+exports.ackApplyBridgeLease = ackApplyBridgeLease;
+const ackVariantBridgeLease = (args) => {
+    if (!args.leaseId)
+        return;
+    const ackResult = args.bridge.ackBatch({
+        leaseId: args.leaseId,
+        requestId: args.requestId,
+    });
+    const sessionId = args.bridge.getSessionId() ?? undefined;
+    if (ackResult.kind === 'variant' && ackResult.mergedRequestIds.length > 0) {
+        args.telemetry.trackMCPChangeAcked({
+            channel: 'variant',
+            leaseId: args.leaseId,
+            requestId: args.requestId ?? ackResult.mergedRequestIds[0],
+            changeCount: ackResult.mergedRequestIds.length,
+            sessionId,
+        });
+        return;
+    }
+    args.telemetry.trackMCPChangeAckFailed({
+        channel: 'variant',
+        leaseId: args.leaseId,
+        requestId: args.requestId,
+        changeCount: 0,
+        sessionId,
+        failureReason: 'ack_failed',
+    });
+};
+exports.ackVariantBridgeLease = ackVariantBridgeLease;
 /**
  * Builds the fully configured Rivet MCP server (tools, auth gating, session
  * bridge, telemetry) without binding it to a transport. Shared by the stdio
@@ -762,6 +907,11 @@ const createRivetMcp = (options) => {
                             requestId,
                         })),
                     }));
+                variantRequestLeaseTracker.claim({
+                    requestId: lease.requestId,
+                    sessionId,
+                    workItemIds: createdWorkItemIds,
+                });
             }
         }
         return (0, exports.buildStaticPreviewRefineResponse)(consumedRequest, droppedRefinements, createdWorkItemIds, lease);
@@ -770,42 +920,25 @@ const createRivetMcp = (options) => {
     const handleApplyAck = (sessionId, args) => {
         const leaseId = args.leaseId ?? bridge.findActiveApplyLease()?.leaseId ?? undefined;
         if (leaseId) {
-            const ackResult = bridge.ackBatch({
+            (0, exports.ackApplyBridgeLease)({
+                bridge,
+                telemetry,
+                sessionId,
                 leaseId,
                 requestId: args.requestId,
             });
-            if (ackResult.kind === 'apply' && ackResult.mergedRequestIds.length > 0) {
-                telemetry.trackMCPChangeAcked({
-                    channel: 'apply',
-                    leaseId,
-                    requestId: args.requestId ?? ackResult.mergedRequestIds[0],
-                    changeCount: ackResult.mergedRequestIds.length,
-                    sessionId,
-                });
-            }
         }
         handleRefreshGit(sessionId);
         bridge.setStatus('READY');
     };
     /** Release a variant lease after the agent finishes the batch. */
     const handleVariantAck = (args) => {
-        if (!args.leaseId) {
-            return;
-        }
-        const ackResult = bridge.ackBatch({
-            leaseId: args.leaseId,
-            requestId: args.requestId,
-        });
-        if (ackResult.kind === 'variant' && ackResult.mergedRequestIds.length > 0) {
-            telemetry.trackMCPChangeAcked({
-                channel: 'variant',
-                leaseId: args.leaseId,
-                requestId: args.requestId ?? ackResult.mergedRequestIds[0],
-                changeCount: ackResult.mergedRequestIds.length,
-                sessionId: bridge.getSessionId() ?? undefined,
-            });
-        }
+        (0, exports.ackVariantBridgeLease)({ bridge, telemetry, ...args });
     };
+    const variantRequestLeaseTracker = (0, exports.createVariantRequestLeaseTracker)({
+        leaseRequest: (requestId) => bridge.leaseBatch(requestId),
+        ackRequest: handleVariantAck,
+    });
     /** Complete the active run correlation and refresh git status in the Rivet UI. */
     const handleRefreshGit = (sessionId) => {
         const activeRunCorrelation = bridge.completeActiveRunCorrelation();
@@ -827,6 +960,7 @@ const createRivetMcp = (options) => {
     const beginApplyingRun = (intent, sessionId, _lease) => {
         bridge.setStatus('APPLYING');
         const { newRun, orphanedRun } = bridge.startApplyingRun(intent);
+        const turnMetadata = (0, MCPOnboardingTelemetry_1.summarizeMCPConversationTurn)(intent, bridge.getRoundsCompleted() + 1, sessionId);
         trackChangesQueuedFromIntent(intent, bridge, telemetry, sessionId);
         if (orphanedRun) {
             trackOrphanedMCPRun(telemetry, sessionId, orphanedRun);
@@ -834,8 +968,8 @@ const createRivetMcp = (options) => {
         telemetry.trackAgentRunStarted({
             traceId: newRun.traceId,
             agentRunId: newRun.agentRunId,
-            instructionLength: 0,
-            elementCount: intent.changes.length,
+            instructionLength: turnMetadata.instructionLengthTotal,
+            elementCount: turnMetadata.elementCount,
             posthogSessionId: newRun.browserSessionId,
             resumeSessionId: sessionId,
             source: 'mcp',
@@ -853,7 +987,7 @@ const createRivetMcp = (options) => {
             const rejectedRequest = bridge.rejectMixedVariantRequestBatch(applyHead);
             return withPendingVariantRequests((0, exports.buildMixedVariantBatchResponse)(rejectedRequest));
         }
-        const lease = bridge.leaseBatch(requestId);
+        const lease = (0, exports.leaseAvailableBatchForPoll)({ bridge, requestId });
         if (!lease) {
             return null;
         }
@@ -870,6 +1004,7 @@ const createRivetMcp = (options) => {
                 isFreshStaticPreviewVariantRequestBatch,
                 handleStaticPreviewRefineBatch,
                 withPendingVariantRequests,
+                projectPath: bridge.getProjectPath(),
             });
         }
         beginApplyingRun(lease.intent, sessionId, lease);
@@ -913,11 +1048,19 @@ const createRivetMcp = (options) => {
         capabilities: { tools: {} },
         instructions: (0, instructions_1.buildRivetMcpInstructions)(hasStoredCredentials ? 'authenticated' : 'unauthenticated'),
     });
+    const analyticsMcp = (0, toolAnalytics_1.withMCPToolAnalytics)(mcp, {
+        telemetry,
+        getSessionId: () => bridge.getSessionId() ?? undefined,
+        getAuthState: () => configManager.isAuthenticated() || Boolean(configManager.getRefreshToken())
+            ? 'authenticated'
+            : 'unauthenticated',
+        mcpEditor,
+    });
     // Every substantive tool is gated behind login: register them on `guardedMcp`
     // so an unauthenticated call returns AUTH_REQUIRED instead of running. The
-    // login/logout/auth_status tools register on the raw `mcp` so they stay
-    // reachable while logged out.
-    const guardedMcp = (0, tools_1.withAuthGuard)(mcp, requireAuth);
+    // login/logout/auth_status tools register on `analyticsMcp` so they stay
+    // reachable while logged out and still emit tool analytics.
+    const guardedMcp = (0, tools_1.withAuthGuard)(analyticsMcp, requireAuth);
     // Track the Express server
     let serverHandle = null;
     let sessionStartedAt = null;
@@ -1784,6 +1927,7 @@ const createRivetMcp = (options) => {
                 message: 'Timed out waiting for changes. Call watch_for_changes again to keep waiting.',
                 devServerHealth: health,
                 pendingVariantRequests: bridge.pendingVariantRequestCount(),
+                activeLeases: getActiveLeaseMetadata(bridge),
             });
         }
         const routed = leaseAndRouteBatch(args.sessionId, (0, exports.resolveLeasePickupRequestId)(args));
@@ -1795,6 +1939,7 @@ const createRivetMcp = (options) => {
             message: 'No pending changes. Call watch_for_changes again to keep waiting.',
             devServerHealth: health,
             pendingVariantRequests: bridge.pendingVariantRequestCount(),
+            activeLeases: getActiveLeaseMetadata(bridge),
         });
     });
     guardedMcp.tool('get_pending_changes', `Pick up pending design changes from the Rivet visual editor. Returns a leased batch with leaseId and kind when work is queued. After editing files (apply), call again with refresh_git: true and leaseId to ack and refresh git. After variant batches, call with ack_batch: true and leaseId. Returns hasChanges: false if no changes are queued yet.`, {
@@ -1854,6 +1999,7 @@ const createRivetMcp = (options) => {
         }
         return (0, exports.buildNoPendingChangesResponse)({
             pendingVariantRequests: bridge.pendingVariantRequestCount(),
+            activeLeases: getActiveLeaseMetadata(bridge),
         });
     });
     guardedMcp.tool('close_visual_editor', 'Stop the Rivet visual editing session and clean up resources. Call this when the user is done making visual changes.', sessionIdArgs, async (args) => {
@@ -1890,7 +2036,10 @@ const createRivetMcp = (options) => {
         leaseOwner: () => 'mcp-server',
         ensureVisualEditorOpen: ensureZeroToOneVisualEditorOpen,
         getProjectPath: () => bridge.getProjectPath(),
+        resolveVariantRequestProjectPath: (requestId) => bridge.resolveVariantRequestProjectPath(requestId),
         pendingVariantRequestCount: () => bridge.pendingVariantRequestCount(),
+        claimVariantRequestLease: variantRequestLeaseTracker.claim,
+        completeVariantRequestWork: variantRequestLeaseTracker.complete,
         isVariantSendEnabled: async () => {
             const flags = await (0, evaluateFlags_1.getFeatureFlags)();
             return flags.variantSend.isEnabled;
@@ -1903,7 +2052,7 @@ const createRivetMcp = (options) => {
         integrationsClient,
         openIntegrationConnectUrl,
     });
-    (0, tools_1.registerAuthTools)(mcp, {
+    (0, tools_1.registerAuthTools)(analyticsMcp, {
         authService,
         telemetry,
         mcpEditor,