rivet-design 0.24.0 → 0.26.0

package/dist/routes/agentVariants.js

@@ -48,9 +48,6 @@ const previewPortBody = v3_1.z.object({
     variantId: v3_1.z.string().min(1).nullable(),
     retry: v3_1.z.boolean().optional(),
 });
-const commitBody = v3_1.z.object({
-    variantId: v3_1.z.string().min(1),
-});
 const adoptPastBody = v3_1.z.object({
     pastSessionId: v3_1.z.string().min(1),
     pastVariantId: v3_1.z.string().min(1),
@@ -1639,73 +1636,6 @@ const createAgentVariantsRouter = (orchestrator, bridge, telemetry, variantHisto
             sendError(res, err);
         }
     });
-    router.get('/variants/:sessionId/design-md/:artifactId', async (req, res) => {
-        if (rejectNonLocalRequest(req, res))
-            return;
-        const flags = await (0, evaluateFlags_1.getFeatureFlags)({
-            userKey: (0, featureFlagUserKey_1.getConfigFeatureFlagUserKey)({ headers: req.headers }),
-        });
-        if (!flags.designContextViewer.isEnabled) {
-            res.status(403).json({
-                errorCode: 'FEATURE_DISABLED',
-                message: 'Design context viewer is not enabled.',
-            });
-            return;
-        }
-        const { sessionId, artifactId } = req.params;
-        try {
-            const markdown = orchestrator.getDesignContextMarkdown(sessionId, artifactId);
-            if (!markdown) {
-                res.status(404).json({
-                    errorCode: 'WORK_ITEM_NOT_FOUND',
-                    message: 'DesignMD artifact not found',
-                });
-                return;
-            }
-            res
-                .status(200)
-                .type('text/markdown')
-                .set('Cache-Control', 'no-store')
-                .send(markdown);
-        }
-        catch (err) {
-            sendError(res, err);
-        }
-    });
-    router.get('/variants/:sessionId/design-md/:artifactId/view', async (req, res) => {
-        if (rejectNonLocalRequest(req, res))
-            return;
-        const flags = await (0, evaluateFlags_1.getFeatureFlags)({
-            userKey: (0, featureFlagUserKey_1.getConfigFeatureFlagUserKey)({ headers: req.headers }),
-        });
-        if (!flags.designContextViewer.isEnabled) {
-            res.status(403).json({
-                errorCode: 'FEATURE_DISABLED',
-                message: 'Design context viewer is not enabled.',
-            });
-            return;
-        }
-        const { sessionId, artifactId } = req.params;
-        try {
-            const html = orchestrator.getDesignContextViewerHtml(sessionId, artifactId);
-            if (!html) {
-                res.status(404).json({
-                    errorCode: 'WORK_ITEM_NOT_FOUND',
-                    message: 'DesignMD artifact not found',
-                });
-                return;
-            }
-            res
-                .status(200)
-                .type('html')
-                .set('Cache-Control', 'no-store')
-                .set('Content-Security-Policy', "default-src 'none'; style-src 'unsafe-inline'; img-src 'self'")
-                .send(html);
-        }
-        catch (err) {
-            sendError(res, err);
-        }
-    });
     router.get('/variants/:sessionId/static/:variantId/{*assetPath}', async (req, res) => {
         if (rejectNonLocalRequest(req, res))
             return;
@@ -1746,92 +1676,6 @@ const createAgentVariantsRouter = (orchestrator, bridge, telemetry, variantHisto
             sendError(res, err);
         }
     });
