@sentry/junior 0.165.0 → 0.166.0

package/dist/{chunk-BEHPIDVZ.js → chunk-Q2IPCX7J.js}

@@ -1,3 +1,7 @@
+import {
+  create,
+  isStale
+} from "./chunk-4DARCEZH.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   runNonInteractiveCommand,
@@ -5,18 +9,15 @@ import {
 } from "./chunk-BVREIWBD.js";
 import {
   getStateAdapter
-} from "./chunk-65B3PDY7.js";
+} from "./chunk-EKBVHDZO.js";
 import {
   toOptionalTrimmed
-} from "./chunk-FMOFCEAA.js";
-import {
-  pluginCatalogRuntime
-} from "./chunk-7S2JVUWS.js";
+} from "./chunk-AEKBVJMV.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-32CCG4WP.js";
+} from "./chunk-JUFZR2LD.js";
 
 // src/chat/sandbox/resources.ts
 var configuredResources;
@@ -50,266 +51,6 @@ function getSandboxResources() {
   return configuredResources ?? resourcesFromEnv();
 }
 
-// src/chat/sandbox/snapshot/profile.ts
-import { createHash } from "crypto";
-
-// src/chat/sandbox/docker.ts
-var DOCKER_DAEMON_JSON = `{
-  "storage-driver": "overlay2",
-  "live-restore": false
-}
-`;
-var DOCKER_ENSURE_SCRIPT = `#!/bin/sh
-set -eu
-
-if [ "$(id -u)" -ne 0 ]; then
-  exec sudo -n "$0" "$@"
-fi
-
-SOCK=/var/run/docker.sock
-PIDFILE=/var/run/docker.pid
-LOG=/var/log/junior-dockerd.log
-
-is_ready() {
-  [ -S "$SOCK" ] && /usr/bin/docker info >/dev/null 2>&1
-}
-
-if is_ready; then
-  chmod 666 "$SOCK" 2>/dev/null || true
-  exit 0
-fi
-
-mkdir -p /etc/docker /var/lib/docker /var/run /var/log
-if [ ! -f /etc/docker/daemon.json ]; then
-  cat > /etc/docker/daemon.json <<'EOF'
-{
-  "storage-driver": "overlay2",
-  "live-restore": false
-}
-EOF
-fi
-
-if [ -f "$PIDFILE" ]; then
-  oldpid="$(cat "$PIDFILE" 2>/dev/null || true)"
-  if [ -n "\${oldpid:-}" ] && ! kill -0 "$oldpid" 2>/dev/null; then
-    rm -f "$PIDFILE"
-  fi
-fi
-
-if [ ! -f "$PIDFILE" ] || ! kill -0 "$(cat "$PIDFILE" 2>/dev/null)" 2>/dev/null; then
-  # dockerd must outlive this helper; nohup + background is intentional.
-  nohup dockerd --host="unix://$SOCK" --pidfile="$PIDFILE" >"$LOG" 2>&1 &
-fi
-
-i=0
-while [ "$i" -lt 50 ]; do
-  if is_ready; then
-    chmod 666 "$SOCK" 2>/dev/null || true
-    exit 0
-  fi
-  i=$((i + 1))
-  sleep 0.1
-done
-
-echo "junior-ensure-docker: dockerd failed to become ready" >&2
-if [ -f "$LOG" ]; then
-  tail -n 50 "$LOG" >&2 || true
-fi
-exit 1
-`;
-var DOCKER_CLI_WRAPPER_SCRIPT = `#!/bin/sh
-set -eu
-if command -v junior-ensure-docker >/dev/null 2>&1; then
-  junior-ensure-docker
-fi
-exec /usr/bin/docker "$@"
-`;
-var DOCKER_COMPOSE_CLI_WRAPPER_SCRIPT = `#!/bin/sh
-set -eu
-if command -v junior-ensure-docker >/dev/null 2>&1; then
-  junior-ensure-docker
-fi
-exec /usr/local/libexec/junior-docker-compose "$@"
-`;
-async function ensureDockerDaemon(sandbox, signal) {
-  await runNonInteractiveCommand(sandbox, {
-    cmd: "sh",
-    args: [
-      "-c",
-      "command -v junior-ensure-docker >/dev/null 2>&1 && junior-ensure-docker || true"
-    ],
-    signal
-  });
-}
-
-// src/chat/sandbox/runtime-dependencies.ts
-var GLOBAL_RUNTIME_DEPENDENCIES = [
-  { type: "system", package: "docker" },
-  { type: "system", package: "spal-release" },
-  { type: "system", package: "ripgrep" }
-];
-function writeFileCommand(path, contents, mode = "0644") {
-  const payload = Buffer.from(contents, "utf8").toString("base64");
-  return [
-    `printf '%s' '${payload}' | base64 -d > ${path}`,
-    `chmod ${mode} ${path}`
-  ].join("\n");
-}
-function writeExecutableCommand(path, contents) {
-  return writeFileCommand(path, contents, "0755");
-}
-var GLOBAL_RUNTIME_POSTINSTALL = [
-  {
-    cmd: "sh",
-    args: [
-      "-c",
-      [
-        "set -eu",
-        'case "$(uname -m)" in',
-        '  x86_64) asset="x86_64"; sha256="7af95166a730b87e172d4fc9aefea8725d3c6c7327d59149267b452114ddb7d4" ;;',
-        '  aarch64) asset="aarch64"; sha256="49082844b87f03cdcd5f5bbef1ba8c9c897b7a2dfb80cea18d61ec8ca6117e0c" ;;',
-        '  *) echo "unsupported Docker Compose architecture: $(uname -m)" >&2; exit 1 ;;',
-        "esac",
-        'tmp="$(mktemp)"',
-        `trap 'rm -f "$tmp"' EXIT`,
-        'curl --fail --location --silent --show-error "https://github.com/docker/compose/releases/download/v2.39.4/docker-compose-linux-${asset}" --output "$tmp"',
-        'echo "${sha256}  ${tmp}" | sha256sum --check --status',
-        // Keep the real Compose binary off PATH; the wrapper below starts dockerd.
-        'install -D -m 0755 "$tmp" /usr/local/libexec/junior-docker-compose',
-        "mkdir -p /usr/local/lib/docker/cli-plugins /usr/local/libexec /etc/docker /usr/local/bin",
-        `mkdir -p ${SANDBOX_WORKSPACE_ROOT}/.junior/bin`,
-        writeFileCommand("/etc/docker/daemon.json", DOCKER_DAEMON_JSON),
-        writeExecutableCommand(
-          "/usr/local/bin/junior-ensure-docker",
-          DOCKER_ENSURE_SCRIPT
-        ),
-        // docker compose plugin delegates to the real Compose binary.
-        "ln -sfn /usr/local/libexec/junior-docker-compose /usr/local/lib/docker/cli-plugins/docker-compose",
-        // PATH wrappers auto-start dockerd for both CLI entrypoints.
-        writeExecutableCommand(
-          "/usr/local/bin/docker-compose",
-          DOCKER_COMPOSE_CLI_WRAPPER_SCRIPT
-        ),
-        writeExecutableCommand(
-          `${SANDBOX_WORKSPACE_ROOT}/.junior/bin/docker`,
-          DOCKER_CLI_WRAPPER_SCRIPT
-        ),
-        writeExecutableCommand(
-          `${SANDBOX_WORKSPACE_ROOT}/.junior/bin/docker-compose`,
-          DOCKER_COMPOSE_CLI_WRAPPER_SCRIPT
-        ),
-        // Prefer the wrapper over /usr/bin/docker for non-login shells too.
-        writeExecutableCommand(
-          "/usr/local/bin/docker",
-          DOCKER_CLI_WRAPPER_SCRIPT
-        )
-      ].join("\n")
-    ],
-    sudo: true
-  }
-];
-
-// src/chat/sandbox/snapshot/profile.ts
-var VERSION = 1;
-var DEFAULT_FLOATING_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1e3;
-function isExactNpmVersion(version) {
-  return /^\d+\.\d+\.\d+(?:[-+][a-z0-9.]+)?$/i.test(version.trim());
-}
-function isFloating(dep) {
-  return dep.type === "npm" && !isExactNpmVersion(dep.version);
-}
-function mergeDependencies(dependencies2) {
-  const seen = /* @__PURE__ */ new Set();
-  const npmVersions = /* @__PURE__ */ new Map();
-  const merged = [];
-  for (const dependency of dependencies2) {
-    const key = dependency.type === "npm" ? `${dependency.type}:${dependency.package}:${dependency.version}` : "package" in dependency ? `${dependency.type}:package:${dependency.package}` : `${dependency.type}:url:${dependency.url}:${dependency.sha256}`;
-    if (seen.has(key)) {
-      continue;
-    }
-    seen.add(key);
-    if (dependency.type === "npm") {
-      const version = npmVersions.get(dependency.package);
-      if (version !== void 0 && version !== dependency.version) {
-        throw new Error(
-          `Conflicting runtime dependency versions for ${dependency.package}: ${version} and ${dependency.version}`
-        );
-      }
-      npmVersions.set(dependency.package, dependency.version);
-    }
-    merged.push(dependency);
-  }
-  return merged;
-}
-function floatingMaxAgeMs() {
-  const raw = process.env.SANDBOX_SNAPSHOT_FLOATING_MAX_AGE_MS;
-  if (!raw?.trim()) {
-    return DEFAULT_FLOATING_MAX_AGE_MS;
-  }
-  const parsed = Number.parseInt(raw, 10);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : DEFAULT_FLOATING_MAX_AGE_MS;
-}
-function compareCodePoints(left, right) {
-  if (left < right) return -1;
-  if (left > right) return 1;
-  return 0;
-}
-function workspaceRecipe(workspace) {
-  const repos = [...workspace.repos].map(({ provider, repo }) => ({
-    provider,
-    repo
-  })).sort((left, right) => {
-    const provider = compareCodePoints(left.provider, right.provider);
-    if (provider !== 0) return provider;
-    return compareCodePoints(left.repo, right.repo);
-  });
-  return {
-    id: workspace.id,
-    repos,
-    setupScript: workspace.setupScript
-  };
-}
-function create(runtime, workspace) {
-  const dependencies2 = mergeDependencies([
-    ...GLOBAL_RUNTIME_DEPENDENCIES,
-    ...pluginCatalogRuntime.getRuntimeDependencies()
-  ]);
-  const pluginPostinstall = pluginCatalogRuntime.getRuntimePostinstall();
-  const postinstall2 = [...GLOBAL_RUNTIME_POSTINSTALL, ...pluginPostinstall];
-  if (dependencies2.length === 0 && postinstall2.length === 0 && !workspace) {
-    return null;
-  }
-  const rebuildEpoch = process.env.SANDBOX_SNAPSHOT_REBUILD_EPOCH?.trim() ?? "";
-  const floating = dependencies2.some((dependency) => isFloating(dependency)) || pluginPostinstall.length > 0 || Boolean(workspace);
-  const hash2 = createHash("sha256").update(
-    JSON.stringify({
-      version: VERSION,
-      runtime,
-      rebuildEpoch,
-      dependencies: dependencies2,
-      postinstall: postinstall2,
-      ...workspace ? { workspace: workspaceRecipe(workspace) } : {}
-    })
-  ).digest("hex");
-  return {
-    hash: hash2,
-    dependencyCount: dependencies2.length,
-    floating,
-    dependencies: dependencies2,
-    postinstall: postinstall2
-  };
-}
-function hash(runtime, workspace) {
-  return create(runtime, workspace)?.hash;
-}
-function isStale(profile, createdAtMs) {
-  if (!profile.floating) {
-    return false;
-  }
-  const maxAgeMs = floatingMaxAgeMs();
-  return maxAgeMs === 0 || Date.now() - createdAtMs > maxAgeMs;
-}
-
 // src/chat/sandbox/snapshot/resolve.ts
 import { Sandbox } from "@vercel/sandbox";
 import { z } from "zod";
