rivet-design 0.26.1 → 0.27.0

package/dist/cli/commands/contextRequest.js

@@ -133,7 +133,7 @@ const contextRequest = async (args) => {
                         },
                     ]);
                 request.verificationTarget = zod_1.z
-                    .record(zod_1.z.unknown())
+                    .record(zod_1.z.string(), zod_1.z.unknown())
                     .parse(JSON.parse(await (0, guidanceReferences_1.readGuidanceText)(path_1.default.resolve(inputFile))));
                 request.endpoint += '/verifier';
                 break;

package/dist/cli/commands/guidanceReferences.d.ts

@@ -1,11 +1,11 @@
 export declare const readGuidanceText: (file: string) => Promise<string>;
 export declare const guidanceReferences: (manifestPath: string) => Promise<({
-    path: string;
     kind: "directory";
+    path: string;
     intent: string;
 } | {
-    url: string;
     kind: "url" | "repository";
+    url: string;
     intent: string;
     revision?: string | undefined;
     files?: {

package/dist/cli/commands/guidanceVerifierPackage.d.ts

@@ -1,9 +1,9 @@
 export declare const guidanceVerifierPackage: (manifestPath: string) => Promise<{
+    runtime: "node";
+    entrypoint: string;
     files: {
         name: string;
         content: string;
     }[];
-    runtime: "node";
-    entrypoint: string;
 }>;
 //# sourceMappingURL=guidanceVerifierPackage.d.ts.map

package/dist/cli/commands/mcpServe.js

@@ -182,6 +182,7 @@ const buildMcpServer = async (options = {}) => {
                 durationMs: Date.now() - startedAt,
                 designContextKind: (0, telemetry_1.designContextKindForEnvelope)(result.envelope),
                 ...(0, telemetry_1.variantContextMetadataForArgs)(command, rest),
+                ...(0, telemetry_1.verificationMetadataForEnvelope)(result.envelope),
                 ...callerFields,
                 source: 'mcp',
             });

package/dist/cli/commands/serve.js

@@ -113,6 +113,7 @@ const handleServe = async (args, io) => {
             stage: 'resolve_dev_server',
             failureReason: 'operation_failed',
             durationMs: Date.now() - serverStartStartedAt,
+            error,
         });
         await telemetry.shutdown();
         await logForwarder.shutdown();
@@ -299,6 +300,7 @@ const handleServe = async (args, io) => {
             stage: 'start_editor_server',
             failureReason: 'operation_failed',
             durationMs: Date.now() - serverStartStartedAt,
+            error,
         });
         await telemetry.shutdown();
         await logForwarder.shutdown();

package/dist/cli/editorSession.d.ts

@@ -5,19 +5,7 @@ declare const EditorSessionSchema: z.ZodObject<{
     projectPath: z.ZodString;
     startedAt: z.ZodString;
     token: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    port: number;
-    token: string;
-    pid: number;
-    projectPath: string;
-    startedAt: string;
-}, {
-    port: number;
-    token: string;
-    pid: number;
-    projectPath: string;
-    startedAt: string;
-}>;
+}, z.core.$strip>;
 type EditorOwner = Omit<z.infer<typeof EditorSessionSchema>, 'token'>;
 export declare const createEditorAccessToken: () => string;
 export declare const writeEditorSession: (session: z.infer<typeof EditorSessionSchema>) => void;

package/dist/cli/handoff.d.ts

@@ -35,6 +35,7 @@ export type CallerTelemetryFields = {
     callerAgent?: string;
     callerModel?: string;
     callerAgentSource?: 'handoff' | 'env';
+    callerRunId?: string;
 };
 export declare const callerTelemetryFieldsFromArgs: (args: string[], env?: NodeJS.ProcessEnv) => CallerTelemetryFields;
 export declare const initiatorFor: (handoff: CallerHandoff | null) => WorkItemInitiator;