-    postOperation('/variants/:sessionId/commit', async (req, res) => {
-        if (rejectNonLocalRequest(req, res))
-            return;
-        const sessionId = req.params.sessionId;
-        const flags = await (0, evaluateFlags_1.getFeatureFlags)({
-            userKey: (0, featureFlagUserKey_1.getConfigFeatureFlagUserKey)({ headers: req.headers }),
-        });
-        if (!flags.variantSend.isEnabled) {
-            res.status(403).json({
-                errorCode: 'FEATURE_DISABLED',
-                message: 'Variant send is not enabled.',
-            });
-            return;
-        }
-        const parsed = commitBody.safeParse(req.body);
-        if (!parsed.success) {
-            res.status(400).json({
-                errorCode: 'SCHEMA_VALIDATION_FAILED',
-                message: parsed.error.message,
-            });
-            return;
-        }
-        try {
-            const projectContext = orchestrator.getProjectContext(sessionId);
-            const isFresh = projectContext.kind === 'fresh';
-            const result = await orchestrator.commitVariant({
-                sessionId,
-                variantId: parsed.data.variantId,
-                skipTeardown: isFresh,
-            });
-            if (result.enqueued &&
-                result.payloadKind === 'project-created' &&
-                isFresh) {
-                if (!bridge || !result.destinationPath) {
-                    variantsTelemetry?.trackAgentVariantsActiveProjectTransition({
-                        sessionId,
-                        success: false,
-                        reasonCode: 'bridge_unavailable',
-                        destinationPath: result.destinationPath ?? null,
-                    });
-                    res.status(503).json({
-                        errorCode: 'RUNTIME_VALIDATION_FAILED',
-                        message: 'Variant sent, but active-project transition is unavailable. Keep this session open and run open_visual_editor on the destination project.',
-                        destinationPath: result.destinationPath ?? null,
-                    });
-                    return;
-                }
-                try {
-                    bridge.rebindProjectPath(result.destinationPath);
-                    await orchestrator.cleanupCommittedSession(sessionId);
-                    variantsTelemetry?.trackAgentVariantsActiveProjectTransition({
-                        sessionId,
-                        success: true,
-                        reasonCode: 'rebind_succeeded',
-                        destinationPath: result.destinationPath,
-                    });
-                }
-                catch {
-                    variantsTelemetry?.trackAgentVariantsActiveProjectTransition({
-                        sessionId,
-                        success: false,
-                        reasonCode: 'rebind_failed',
-                        destinationPath: result.destinationPath,
-                    });
-                    res.status(500).json({
-                        errorCode: 'RUNTIME_VALIDATION_FAILED',
-                        message: 'Variant sent, but active-project handoff failed. Destination project is preserved; keep this variants session open and retry send.',
-                        destinationPath: result.destinationPath,
-                    });
-                    return;
-                }
-            }
-            else if (bridge && result.enqueued) {
-                try {
-                    bridge.switchPreviewPort(null);
-                }
-                catch (err) {
-                    log.warn('switchPreviewPort(null) after commit failed', err);
-                }
-            }
-            res.json(result);
-        }
-        catch (err) {
-            sendError(res, err);
-        }
-    });
     postOperation('/variants/:sessionId/deploy', async (req, res) => {
         if (rejectNonLocalRequest(req, res))
             return;
@@ -2205,6 +2049,7 @@ const createAgentVariantsRouter = (orchestrator, bridge, telemetry, variantHisto
             sendError(res, err);
         }
     });
+    router.use('/variants', (_req, res) => res.sendStatus(404));
     return router;
 };
 exports.createAgentVariantsRouter = createAgentVariantsRouter;

package/dist/routes/editorAccess.d.ts

@@ -1,3 +1,4 @@
 import type { RequestHandler } from 'express';
 export declare const authenticateEditor: (token: string) => RequestHandler;
+export declare const authenticateEditorApi: (token: string) => RequestHandler;
 //# sourceMappingURL=editorAccess.d.ts.map

package/dist/routes/editorAccess.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authenticateEditor = void 0;
+exports.authenticateEditorApi = exports.authenticateEditor = void 0;
 const crypto_1 = require("crypto");
 const loopback_1 = require("../utils/loopback");
 const editorAccess_1 = require("../utils/editorAccess");