@@ -882,7 +623,7 @@ async function stopSession(session) {
 }
 
 // src/chat/sandbox/snapshot/resolve.ts
-var SNAPSHOT_CACHE_PREFIX = "junior:sandbox_snapshot_profile";
+var SNAPSHOT_CACHE_PREFIX = "junior:sandbox_snapshot_profile:v2";
 var SNAPSHOT_LOCK_PREFIX = "junior:sandbox_snapshot_lock";
 var SNAPSHOT_CACHE_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
 var SNAPSHOT_BUILD_LOCK_BUFFER_MS = 30 * 1e3;
@@ -892,7 +633,8 @@ var cachedSnapshotSchema = z.object({
   snapshotId: z.string(),
   runtime: z.string(),
   createdAtMs: z.number(),
-  dependencyCount: z.number()
+  dependencyCount: z.number(),
+  buildDurationMs: z.number().int().nonnegative()
 }).strict();
 function profileCacheKey(profileHash) {
   return `${SNAPSHOT_CACHE_PREFIX}:${profileHash}`;
@@ -937,6 +679,7 @@ async function build(value, runtime, timeoutMs, signal, prepare) {
       "app.sandbox.snapshot.dependency_count": value.dependencyCount
     },
     async () => {
+      const startedAtMs = Date.now();
       const sandboxCredentials = getVercelSandboxCredentials();
       const resources = getSandboxResources();
       const sandbox = createSandboxSession(
@@ -952,7 +695,7 @@ async function build(value, runtime, timeoutMs, signal, prepare) {
         await dependencies(sandbox, value.dependencies, signal);
         await postinstall(sandbox, value.postinstall, signal);
         await prepare?.(sandbox);
-        return await trace(
+        const snapshotId = await trace(
           "sandbox.snapshot.capture",
           "sandbox.snapshot.capture",
           {
@@ -963,6 +706,10 @@ async function build(value, runtime, timeoutMs, signal, prepare) {
             return snapshot.snapshotId;
           }
         );
+        return {
+          snapshotId,
+          buildDurationMs: Math.max(0, Date.now() - startedAtMs)
+        };
       } finally {
         try {
           await sandbox.stop();
@@ -1002,7 +749,9 @@ async function withBuildLock(profileHash, timeoutMs, callback, canUseCachedSnaps
         if (cached2?.snapshotId && canUseCachedSnapshot(cached2)) {
           return {
             snapshotId: cached2.snapshotId,
-            source: "cache_hit_after_lock_wait"
+            source: "cache_hit_after_lock_wait",
+            createdAtMs: cached2.createdAtMs,
+            buildDurationMs: cached2.buildDurationMs
           };
         }
         lock = await tryAcquireLock();
@@ -1011,7 +760,9 @@ async function withBuildLock(profileHash, timeoutMs, callback, canUseCachedSnaps
             const result = await callback();
             return {
               snapshotId: result.snapshotId,
-              source: result.source === "built" ? "built" : "cache_hit_after_lock_wait"
+              source: result.source === "built" ? "built" : "cache_hit_after_lock_wait",
+              createdAtMs: result.createdAtMs,
+              buildDurationMs: result.buildDurationMs
             };
           } finally {
             await state.releaseLock(lock);
@@ -1024,7 +775,9 @@ async function withBuildLock(profileHash, timeoutMs, callback, canUseCachedSnaps
       if (cached?.snapshotId && canUseCachedSnapshot(cached)) {
         return {
           snapshotId: cached.snapshotId,
-          source: "cache_hit_after_lock_wait"
+          source: "cache_hit_after_lock_wait",
+          createdAtMs: cached.createdAtMs,
+          buildDurationMs: cached.buildDurationMs
         };
       }
       throw new Error("Timed out waiting for snapshot build lock");
@@ -1079,7 +832,9 @@ async function resolve(params) {
           profileHash: currentProfile.hash,
           dependencyCount: currentProfile.dependencyCount,
           cacheHit: true,
-          resolveOutcome: "cache_hit"
+          resolveOutcome: "cache_hit",
+          createdAtMs: cached.createdAtMs,
+          buildDurationMs: cached.buildDurationMs
         };
       }
       const rebuildReason = getRebuildReason({
@@ -1106,26 +861,35 @@ async function resolve(params) {
             await params.onProgress?.("cache_hit");
             return {
               snapshotId: latest.snapshotId,
-              source: "cache_hit"
+              source: "cache_hit",
+              createdAtMs: latest.createdAtMs,
+              buildDurationMs: latest.buildDurationMs
             };
           }
           await params.onProgress?.("building_snapshot");
-          const nextSnapshotId = await build(
+          const built = await build(
             currentProfile,
             params.runtime,
             params.timeoutMs,
             params.signal,
             params.prepareWorkspace
           );
+          const createdAtMs = Date.now();
           await setCachedSnapshot({
             profileHash: currentProfile.hash,
-            snapshotId: nextSnapshotId,
+            snapshotId: built.snapshotId,
             runtime: params.runtime,
-            createdAtMs: Date.now(),
-            dependencyCount: currentProfile.dependencyCount
+            createdAtMs,
+            dependencyCount: currentProfile.dependencyCount,
+            buildDurationMs: built.buildDurationMs
           });
           await params.onProgress?.("build_complete");
-          return { snapshotId: nextSnapshotId, source: "built" };
+          return {
+            snapshotId: built.snapshotId,
+            source: "built",
+            createdAtMs,
+            buildDurationMs: built.buildDurationMs
+          };
         },
         canUseCachedSnapshot,
         async () => {
@@ -1142,6 +906,8 @@ async function resolve(params) {
           Boolean(params.forceRebuild),
           lockResult.source
         ),
+        createdAtMs: lockResult.createdAtMs,
+        buildDurationMs: lockResult.buildDurationMs,
         ...rebuildReason ? { rebuildReason } : {}
       };
     }
@@ -1161,16 +927,12 @@ export {
   wrapSandboxSetupError,
   throwSandboxOperationError,
   getVercelSandboxCredentials,
-  ensureDockerDaemon,
   getSandboxResourceConfig,
   setSandboxResourceConfig,
   getSandboxResources,
-  create,
-  hash,
   bindSandboxFileSystem,
   createSandboxSession,
   stopSession,
-  getCachedSnapshot,
   resolve,
   isMissingError
 };