package/dist/cli/handoff.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initiatorFor = exports.callerTelemetryFieldsFromArgs = exports.detectCallerAgentFromEnv = exports.callerAgentEvidenceFromEnv = exports.detectCallerAgentsFromEnv = exports.parseHandoff = exports.HANDOFF_ENV_VARS = exports.CALLER_AGENT_ALLOWLIST = void 0;
+const node_crypto_1 = require("node:crypto");
 exports.CALLER_AGENT_ALLOWLIST = ['claude', 'codex', 'cursor'];
 exports.HANDOFF_ENV_VARS = {
     agent: 'RIVET_CALLER_AGENT',
@@ -84,6 +85,11 @@ const callerAgentEvidenceFromEnv = (env = process.env) => ENV_MARKERS_BY_AGENT.m
 exports.callerAgentEvidenceFromEnv = callerAgentEvidenceFromEnv;
 const detectCallerAgentFromEnv = (env = process.env) => (0, exports.detectCallerAgentsFromEnv)(env)[0];
 exports.detectCallerAgentFromEnv = detectCallerAgentFromEnv;
+const CALLER_RUN_ID_HEX_LENGTH = 16;
+const callerRunIdForSession = (session) => (0, node_crypto_1.createHash)('sha256')
+    .update(session)
+    .digest('hex')
+    .slice(0, CALLER_RUN_ID_HEX_LENGTH);
 const callerTelemetryFieldsFromArgs = (args, env = process.env) => {
     const valueOf = (flag) => {
         const index = args.indexOf(flag);
@@ -95,15 +101,25 @@ const callerTelemetryFieldsFromArgs = (args, env = process.env) => {
         callerSession: valueOf('--caller-session'),
         handoffJson: valueOf('--handoff'),
     }, env);
-    if (parsed.ok && parsed.handoff) {
+    const handoff = parsed.ok ? parsed.handoff : null;
+    const session = handoff?.session ??
+        nonEmpty(env.CODEX_THREAD_ID) ??
+        nonEmpty(env.CLAUDE_CODE_SESSION_ID);
+    const callerRunId = session ? callerRunIdForSession(session) : undefined;
+    const runId = callerRunId ? { callerRunId } : {};
+    if (handoff) {
         return {
-            callerAgent: parsed.handoff.agent,
-            callerModel: parsed.handoff.model,
+            callerAgent: handoff.agent,
+            callerModel: handoff.model,
             callerAgentSource: 'handoff',
+            ...runId,
         };
     }
     const detected = (0, exports.detectCallerAgentFromEnv)(env);
-    return detected ? { callerAgent: detected, callerAgentSource: 'env' } : {};
+    if (detected) {
+        return { callerAgent: detected, callerAgentSource: 'env', ...runId };
+    }
+    return runId;
 };
 exports.callerTelemetryFieldsFromArgs = callerTelemetryFieldsFromArgs;
 const initiatorFor = (handoff) => handoff

package/dist/cli/router.js

@@ -309,6 +309,7 @@ const runCliControlCommand = async (args, io = io_1.processCliIO) => {
                 designContextKind: (0, telemetry_1.designContextKindForEnvelope)(result.envelope),
                 ...(0, telemetry_1.variantContextMetadataForArgs)(command, rest),
                 ...(0, telemetry_1.browserMetadataForEnvelope)(result.envelope),
+                ...(0, telemetry_1.verificationMetadataForEnvelope)(result.envelope),
                 ...(0, handoff_1.callerTelemetryFieldsFromArgs)(rest),
             });
             telemetry.reportInstallRefActivations();

package/dist/cli/runtimeInterruption.d.ts

@@ -5,23 +5,9 @@ declare const interruptionSchema: z.ZodObject<{
     serverVersion: z.ZodNullable<z.ZodString>;
     clientVersion: z.ZodString;
     createdAt: z.ZodString;
-    workIds: z.ZodArray<z.ZodString, "many">;
+    workIds: z.ZodArray<z.ZodString>;
     message: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    message: string;
-    clientVersion: string;
-    createdAt: string;
-    receiptPath: string;
-    serverVersion: string | null;
-    workIds: string[];
-}, {
-    message: string;
-    clientVersion: string;
-    createdAt: string;
-    receiptPath: string;
-    serverVersion: string | null;
-    workIds: string[];
-}>;
+}, z.core.$strip>;
 export type RuntimeInterruption = z.infer<typeof interruptionSchema>;
 export declare const recordRuntimeInterruption: ({ attached, snapshot, }: {
     attached: AttachedServer;

package/dist/cli/telemetry.d.ts

@@ -1,6 +1,7 @@
 import type { CliEnvelope } from './envelope';
 import type { BrowserOpenResult } from './browser';
 import { type ServerUnavailableReason } from './serverUnavailable';
+import { type GuidanceVerifierErrorReason } from '../types/guidance-verifier';
 export type { ServerUnavailableReason } from './serverUnavailable';
 export type DesignContextKind = 'arena' | 'pinterest' | 'reference' | 'unsupported' | 'website';
 export type VariantContextKind = 'image' | 'variant' | 'video' | 'website';
@@ -14,6 +15,15 @@ export type BrowserMetadata = {
     browserAction?: BrowserOpenResult['action'];
     browserReason?: BrowserOpenResult['reason'];
 };
+declare const COMPLETED_VERIFICATION_STATUSES: readonly ["pass", "fail", "blocked"];
+type CompletedVerificationStatus = (typeof COMPLETED_VERIFICATION_STATUSES)[number];
+export type VerificationOutcome = CompletedVerificationStatus | GuidanceVerifierErrorReason;
+export type VerificationMetadata = {
+    verificationOutcome?: VerificationOutcome;
+    verificationCheckCount?: number;
+    verificationDurationMs?: number;
+};
+export declare const verificationMetadataForEnvelope: (envelope: CliEnvelope) => VerificationMetadata;
 export declare const browserMetadataForEnvelope: (envelope: CliEnvelope) => BrowserMetadata;
 export declare const serverUnavailableReasonForEnvelope: (envelope: CliEnvelope) => ServerUnavailableReason | undefined;
 export declare const designContextKindForEnvelope: (envelope: CliEnvelope) => DesignContextKind | undefined;

package/dist/cli/telemetry.js

@@ -1,10 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.variantContextMetadataForArgs = exports.designContextKindForEnvelope = exports.serverUnavailableReasonForEnvelope = exports.browserMetadataForEnvelope = void 0;
+exports.variantContextMetadataForArgs = exports.designContextKindForEnvelope = exports.serverUnavailableReasonForEnvelope = exports.browserMetadataForEnvelope = exports.verificationMetadataForEnvelope = void 0;
 const serverUnavailable_1 = require("./serverUnavailable");
+const guidance_verifier_1 = require("../types/guidance-verifier");
+const COMPLETED_VERIFICATION_STATUSES = ['pass', 'fail', 'blocked'];
+const isCompletedVerificationStatus = (value) => typeof value === 'string' &&
+    COMPLETED_VERIFICATION_STATUSES.includes(value);
+const isGuidanceVerifierErrorReason = (value) => typeof value === 'string' &&
+    guidance_verifier_1.GUIDANCE_VERIFIER_ERROR_REASONS.includes(value);
+const isNonNegativeDuration = (value) => typeof value === 'number' && Number.isFinite(value) && value >= 0;
+const verificationOutcomeForReport = (report) => {
+    if (report.execution === 'completed' &&
+        isCompletedVerificationStatus(report.status)) {
+        return report.status;
+    }
+    if (report.execution === 'error' &&
+        isGuidanceVerifierErrorReason(report.reason)) {
+        return report.reason;
+    }
+    return undefined;
+};
 const recordOf = (value) => value !== null && typeof value === 'object'
     ? value
     : {};
+const verificationMetadataForEnvelope = (envelope) => {
+    if (envelope.command !== 'context.verify')
+        return {};
+    const report = recordOf(envelope.ok ? envelope.data : envelope.error.details);
+    const verificationOutcome = verificationOutcomeForReport(report);
+    const verificationCheckCount = Array.isArray(report.checks)
+        ? report.checks.length
+        : undefined;
+    const verificationDurationMs = isNonNegativeDuration(report.durationMs)
+        ? report.durationMs
+        : undefined;
+    return {
+        ...(verificationOutcome !== undefined ? { verificationOutcome } : {}),
+        ...(verificationCheckCount !== undefined ? { verificationCheckCount } : {}),
+        ...(verificationDurationMs !== undefined ? { verificationDurationMs } : {}),
+    };
+};
+exports.verificationMetadataForEnvelope = verificationMetadataForEnvelope;
 const browserMetadataForEnvelope = (envelope) => {
     if (envelope.command !== 'open')
         return {};

package/dist/config/pluginMetrics.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pluginMetricProperties = void 0;
 const zod_1 = require("zod");
+const failureReason_1 = require("../utils/failureReason");
 const count = zod_1.z.number().finite().nonnegative().max(Number.MAX_SAFE_INTEGER);
 const metricProperties = zod_1.z.object({
     command: zod_1.z
@@ -19,6 +20,17 @@ const metricProperties = zod_1.z.object({
         'variants.cancel',
         'reference.fetch',
         'evidence.capture',
+        'context.add',
+        'context.update',
+        'context.list',
+        'context.show',
+        'context.enable',
+        'context.disable',
+        'context.remove',
+        'context.resolve',
+        'context.inspect',
+        'context.verifier',
+        'context.verify',
     ])
         .optional(),
     tool_name: zod_1.z
@@ -112,8 +124,12 @@ const metricProperties = zod_1.z.object({
         'STATIC_PREVIEW_FAILED',
         'DEV_SERVER_FAILED',
         'PREVIEW_UNAVAILABLE',
+        'DEPENDENCY_INSTALL_FAILED',
+        'DEV_SERVER_START_FAILED',
+        'DEV_SCRIPT_MISSING',
     ])
         .optional(),
+    reason_code: zod_1.z.enum(failureReason_1.FAILURE_REASON_CODES).optional(),
     failure_reason: zod_1.z
         .enum([
         'ack_failed',
@@ -169,6 +185,26 @@ const metricProperties = zod_1.z.object({
         'editor_server_start_failed',
     ])
         .optional(),
+    verification_outcome: zod_1.z
+        .enum([
+        'pass',
+        'fail',
+        'blocked',
+        'package_required',
+        'verifier_missing',
+        'verifier_stale',
+        'cancelled',
+        'timeout',
+        'output_limit',
+        'process_failed',
+        'invalid_result',
+        'invalid_evidence',
+        'cleanup_failed',
+        'setup_failed',
+    ])
+        .optional(),
+    verification_check_count: count.int().optional(),
+    verification_duration_ms: count.optional(),
     ok: zod_1.z.boolean().optional(),
     is_recoverable: zod_1.z.boolean().optional(),
     is_fresh: zod_1.z.boolean().optional(),
@@ -205,7 +241,6 @@ const PRODUCT_EVENTS = new Set([
     'visual_editor_reference_connection_failed',
     'agent_variants.request_started',
     'agent_variants.request_accepted',
-    'agent_variants.request_rejected',
     'agent_variants.refinement_requested',
     'agent_variants.refinement_completed',
     'agent_variants.refinement_failed',

package/dist/hosts/workerDefaults.d.ts

@@ -5,22 +5,12 @@ type WorkerAgentDefinition = {
     filename: string;
     content: string;
 };
-export type WorkerHostId = 'claude' | 'codex' | 'cursor' | 'unknown';
 export type WorkerEffortLevel = 'low' | 'medium' | 'high';
 export declare const FIDELITY_WORKER_TIERS: Record<WorkerFidelity, {
     model: string;
     effort: WorkerEffortLevel;
 }>;
 export declare const DEFAULT_WORKER_FIDELITY: WorkerFidelity;
-export type HostWorkerProfile = {
-    id: WorkerHostId;
-    binding: 'agent_definition' | 'none';
-    agentType?: string;
-    defaults?: {
-        model: string;
-        effort: WorkerEffortLevel;
-    };
-};
 export declare const RIVET_WORKER_AGENT_TYPE = "rivet-worker";
 export declare const RIVET_WORKER_AGENT_TYPES: Record<WorkerFidelity, string>;
 export declare const RIVET_WORKER_DEFAULTS: {
@@ -31,7 +21,6 @@ export declare const RIVET_WORKER_REFERENCE_CREATE_DEFAULTS: {
     model: string;
     effort: WorkerEffortLevel;
 };
-export declare const workerProfileFor: (callerAgent?: string, fidelity?: WorkerFidelity) => HostWorkerProfile;
 export declare const RIVET_WORKER_AGENT_VERSION = 3;
 export declare const RIVET_WORKER_AGENT_DEFINITIONS: Record<WorkerFidelity, WorkerAgentDefinition>;
 export declare const RIVET_WORKER_AGENT_FILENAME: string;

package/dist/hosts/workerDefaults.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RIVET_WORKER_AGENT_FILENAME = exports.RIVET_WORKER_AGENT_DEFINITIONS = exports.RIVET_WORKER_AGENT_VERSION = exports.workerProfileFor = exports.RIVET_WORKER_REFERENCE_CREATE_DEFAULTS = exports.RIVET_WORKER_DEFAULTS = exports.RIVET_WORKER_AGENT_TYPES = exports.RIVET_WORKER_AGENT_TYPE = exports.DEFAULT_WORKER_FIDELITY = exports.FIDELITY_WORKER_TIERS = void 0;
-const pluginContext_1 = require("./pluginContext");
+exports.RIVET_WORKER_AGENT_FILENAME = exports.RIVET_WORKER_AGENT_DEFINITIONS = exports.RIVET_WORKER_AGENT_VERSION = exports.RIVET_WORKER_REFERENCE_CREATE_DEFAULTS = exports.RIVET_WORKER_DEFAULTS = exports.RIVET_WORKER_AGENT_TYPES = exports.RIVET_WORKER_AGENT_TYPE = exports.DEFAULT_WORKER_FIDELITY = exports.FIDELITY_WORKER_TIERS = void 0;
 exports.FIDELITY_WORKER_TIERS = {
     low: { model: 'claude-opus-4-8', effort: 'low' },
     medium: { model: 'claude-opus-4-8', effort: 'medium' },
@@ -16,34 +15,6 @@ exports.RIVET_WORKER_AGENT_TYPES = {
 };
 exports.RIVET_WORKER_DEFAULTS = exports.FIDELITY_WORKER_TIERS[exports.DEFAULT_WORKER_FIDELITY];
 exports.RIVET_WORKER_REFERENCE_CREATE_DEFAULTS = exports.FIDELITY_WORKER_TIERS[exports.DEFAULT_WORKER_FIDELITY];
-const HOST_WORKER_PROFILES = {
-    claude: {
-        id: 'claude',
-        binding: 'agent_definition',
-        agentType: exports.RIVET_WORKER_AGENT_TYPE,
-        defaults: exports.RIVET_WORKER_DEFAULTS,
-    },
-    codex: { id: 'codex', binding: 'none' },
-    cursor: { id: 'cursor', binding: 'none' },
-    unknown: { id: 'unknown', binding: 'none' },
-};
-const workerProfileFor = (callerAgent, fidelity = exports.DEFAULT_WORKER_FIDELITY) => {
-    const key = (callerAgent ?? '').trim().toLowerCase();
-    if (key === 'claude') {
-        const pluginName = (0, pluginContext_1.getPluginName)();
-        const agentType = exports.RIVET_WORKER_AGENT_TYPES[fidelity];
-        return {
-            ...HOST_WORKER_PROFILES.claude,
-            agentType: pluginName ? `${pluginName}:${agentType}` : agentType,
-            defaults: exports.FIDELITY_WORKER_TIERS[fidelity],
-        };
-    }
-    if (key === 'codex' || key === 'cursor') {
-        return HOST_WORKER_PROFILES[key];
-    }
-    return HOST_WORKER_PROFILES.unknown;
-};
-exports.workerProfileFor = workerProfileFor;
 exports.RIVET_WORKER_AGENT_VERSION = 3;
 const workerAgentContentFor = (fidelity) => {
     const agentType = exports.RIVET_WORKER_AGENT_TYPES[fidelity];

package/dist/index-core.d.ts

@@ -1,4 +1,3 @@
 export { ProjectDetectionService } from './services/ProjectDetectionService';
 export { createLogger, setLogLevel, redirectLogsToStderr, } from './utils/logger';
-export type { ChangeRecord, } from './types/change-types';
 //# sourceMappingURL=index-core.d.ts.map

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 import { ProjectDetectionService } from './index-core';
+import { AuthService } from './services/AuthService';
 import { SessionBridgeService } from './services/SessionBridgeService';
 import type { Framework } from './services/ProjectDetectionService';
 import { DevServerRuntimeService, type StartDevServerResult } from './services/DevServerRuntimeService';
@@ -75,6 +76,24 @@ export declare const authCommandOptionsForArgs: (args: string[]) => {
 };
 export declare const rememberInstallRef: (args: string[], downloadType?: string) => string[];
 export declare const authFailureReasonForError: (error: string | undefined) => "oauth_failed" | "timeout";
+export declare const signInWithoutBrowser: (authService?: AuthService) => Promise<{
+    success: boolean;
+    token?: string | undefined;
+    refreshToken?: string | undefined;
+    user?: {
+        id: string;
+        email: string;
+        displayName?: string | undefined;
+    } | undefined;
+    profile?: {
+        remaining_spend_usd?: number | null | undefined;
+        monthly_limit_usd?: number | null | undefined;
+        current_month_spend_usd?: number | null | undefined;
+        total_spend_usd?: number | null | undefined;
+    } | null | undefined;
+    error?: string | undefined;
+    message?: string | undefined;
+}>;
 export declare const main: (args?: string[]) => Promise<void>;
 export declare const parseArgs: (args: string[]) => CLIOptions;
 export declare const handleLogin: (options?: {

package/dist/index.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleLogin = exports.parseArgs = exports.main = exports.authFailureReasonForError = exports.rememberInstallRef = exports.authCommandOptionsForArgs = exports.registerOwnedDevServerSignalHandlers = exports.isAgentVariantsEnabled = exports.updateOwnedDevServerHealthOnExit = exports.buildAgentDevServerHealth = exports.resolveAgentDevServer = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = void 0;
+exports.handleLogin = exports.parseArgs = exports.main = exports.signInWithoutBrowser = exports.authFailureReasonForError = exports.rememberInstallRef = exports.authCommandOptionsForArgs = exports.registerOwnedDevServerSignalHandlers = exports.isAgentVariantsEnabled = exports.updateOwnedDevServerHealthOnExit = exports.buildAgentDevServerHealth = exports.resolveAgentDevServer = exports.buildAgentDevServerContext = exports.DEFAULT_USER_PORT = exports.DEFAULT_PORT = void 0;
 /* eslint-disable no-console */
 const dotenv = __importStar(require("dotenv"));
 const crypto_1 = require("crypto");
@@ -260,6 +260,18 @@ const discardInstallRefForValidatedSession = () => {
 };
 const authFailureReasonForError = (error) => error?.trim().toLowerCase() === 'timeout' ? 'timeout' : 'oauth_failed';
 exports.authFailureReasonForError = authFailureReasonForError;
+const signInWithoutBrowser = async (authService = new AuthService_1.AuthService()) => {
+    console.log('\n🔐 Authentication required');
+    console.log('Open this link to sign in:');
+    return authService.loginWithGoogle({
+        source: 'cli',
+        noBrowser: true,
+        onAuthUrl: (url) => {
+            console.log(`\n  ${url}\n`);
+        },
+    });
+};
+exports.signInWithoutBrowser = signInWithoutBrowser;
 const main = async (args = process.argv.slice(2)) => {
     if (args.includes('--no-telemetry'))
         process.env.RIVET_TELEMETRY_DISABLED = '1';
@@ -452,10 +464,7 @@ const main = async (args = process.argv.slice(2)) => {
                     process.exit(1);
                 }
                 if (options.noBrowser) {
-                    console.log('\n🔐 Authentication required');
-                    console.log('Opening browser for Google login...\n');
-                    const authService = new AuthService_1.AuthService();
-                    const loginResult = await authService.loginWithGoogle();
+                    const loginResult = await (0, exports.signInWithoutBrowser)();
                     if (!loginResult.success) {
                         console.log(`\n❌ Authentication failed: ${loginResult.error || loginResult.message}`);
                         process.exit(1);
@@ -861,7 +870,7 @@ const handleInstall = async (installArgs) => {
     (0, exports.rememberInstallRef)(installArgs, selection.targetIds.join(','));
     if (installRef)
         await reportInstallRefActivations();
-    const bootstrap = (0, globalBootstrap_1.bootstrapGlobalInstall)(installArgs);
+    const bootstrap = await (0, globalBootstrap_1.bootstrapGlobalInstall)(installArgs);
     if (bootstrap.action === 'reexeced') {
         process.exit(bootstrap.exitCode);
     }

package/dist/install/automaticCliUpdate.d.ts

@@ -34,6 +34,7 @@ export type AutomaticCliUpdateOptions = {
     currentVersion: string;
     env?: NodeJS.ProcessEnv;
     homeDirectory?: string;
+    installTimeoutMs?: number;
     lockWaitTimeoutMs?: number;
     now?: () => number;
     packageRoot: string;

package/dist/install/automaticCliUpdate.js

@@ -9,10 +9,11 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const serverVersion_1 = require("../cli/serverVersion");
+const npmCommand_1 = require("./npmCommand");
+const OperatingSystemServices_1 = require("../services/OperatingSystemServices");
 const errnoCode_1 = require("../utils/errnoCode");
 const writeFileAtomic_1 = require("../utils/writeFileAtomic");
 const pluginContext_1 = require("../hosts/pluginContext");
-const packageManagerProcess_1 = require("../services/packageManagerProcess");
 const subprocessEnvironment_1 = require("../utils/subprocessEnvironment");
 const AUTOMATIC_UPDATE_STATE_SCHEMA_VERSION = 1;
 const AUTOMATIC_UPDATE_STATE_FILENAME = 'automatic-cli-update.json';
@@ -102,8 +103,7 @@ const persistUpdateState = (statePath, state) => {
     try {
         writeUpdateState(statePath, state);
     }
-    catch {
-    }
+    catch { }
 };
 const normalizedPath = (filePath) => {
     try {
@@ -122,10 +122,11 @@ const isExcludedExecution = (options) => {
         pathSegments.includes('_npx') ||
         (pathSegments.includes('.rivet') && pathSegments.includes('channels')));
 };
-const resolveGlobalPackageRoot = (env) => {
-    const result = (0, packageManagerProcess_1.spawnProcessSync)({ packageManager: 'npm', args: ['root', '-g'] }, {
+const resolveGlobalPackageRoot = async (env) => {
+    const result = await (0, npmCommand_1.runNpm)({
+        args: ['root', '-g'],
         env: (0, subprocessEnvironment_1.subprocessEnvironment)('packageManager', env),
-        timeout: NPM_ROOT_TIMEOUT_MS,
+        timeoutMs: NPM_ROOT_TIMEOUT_MS,
     });
     if (result.error || result.status !== 0 || !result.stdout.trim()) {
         return { failure: 'global_root_unavailable' };
@@ -221,6 +222,11 @@ const isProcessRunning = (pid) => {
         return (0, errnoCode_1.errnoCode)(error) !== 'ESRCH';
     }
 };
+const readLockOwners = (lockPath) => fs_1.default
+    .readFileSync(lockPath, 'utf8')
+    .split('\n')
+    .map((line) => Number.parseInt(line, 10))
+    .filter((owner) => !Number.isNaN(owner));
 const acquireUpdateLock = (lockPath) => {
     fs_1.default.mkdirSync(path_1.default.dirname(lockPath), { recursive: true });
     const tryAcquire = () => {
@@ -246,10 +252,10 @@ const acquireUpdateLock = (lockPath) => {
     let isAcquired = tryAcquire();
     if (!isAcquired) {
         try {
-            const owner = Number.parseInt(fs_1.default.readFileSync(lockPath, 'utf8'), 10);
-            if (!Number.isNaN(owner) && isProcessRunning(owner))
+            const owners = readLockOwners(lockPath);
+            if (owners.some(isProcessRunning))
                 return null;
-            if (Number.isNaN(owner)) {
+            if (owners.length === 0) {
                 const lockAge = Date.now() - fs_1.default.statSync(lockPath).mtimeMs;
                 if (lockAge < LOCK_INITIALIZATION_GRACE_MS)
                     return null;
@@ -263,21 +269,24 @@ const acquireUpdateLock = (lockPath) => {
     }
     if (!isAcquired)
         return null;
-    return () => fs_1.default.rmSync(lockPath, { force: true });
+    return {
+        addOwner: (processId) => fs_1.default.appendFileSync(lockPath, `\n${processId}`, 'utf8'),
+        release: () => fs_1.default.rmSync(lockPath, { force: true }),
+    };
 };
 const waitForUpdateLock = async (lockPath, timeoutMs) => {
     const deadline = Date.now() + timeoutMs;
-    let releaseLock = acquireUpdateLock(lockPath);
-    while (releaseLock === null) {
+    let lock = acquireUpdateLock(lockPath);
+    while (lock === null) {
         const remainingMs = deadline - Date.now();
         if (remainingMs <= 0)
             return null;
         await new Promise((resolve) => {
             setTimeout(resolve, Math.min(LOCK_POLL_INTERVAL_MS, remainingMs));
         });
-        releaseLock = acquireUpdateLock(lockPath);
+        lock = acquireUpdateLock(lockPath);
     }
-    return releaseLock;
+    return lock;
 };
 const shouldUseCachedState = (options) => {
     if (options.isForced || !options.state)
@@ -306,7 +315,7 @@ const checkAndInstallCliUpdate = async (options) => {
     const isKnownGlobalPackage = state !== null &&
         normalizedPath(state.packageRoot) === normalizedPath(options.packageRoot);
     if (!isKnownGlobalPackage) {
-        const globalPackage = resolveGlobalPackageRoot(env);
+        const globalPackage = await resolveGlobalPackageRoot(env);
         if (!globalPackage.packageRoot) {
             return failedResult({
                 currentVersion: options.currentVersion,
@@ -375,8 +384,8 @@ const checkAndInstallCliUpdate = async (options) => {
         return { action: 'continue', checkedVersion: latest.version };
     }
     const lockPath = `${statePath}.lock`;
-    const releaseLock = await waitForUpdateLock(lockPath, options.lockWaitTimeoutMs ?? LOCK_WAIT_TIMEOUT_MS);
-    if (releaseLock === null) {
+    const lock = await waitForUpdateLock(lockPath, options.lockWaitTimeoutMs ?? LOCK_WAIT_TIMEOUT_MS);
+    if (lock === null) {
         return activeUpdateResult({
             currentVersion: options.currentVersion,
             durationMs: now() - startedAt,
@@ -403,12 +412,13 @@ const checkAndInstallCliUpdate = async (options) => {
             };
         }
         const packageSpec = env.RIVET_AUTO_UPDATE_PACKAGE_SPEC ?? RIVET_LATEST_PACKAGE_SPEC;
-        const install = (0, packageManagerProcess_1.spawnProcessSync)({
-            packageManager: 'npm',
+        const install = await (0, npmCommand_1.runNpm)({
             args: ['install', '-g', packageSpec, '--no-audit', '--no-fund'],
-        }, {
             env: (0, subprocessEnvironment_1.subprocessEnvironment)('packageManager', env),
-            timeout: NPM_INSTALL_TIMEOUT_MS,
+            onStarted: lock.addOwner,
+            timeoutMs: OperatingSystemServices_1.selectedOperatingSystemServices.operatingSystemFamily === 'windows'
+                ? undefined
+                : (options.installTimeoutMs ?? NPM_INSTALL_TIMEOUT_MS),
         });
         if (install.error || install.status !== 0) {
             const failure = failedResult({
@@ -457,7 +467,7 @@ const checkAndInstallCliUpdate = async (options) => {
         };
     }
     finally {
-        releaseLock();
+        lock.release();
     }
 };
 exports.checkAndInstallCliUpdate = checkAndInstallCliUpdate;

package/dist/install/channelCli.d.ts

@@ -1,2 +1,2 @@
-export declare const runChannelCli: (args: string[]) => number;
+export declare const runChannelCli: (args: string[]) => Promise<number>;
 //# sourceMappingURL=channelCli.d.ts.map