@vm0/cli 9.145.4 → 9.145.6

package/{chunk-2CIMPE42.js → chunk-2LVWQ6RG.js}

@@ -74083,7 +74083,7 @@ if (DSN) {
   init2({
     dsn: DSN,
     environment: process.env.SENTRY_ENVIRONMENT ?? "production",
-    release: "9.145.4",
+    release: "9.145.6",
     sendDefaultPii: false,
     tracesSampleRate: 0,
     shutdownTimeout: 500,
@@ -74102,7 +74102,7 @@ if (DSN) {
     }
   });
   setContext("cli", {
-    version: "9.145.4",
+    version: "9.145.6",
     command: process.argv.slice(2).join(" ")
   });
   setContext("runtime", {
@@ -100940,6 +100940,10 @@ var orgDefaultAgentContract = c8.router({
 
 // ../../packages/api-contracts/src/contracts/runs.ts
 var c9 = initContract();
+var MAX_EVENT_SEQUENCE_NUMBER = 2147483647;
+var eventSequenceNumberSchema = external_exports.number().int().nonnegative().max(MAX_EVENT_SEQUENCE_NUMBER);
+var eventSequenceCursorSchema = external_exports.number().int().min(-1).max(MAX_EVENT_SEQUENCE_NUMBER);
+var eventSequenceCursorQuerySchema = external_exports.coerce.number().int().min(-1).max(MAX_EVENT_SEQUENCE_NUMBER);
 var ALL_RUN_STATUSES = [
   "queued",
   "pending",
@@ -101030,7 +101034,7 @@ var getRunResponseSchema = external_exports.object({
   completedAt: external_exports.string().optional()
 });
 var runEventSchema = external_exports.object({
-  sequenceNumber: external_exports.number(),
+  sequenceNumber: eventSequenceNumberSchema,
   eventType: external_exports.string(),
   eventData: external_exports.unknown(),
   createdAt: external_exports.string()
@@ -101046,12 +101050,13 @@ var runResultSchema = external_exports.object({
 var runStateSchema = external_exports.object({
   status: runStatusSchema,
   result: runResultSchema.optional(),
-  error: external_exports.string().optional()
+  error: external_exports.string().optional(),
+  lastEventSequence: eventSequenceNumberSchema.optional()
 });
 var eventsResponseSchema = external_exports.object({
   events: external_exports.array(runEventSchema),
   hasMore: external_exports.boolean(),
-  nextSequence: external_exports.number(),
+  nextSequence: eventSequenceCursorSchema,
   run: runStateSchema,
   framework: external_exports.string()
 });
@@ -101179,11 +101184,12 @@ var runEventsContract = c9.router({
       id: external_exports.uuid("Run ID must be a valid UUID")
     }),
     query: external_exports.object({
-      since: external_exports.coerce.number().default(-1),
-      limit: external_exports.coerce.number().default(100)
+      since: eventSequenceCursorQuerySchema.default(-1),
+      limit: external_exports.coerce.number().int().min(1).max(100).default(100)
     }),
     responses: {
       200: eventsResponseSchema,
+      400: apiErrorSchema,
       401: apiErrorSchema,
       404: apiErrorSchema
     },
@@ -101695,7 +101701,7 @@ var sandboxReuseResultSchema = external_exports.enum([
 ]);
 var agentEventSchema = external_exports.object({
   type: external_exports.string(),
-  sequenceNumber: external_exports.number().int().nonnegative()
+  sequenceNumber: eventSequenceNumberSchema
 }).passthrough();
 var artifactSnapshotsSchema = external_exports.array(
   external_exports.object({
@@ -101747,7 +101753,7 @@ var webhookCompleteContract = c11.router({
       runId: external_exports.string().min(1, "runId is required"),
       exitCode: external_exports.number(),
       error: external_exports.string().optional(),
-      lastEventSequence: external_exports.number().int().nonnegative().optional(),
+      lastEventSequence: eventSequenceNumberSchema.optional(),
       // Sandbox id the run executed against. Optional because a run that fails
       // before VM creation has no sandbox. Persisted to agent_runs.sandbox_id;
       // the 255-char cap matches the DB column (defense in depth).
@@ -103230,6 +103236,8 @@ var chatThreadDetailSchema = external_exports.object({
    * and org defaults) for the next run. Optional for back-compat.
    */
   modelProviderId: external_exports.string().nullable().optional(),
+  modelProviderType: modelProviderTypeSchema.nullable().optional(),
+  modelProviderCredentialScope: modelProviderCredentialScopeSchema.nullable().optional(),
   selectedModel: external_exports.string().nullable().optional(),
   /**
    * ISO timestamp at which the user manually renamed this thread. Null/undefined
@@ -119828,24 +119836,12 @@ var voiceChatTaskSchema = external_exports.object({
   startedAt: external_exports.string().nullable(),
   finishedAt: external_exports.string().nullable()
 });
-var legacyTokenResponseSchema = external_exports.object({
+var tokenResponseSchema = external_exports.object({
   client_secret: external_exports.object({
     value: external_exports.string(),
     expires_at: external_exports.number()
   })
 });
-var relayBootstrapResponseSchema = external_exports.object({
-  relayUrl: external_exports.url(),
-  relayToken: external_exports.string(),
-  expiresAt: external_exports.number(),
-  sessionId: external_exports.uuid(),
-  transport: external_exports.enum(["websocket"]),
-  minimumCreditsRequired: external_exports.number().int().nonnegative().optional()
-});
-var tokenResponseSchema = external_exports.union([
-  legacyTokenResponseSchema,
-  relayBootstrapResponseSchema
-]);
 var createSessionBodySchema = external_exports.object({ agentId: external_exports.uuid() });
 var appendItemBodySchema = external_exports.object({
   role: voiceChatItemRoleSchema,
@@ -119990,7 +119986,7 @@ var zeroVoiceChatContract = c54.router({
       500: apiErrorSchema,
       503: apiErrorSchema
     },
-    summary: "Mint a voice-chat token. Returns either the legacy OpenAI client_secret or, when VoiceChatRealtimeBilling is ON, a VM0 relay bootstrap (relayUrl + HMAC relayToken)."
+    summary: "Mint an ephemeral OpenAI realtime token for voice-chat"
   }
 });
 
@@ -120575,7 +120571,8 @@ var FEATURE_SWITCHES = {
   ["queueMessage" /* QueueMessage */]: {
     maintainer: "linghan@vm0.ai",
     description: "Allow keyboard sends during an active chat thread run to append the draft to that thread's pending message queue.",
-    enabled: false
+    enabled: false,
+    enabledOrgIdHashes: STAFF_ORG_ID_HASHES
   },
   ["chatThreadPin" /* ChatThreadPin */]: {
     maintainer: "ethan@vm0.ai",
@@ -120655,9 +120652,8 @@ var FEATURE_SWITCHES = {
   },
   ["modelFirstModelProvider" /* ModelFirstModelProvider */]: {
     maintainer: "lancy@vm0.ai",
-    description: "Gate the model-first model provider selection foundation. When off, all provider-first resolver, UI, CLI, and legacy model provider defaults remain unchanged. When on, follow-up work can use org model policies, canonical models, and member-scoped OAuth credentials.",
-    enabled: false,
-    enabledOrgIdHashes: STAFF_ORG_ID_HASHES
+    description: "Gate the model-first model provider selection foundation. When off, all provider-first resolver, UI, CLI, and legacy model provider defaults remain unchanged. When on, follow-up work can use org model policies, canonical models, and member-scoped OAuth credentials. Default-off for every org, including staff; per-user toggle via Lab.",
+    enabled: false
   },
   ["voiceChatRealtimeBilling" /* VoiceChatRealtimeBilling */]: {
     maintainer: "lancy@vm0.ai",
@@ -121725,57 +121721,164 @@ function renderRunCreated(response) {
     });
   }
 }
+var TERMINAL_RUN_STATUSES = [
+  "completed",
+  "failed",
+  "timeout",
+  "cancelled"
+];
+var POLL_INTERVAL_MS = 1e3;
+var TERMINAL_DRAIN_POLL_INTERVAL_MS = 500;
+var TERMINAL_DRAIN_IDLE_MS = 1e3;
+var TERMINAL_DRAIN_MAX_MS = 3e3;
+function isTerminalRunState(run) {
+  return TERMINAL_RUN_STATUSES.includes(run.status);
+}
+function shouldDrainNextEventPage(response, madeSequenceProgress) {
+  return response.hasMore && response.events.length > 0 && madeSequenceProgress;
+}
+function isBlockedBySequenceGap(response, madeSequenceProgress) {
+  return response.hasMore && !madeSequenceProgress;
+}
+function hasTerminalWatermark(run) {
+  return run.lastEventSequence !== void 0;
+}
+function hasReachedTerminalWatermark(run, nextSequence) {
+  return run.lastEventSequence !== void 0 && nextSequence >= run.lastEventSequence;
+}
+function shouldCompleteTerminalDrain(terminalSeenAt, lastTerminalProgressAt, blockedByGap) {
+  const now = Date.now();
+  const terminalElapsedMs = now - terminalSeenAt;
+  const terminalIdleMs = now - lastTerminalProgressAt;
+  return terminalElapsedMs >= TERMINAL_DRAIN_MAX_MS || !blockedByGap && terminalIdleMs >= TERMINAL_DRAIN_IDLE_MS;
+}
+function updateTerminalDrainState(state, run, madeSequenceProgress, now) {
+  if (isTerminalRunState(run)) {
+    if (!state.runState) {
+      state.seenAt = now;
+      state.lastProgressAt = now;
+    } else if (madeSequenceProgress) {
+      state.lastProgressAt = now;
+    }
+    state.runState = run;
+    return;
+  }
+  if (state.runState && madeSequenceProgress) {
+    state.lastProgressAt = now;
+  }
+}
+function isBlockedByTerminalWatermark(run, nextSequence) {
+  return hasTerminalWatermark(run) && !hasReachedTerminalWatermark(run, nextSequence);
+}
+function shouldReturnTerminalRunResult(state, response, nextSequence, madeSequenceProgress, seenResultEvent) {
+  const run = state.runState;
+  if (!run) {
+    return false;
+  }
+  if (!hasTerminalWatermark(run) && run.status !== "completed") {
+    if (run.status === "timeout" && shouldDrainNextEventPage(response, madeSequenceProgress)) {
+      return false;
+    }
+    return true;
+  }
+  if (!hasTerminalWatermark(run) && seenResultEvent) {
+    return true;
+  }
+  return shouldCompleteTerminalDrain(
+    state.seenAt,
+    state.lastProgressAt,
+    isBlockedBySequenceGap(response, madeSequenceProgress) || isBlockedByTerminalWatermark(run, nextSequence)
+  );
+}
+function renderTerminalRunResult(runId, run) {
+  if (run.status === "completed") {
+    EventRenderer.renderRunCompleted(run.result);
+    return {
+      succeeded: true,
+      runId,
+      sessionId: run.result?.agentSessionId,
+      checkpointId: run.result?.checkpointId
+    };
+  }
+  if (run.status === "failed") {
+    EventRenderer.renderRunFailed(run.error, runId);
+    return { succeeded: false, runId };
+  }
+  if (run.status === "timeout") {
+    console.error(source_default.red("\n\u2717 Run timed out"));
+    console.error(
+      source_default.dim(`  (use "vm0 logs ${runId} --system" to view system logs)`)
+    );
+    return { succeeded: false, runId };
+  }
+  console.error(source_default.yellow("\n\u2717 Run cancelled"));
+  return { succeeded: false, runId };
+}
+function sleep(ms) {
+  return new Promise((resolve2) => {
+    return setTimeout(resolve2, ms);
+  });
+}
 async function pollEvents(runId, options) {
   const renderer = new EventRenderer({ verbose: options?.verbose });
   let nextSequence = -1;
-  let complete = false;
-  let result = { succeeded: true, runId };
-  const pollIntervalMs = 1e3;
-  while (!complete) {
+  const terminalDrain = {
+    seenAt: 0,
+    lastProgressAt: 0
+  };
+  let seenResultEvent = false;
+  for (; ; ) {
+    const previousSequence = nextSequence;
     const response = await getEvents(runId, {
       since: nextSequence
     });
-    for (const event of response.events) {
-      const eventData = event.eventData;
-      const parsed = parseEvent(eventData, response.framework);
-      if (parsed) {
-        renderer.render(parsed);
-      }
-    }
-    nextSequence = response.nextSequence;
-    const runStatus = response.run.status;
-    if (runStatus === "completed") {
-      complete = true;
-      EventRenderer.renderRunCompleted(response.run.result);
-      result = {
-        succeeded: true,
-        runId,
-        sessionId: response.run.result?.agentSessionId,
-        checkpointId: response.run.result?.checkpointId
-      };
-    } else if (runStatus === "failed") {
-      complete = true;
-      EventRenderer.renderRunFailed(response.run.error, runId);
-      result = { succeeded: false, runId };
-    } else if (runStatus === "timeout") {
-      complete = true;
-      console.error(source_default.red("\n\u2717 Run timed out"));
-      console.error(
-        source_default.dim(`  (use "vm0 logs ${runId} --system" to view system logs)`)
-      );
-      result = { succeeded: false, runId };
-    } else if (runStatus === "cancelled") {
-      complete = true;
-      console.error(source_default.yellow("\n\u2717 Run cancelled"));
-      result = { succeeded: false, runId };
-    }
-    if (!complete) {
-      await new Promise((resolve2) => {
-        return setTimeout(resolve2, pollIntervalMs);
-      });
+    const now = Date.now();
+    const madeSequenceProgress = response.nextSequence > previousSequence;
+    let pageHasResultEvent = false;
+    if (madeSequenceProgress) {
+      for (const event of response.events) {
+        const eventData = event.eventData;
+        const parsed = parseEvent(eventData, response.framework);
+        if (parsed) {
+          renderer.render(parsed);
+          if (parsed.type === "result") {
+            pageHasResultEvent = true;
+          }
+        }
+      }
+    }
+    if (madeSequenceProgress) {
+      if (pageHasResultEvent) {
+        seenResultEvent = true;
+      }
+      nextSequence = response.nextSequence;
     }
+    updateTerminalDrainState(
+      terminalDrain,
+      response.run,
+      madeSequenceProgress,
+      now
+    );
+    if (terminalDrain.runState && hasReachedTerminalWatermark(terminalDrain.runState, nextSequence)) {
+      return renderTerminalRunResult(runId, terminalDrain.runState);
+    }
+    const terminalRunState = terminalDrain.runState;
+    if (terminalRunState && shouldReturnTerminalRunResult(
+      terminalDrain,
+      response,
+      nextSequence,
+      madeSequenceProgress,
+      seenResultEvent
+    )) {
+      return renderTerminalRunResult(runId, terminalRunState);
+    }
+    if (shouldDrainNextEventPage(response, madeSequenceProgress)) {
+      continue;
+    }
+    await sleep(
+      terminalDrain.runState ? TERMINAL_DRAIN_POLL_INTERVAL_MS : POLL_INTERVAL_MS
+    );
   }
-  return result;
 }
 function showNextSteps(result) {
   const { runId, sessionId, checkpointId } = result;
@@ -122044,4 +122147,4 @@ undici/lib/web/fetch/body.js:
 undici/lib/web/websocket/frame.js:
   (*! ws. MIT License. Einar Otto Stangvik <einaros@gmail.com> *)
 */
-//# sourceMappingURL=chunk-2CIMPE42.js.map
+//# sourceMappingURL=chunk-2LVWQ6RG.js.map