@@ -20,9 +20,7 @@ const authenticateEditor = (token) => (req, res, next) => {
         !supplied ||
         Buffer.byteLength(supplied) !== Buffer.byteLength(token) ||
         !(0, crypto_1.timingSafeEqual)(Buffer.from(supplied), Buffer.from(token))) {
-        res
-            .status(401)
-            .json({
+        res.status(401).json({
             error: 'Open Rivet from its local launch link to access this editor.',
         });
         return;
@@ -30,4 +28,15 @@ const authenticateEditor = (token) => (req, res, next) => {
     next();
 };
 exports.authenticateEditor = authenticateEditor;
+const authenticateEditorApi = (token) => {
+    const authenticate = (0, exports.authenticateEditor)(token);
+    return (req, res, next) => {
+        if ((0, editorAccess_1.isEditorApiPath)(req.path, req.method)) {
+            authenticate(req, res, next);
+            return;
+        }
+        next();
+    };
+};
+exports.authenticateEditorApi = authenticateEditorApi;
 //# sourceMappingURL=editorAccess.js.map

package/dist/routes/library/browserAccess.d.ts

@@ -1,7 +1,9 @@
 import { Router } from 'express';
 import { BrowserSessions } from '../../library/BrowserSessions';
-export declare const createBrowserAccessRouter: ({ token, sessions, }: {
+import type { TelemetryService } from '../../services/TelemetryService';
+export declare const createBrowserAccessRouter: ({ token, sessions, telemetry, }: {
     token: string;
     sessions: BrowserSessions;
+    telemetry?: Pick<TelemetryService, "reportInstallRefActivations">;
 }) => Router;
 //# sourceMappingURL=browserAccess.d.ts.map

package/dist/routes/library/browserAccess.js

@@ -14,7 +14,7 @@ const signInBody = zod_1.z.object({
     refreshToken: zod_1.z.string().optional(),
     installRef: zod_1.z.string().optional(),
 });
-const createBrowserAccessRouter = ({ token, sessions, }) => {
+const createBrowserAccessRouter = ({ token, sessions, telemetry, }) => {
     const router = (0, express_1.Router)();
     router.post('/browser-sessions', (0, express_1.json)({ limit: '8kb' }), async (req, res) => {
         if (!(0, middleware_1.isLocalBrowserRequest)(req))
@@ -39,8 +39,10 @@ const createBrowserAccessRouter = ({ token, sessions, }) => {
             userId: profile.userId,
         });
         const carriedInstallRef = (0, installRef_1.parseInstallRef)(parsed.data.installRef);
-        if (carriedInstallRef)
-            sessions.config.clearInstallRef(carriedInstallRef);
+        if (carriedInstallRef) {
+            sessions.config.completeInstallRefSignIn(carriedInstallRef, profile.userId);
+        }
+        telemetry?.reportInstallRefActivations();
         return res.json({ token: browserToken });
     });
     router.post('/browser-sessions/exchange', (0, express_1.json)({ limit: '8kb' }), (req, res) => {

package/dist/routes/library/index.js

@@ -38,6 +38,7 @@ const createLibraryRouter = (options) => {
         router.use((0, browserAccess_1.createBrowserAccessRouter)({
             token: options.token,
             sessions: options.browserSessions,
+            telemetry: options.telemetry,
         }));
     router.get('/health', (0, middleware_1.authenticateLibrary)(options.token), (_req, res) => res.json({
         pid: process.pid,

package/dist/server.js

@@ -321,6 +321,7 @@ const startServer = async (options) => {
         }
         next();
     });
+    app.use((0, editorAccess_1.authenticateEditorApi)(editorAccessToken));
     app.use('/api/telemetry', (0, telemetry_1.createTelemetryRouter)(telemetry));
     const jsonBodyParser = express_1.default.json({ limit: '50mb' });
     app.use(jsonBodyParser);

package/dist/services/AuthService.js

@@ -403,7 +403,7 @@ class AuthService {
             if (tokenResult.success && tokenResult.token && tokenResult.user) {
                 this.configManager.setAuth(tokenResult.token, tokenResult.user.email, tokenResult.refreshToken, tokenResult.user.id, { expectedGeneration, isRecovery: true });
                 if (installRef) {
-                    this.configManager.clearInstallRef(installRef);
+                    this.configManager.completeInstallRefSignIn(installRef, tokenResult.user.id);
                 }
                 log.info(`Logged in as ${tokenResult.user.email}`);
             }
@@ -501,12 +501,14 @@ class AuthService {
             authUrl: startResult.authUrl,
             ...(installRef ? { installRef } : {}),
         });
-        try {
-            const open = (await Promise.resolve().then(() => __importStar(require('open')))).default;
-            await open(startResult.authUrl);
-        }
-        catch (error) {
-            log.warn('Could not open browser for login:', error);
+        if (!options.noBrowser) {
+            try {
+                const open = (await Promise.resolve().then(() => __importStar(require('open')))).default;
+                await open(startResult.authUrl);
+            }
+            catch (error) {
+                log.warn('Could not open browser for login:', error);
+            }
         }
         return {
             started: true,
@@ -528,7 +530,7 @@ class AuthService {
             (0, pendingLogin_1.clearPendingLogin)();
             this.configManager.setAuth(tokenResult.token, tokenResult.user.email, tokenResult.refreshToken, tokenResult.user.id, { expectedGeneration: pending.generation, isRecovery: true });
             if (pending.installRef) {
-                this.configManager.clearInstallRef(pending.installRef);
+                this.configManager.completeInstallRefSignIn(pending.installRef, tokenResult.user.id);
             }
             log.info(`Logged in as ${tokenResult.user.email} (resumed login)`);
             return tokenResult;

package/dist/services/ConfigManager.d.ts

@@ -3,6 +3,20 @@ export interface AccountIdentity {
     userId?: string;
     email?: string;
 }
+export type InstallRefActivationTrigger = 'first_run' | 'sign_in';
+export type InstallRefActivation = {
+    installRef: string;
+    trigger: InstallRefActivationTrigger;
+    downloadType?: string;
+    userId?: string;
+};
+type InstallRefActivationRecord = {
+    installRef: string;
+    downloadType?: string;
+    signInUserId?: string;
+    pendingTriggers: InstallRefActivationTrigger[];
+    reportedTriggers: InstallRefActivationTrigger[];
+};
 type RivetConfig = {
     authToken?: string;
     refreshToken?: string;
@@ -21,6 +35,7 @@ type RivetConfig = {
     workerVendorFallback?: boolean;
     workerModels?: Partial<Record<'claude' | 'codex' | 'cursor', string>>;
     installRef?: string;
+    installRefActivations?: InstallRefActivationRecord[];
 };
 interface ConfigManagerOptions {
     configPath?: string;
@@ -65,8 +80,10 @@ export declare class ConfigManager {
     markFirstVariantsRun(): void;
     claimMcpRemovedTelemetryWindow(now?: Date): boolean;
     getInstallRef(): string | undefined;
-    setInstallRef(installRef: string): void;
+    setInstallRef(installRef: string, downloadType?: string): void;
     clearInstallRef(installRef: string): void;
+    completeInstallRefSignIn(installRef: string, userId: string | undefined): void;
+    claimInstallRefActivations(): InstallRefActivation[];
     getProxyUrl(): string;
     getConfiguredRunner(): string | undefined;
     getConfiguredRunnerPaths(): Record<string, unknown> | undefined;

package/dist/services/ConfigManager.js

@@ -14,8 +14,31 @@ const proxy_1 = require("../config/proxy");
 const RequestAuthContext_1 = require("./RequestAuthContext");
 const accessTokenRefresh_1 = require("./accessTokenRefresh");
 const installRef_1 = require("../utils/installRef");
+const telemetryPolicy_1 = require("../config/telemetryPolicy");
 const BrowserAuthorizationRecords_1 = require("../storage/library/BrowserAuthorizationRecords");
 const log = (0, logger_1.createLogger)('ConfigManager');
+const MAX_TRACKED_INSTALL_REFS = 20;
+const queueInstallRefTrigger = ({ records = [], installRef, trigger, downloadType, signInUserId, }) => {
+    const existing = records.find((record) => record.installRef === installRef);
+    const record = existing ?? {
+        installRef,
+        pendingTriggers: [],
+        reportedTriggers: [],
+    };
+    const isKnownTrigger = record.pendingTriggers.includes(trigger) ||
+        record.reportedTriggers.includes(trigger);
+    const updated = isKnownTrigger
+        ? record
+        : {
+            ...record,
+            downloadType: record.downloadType ?? downloadType,
+            ...(signInUserId ? { signInUserId } : {}),
+            pendingTriggers: [...record.pendingTriggers, trigger],
+        };
+    const others = records.filter((entry) => entry.installRef !== installRef);
+    return [...others, updated].slice(-MAX_TRACKED_INSTALL_REFS);
+};
+const hasPendingInstallRefTriggers = (records = []) => records.some((record) => record.pendingTriggers.length > 0);
 const authFields = (config) => ({
     authToken: config.authToken,
     refreshToken: config.refreshToken,
@@ -280,10 +303,20 @@ class ConfigManager {
         this.reloadConfigFromDisk();
         return (0, installRef_1.parseInstallRef)(this.config.installRef);
     }
-    setInstallRef(installRef) {
-        this.reloadConfigFromDisk();
-        this.config.installRef = installRef;
-        this.saveConfig();
+    setInstallRef(installRef, downloadType) {
+        this.getBrowserAuthorization().saveSettings(() => {
+            this.reloadConfigFromDisk();
+            this.config.installRef = installRef;
+            if ((0, telemetryPolicy_1.getTelemetryMode)() !== 'off') {
+                this.config.installRefActivations = queueInstallRefTrigger({
+                    records: this.config.installRefActivations,
+                    installRef,
+                    trigger: 'first_run',
+                    downloadType,
+                });
+            }
+            this.writeConfig();
+        });
     }
     clearInstallRef(installRef) {
         this.reloadConfigFromDisk();
@@ -292,6 +325,60 @@ class ConfigManager {
         this.config.installRef = undefined;
         this.saveConfig();
     }
+    completeInstallRefSignIn(installRef, userId) {
+        this.getBrowserAuthorization().saveSettings(() => {
+            this.reloadConfigFromDisk();
+            if (this.config.installRef === installRef) {
+                this.config.installRef = undefined;
+            }
+            if ((0, telemetryPolicy_1.getTelemetryMode)() !== 'off') {
+                this.config.installRefActivations = queueInstallRefTrigger({
+                    records: this.config.installRefActivations,
+                    installRef,
+                    trigger: 'sign_in',
+                    signInUserId: userId,
+                });
+            }
+            this.writeConfig();
+        });
+    }
+    claimInstallRefActivations() {
+        this.reloadConfigFromDisk();
+        if (!hasPendingInstallRefTriggers(this.config.installRefActivations)) {
+            return [];
+        }
+        const claimed = [];
+        this.getBrowserAuthorization().saveSettings(() => {
+            this.reloadConfigFromDisk();
+            const records = this.config.installRefActivations ?? [];
+            for (const record of records) {
+                for (const trigger of record.pendingTriggers) {
+                    claimed.push({
+                        installRef: record.installRef,
+                        trigger,
+                        ...(record.downloadType
+                            ? { downloadType: record.downloadType }
+                            : {}),
+                        ...(trigger === 'sign_in' && record.signInUserId
+                            ? { userId: record.signInUserId }
+                            : {}),
+                    });
+                }
+            }
+            if (claimed.length === 0)
+                return;
+            this.config.installRefActivations = records.map((record) => ({
+                ...record,
+                pendingTriggers: [],
+                reportedTriggers: [
+                    ...record.reportedTriggers,
+                    ...record.pendingTriggers,
+                ],
+            }));
+            this.writeConfig();
+        });
+        return claimed;
+    }
     getProxyUrl() {
         this.reloadConfigFromDisk();
         return this.config.proxyUrl || proxy_1.PROXY_URL;

package/dist/services/SessionBridgeService.d.ts

@@ -88,7 +88,6 @@ export declare class SessionBridgeService {
     isActive(): boolean;
     getSessionId(): string | null;
     getProjectPath(): string | null;
-    rebindProjectPath(projectPath: string): void;
     hasUnfinishedWork(): boolean;
     getChannelDepth(_kind: BatchChannelKind): ChannelDepth;
     getActiveLeaseMetadata(): ActiveLeaseMetadata[];
@@ -124,7 +123,6 @@ export declare class SessionBridgeService {
     setStatusAccessToken(token: string): void;
     hasStatusAccessToken(): boolean;
     isStatusAccessTokenValid(token: string | null | undefined): boolean;
-    setCommittedDevServerHealth(port: number | null): void;
     switchPreviewPort(port: number | null): void;
     endSession(): number;
     getWatcherLiveness(_now?: number): WatcherLiveness;

package/dist/services/SessionBridgeService.js

@@ -85,13 +85,6 @@ class SessionBridgeService {
     getProjectPath() {
         return this.projectPath;
     }
-    rebindProjectPath(projectPath) {
-        if (!this.sessionId) {
-            throw new Error('Cannot rebind project path without an active session');
-        }
-        this.projectPath = projectPath;
-        log.info(`Session project rebound to ${projectPath}`);
-    }
     hasUnfinishedWork() {
         return false;
     }
@@ -209,25 +202,6 @@ class SessionBridgeService {
     isStatusAccessTokenValid(token) {
         return Boolean(token) && token === this.statusAccessToken;
     }
-    setCommittedDevServerHealth(port) {
-        if (port === null) {
-            this.devServerHealth = this.baseDevServerHealth
-                ? { ...this.baseDevServerHealth }
-                : { ...EMPTY_DEV_SERVER_HEALTH, lastCheckedAt: Date.now() };
-            return;
-        }
-        const committedDevServerHealth = {
-            ownership: 'rivet_owned',
-            host: 'localhost',
-            port,
-            isReachable: true,
-            reason: 'healthy',
-            lastCheckedAt: Date.now(),
-            startedByRivet: true,
-        };
-        this.devServerHealth = committedDevServerHealth;
-        this.baseDevServerHealth = { ...committedDevServerHealth };
-    }
     switchPreviewPort(port) {
         if (!this._setVariantTarget) {
             log.warn(`switchPreviewPort(${port}) called but no variant target setter registered`);

package/dist/services/TelemetryService.d.ts

@@ -49,7 +49,10 @@ export declare class TelemetryService {
     private get distinctId();
     identifyUser(identity?: AccountIdentity): void;
     private mirrorToLocalSink;
-    track(event: string, properties?: Record<string, unknown>): void;
+    reportInstallRefActivations(): void;
+    track(event: string, properties?: Record<string, unknown>, options?: {
+        distinctId?: string;
+    }): void;
     trackSessionStart(options: {
         framework?: string;
         port?: number;
@@ -258,7 +261,6 @@ export declare class TelemetryService {
     trackAgentVariantsRefinementFailed(data: MCPVariantsTelemetryMetadata): void;
     trackAgentVariantsRoundStarted(data: MCPVariantsTelemetryMetadata): void;
     trackAgentVariantsRoundCompleted(data: MCPVariantsTelemetryMetadata): void;
-    trackAgentVariantsCommitFailed(data: MCPVariantsTelemetryMetadata): void;
     trackAgentVariantsScaffoldStarted(data: {
         sessionId: string;
         variantCount: number;
@@ -365,13 +367,6 @@ export declare class TelemetryService {
         reason?: string;
         hasPort: boolean;
     }): void;
-    trackAgentVariantsNewProjectMaterialized(data: {
-        sessionId: string;
-        variantId: string;
-        destinationPath: string;
-        changedFilesCount: number;
-        durationMs: number;
-    }): void;
     trackAgentVariantsSourceContextQuality(data: {
         sessionId: string;
         sourceUrlCount: number;
@@ -390,12 +385,6 @@ export declare class TelemetryService {
         variantId: string;
         status: 'completed' | 'skipped' | 'failed' | 'missing';
     }): void;
-    trackAgentVariantsActiveProjectTransition(data: {
-        sessionId: string;
-        success: boolean;
-        reasonCode: string;
-        destinationPath: string | null;
-    }): void;
     flush(): Promise<void>;
     shutdown(timeoutMs?: number): Promise<void>;
 }

package/dist/services/TelemetryService.js

@@ -178,7 +178,31 @@ class TelemetryService {
         }
         catch { }
     }
-    track(event, properties = {}) {
+    reportInstallRefActivations() {
+        if (!this.isEnabled || !this.posthog || (0, telemetryPolicy_1.getTelemetryMode)() !== 'full')
+            return;
+        try {
+            const cm = (0, ConfigManager_1.getConfigManager)();
+            for (const activation of cm.claimInstallRefActivations()) {
+                const account = cm.getAccountIdentity();
+                const userId = activation.userId ?? account.userId;
+                if (userId) {
+                    this.identifyUser(userId === account.userId ? account : { userId });
+                }
+                this.track('install_ref_activated', {
+                    install_ref: activation.installRef,
+                    trigger: activation.trigger,
+                    ...(activation.downloadType
+                        ? { download_type: activation.downloadType }
+                        : {}),
+                }, { distinctId: userId ?? cm.getAnonymousId() });
+            }
+        }
+        catch {
+            log.debug('Could not report install ref activations');
+        }
+    }
+    track(event, properties = {}, options = {}) {
         const mode = (0, telemetryPolicy_1.getTelemetryMode)();
         if (mode === 'off')
             return;
@@ -210,9 +234,10 @@ class TelemetryService {
                 : undefined;
             if (account)
                 this.identifyUser(account);
-            const distinctId = account
-                ? (account.userId ?? (0, ConfigManager_1.getConfigManager)().getPluginTelemetryId())
-                : this.distinctId;
+            const distinctId = options.distinctId ??
+                (account
+                    ? (account.userId ?? (0, ConfigManager_1.getConfigManager)().getPluginTelemetryId())
+                    : this.distinctId);
             const enrichedProperties = {
                 ...approved,
                 telemetry_version: telemetryContract_1.TELEMETRY_VERSION,
@@ -660,14 +685,6 @@ class TelemetryService {
             ...(0, MCPVariantsTelemetry_1.buildMCPVariantsTelemetryProperties)(data),
         });
     }
-    trackAgentVariantsCommitFailed(data) {
-        this.track('agent_variants.commit_failed', {
-            ...(0, MCPVariantsTelemetry_1.buildMCPVariantsTelemetryProperties)({
-                ...data,
-                requestStatus: data.requestStatus ?? 'failed',
-            }),
-        });
-    }
     trackAgentVariantsScaffoldStarted(data) {
         this.track('agent_variants.scaffold_started', {
             session_id: data.sessionId,
@@ -803,16 +820,6 @@ class TelemetryService {
             source: 'mcp',
         });
     }
-    trackAgentVariantsNewProjectMaterialized(data) {
-        this.track('agent_variants.new_project_materialized', {
-            session_id: data.sessionId,
-            variant_id: data.variantId,
-            destination_path_hash: this.hashTelemetryValue(data.destinationPath),
-            changed_files_count: data.changedFilesCount,
-            duration_ms: data.durationMs,
-            source: 'mcp',
-        });
-    }
     trackAgentVariantsSourceContextQuality(data) {
         this.track('agent_variants.source_context_quality', {
             session_id: data.sessionId,
@@ -840,17 +847,6 @@ class TelemetryService {
             source: 'mcp',
         });
     }
-    trackAgentVariantsActiveProjectTransition(data) {
-        this.track('agent_variants.active_project_transition', {
-            session_id: data.sessionId,
-            success: data.success,
-            reason_code: data.reasonCode,
-            destination_path_hash: data.destinationPath
-                ? this.hashTelemetryValue(data.destinationPath)
-                : null,
-            source: 'mcp',
-        });
-    }
     async flush() {
         if (this.posthog) {
             try {