@sentry/junior 0.53.0 → 0.55.0

package/dist/{chunk-XPXD3FCE.js → chunk-5LUISFEY.js}

@@ -1,6 +1,3 @@
-// src/chat/plugins/package-discovery.ts
-import path2 from "path";
-
 // src/chat/discovery.ts
 import fs, { statSync } from "fs";
 import path from "path";
@@ -220,9 +217,146 @@ function listReferenceFiles() {
   }
 }
 
+// src/package-resolution.ts
+import { statSync as statSync2 } from "fs";
+import { createRequire } from "module";
+import path2 from "path";
+function isDirectory2(targetPath) {
+  try {
+    return statSync2(targetPath).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function isFile2(targetPath) {
+  try {
+    return statSync2(targetPath).isFile();
+  } catch {
+    return false;
+  }
+}
+function uniqueResolvedPathsInOrder2(values) {
+  const seen = /* @__PURE__ */ new Set();
+  const resolved = [];
+  for (const value of values) {
+    const normalized = path2.resolve(value);
+    if (seen.has(normalized)) {
+      continue;
+    }
+    seen.add(normalized);
+    resolved.push(normalized);
+  }
+  return resolved;
+}
+function ancestorNodeModulesDirs(cwd) {
+  const dirs = [];
+  let current = path2.resolve(cwd);
+  while (true) {
+    const nodeModulesDir = path2.join(current, "node_modules");
+    if (isDirectory2(nodeModulesDir)) {
+      dirs.push(nodeModulesDir);
+    }
+    const parent = path2.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return dirs;
+}
+function packageDirInNodeModules(nodeModulesDir, packageName) {
+  const packageDir = path2.join(nodeModulesDir, ...packageName.split("/"));
+  return isDirectory2(packageDir) ? path2.resolve(packageDir) : void 0;
+}
+function isValidPackageSegment(segment) {
+  return Boolean(segment) && segment !== "." && segment !== ".." && !segment.startsWith(".") && /^[A-Za-z0-9._~-]+$/.test(segment);
+}
+function isValidPackageName(packageName) {
+  if (!packageName || packageName.includes("\\") || path2.isAbsolute(packageName)) {
+    return false;
+  }
+  const parts = packageName.split("/");
+  if (parts[0].startsWith("@")) {
+    return parts.length === 2 && parts[0].length > 1 && isValidPackageSegment(parts[0].slice(1)) && isValidPackageSegment(parts[1]);
+  }
+  return parts.length === 1 && isValidPackageSegment(parts[0]);
+}
+function findPackageRoot(entryPath) {
+  let dir = path2.dirname(entryPath);
+  while (dir !== path2.dirname(dir)) {
+    if (isFile2(path2.join(dir, "package.json"))) {
+      return path2.resolve(dir);
+    }
+    dir = path2.dirname(dir);
+  }
+  return void 0;
+}
+function findPackageNodeModulesDir(packageDir, packageName) {
+  const parts = path2.resolve(packageDir).split(path2.sep);
+  const packageParts = packageName.split("/");
+  for (let index = parts.length - 1; index >= 0; index -= 1) {
+    if (parts[index] !== "node_modules") {
+      continue;
+    }
+    const candidatePackageParts = parts.slice(
+      index + 1,
+      index + 1 + packageParts.length
+    );
+    if (candidatePackageParts.join("/") !== packageParts.join("/")) {
+      continue;
+    }
+    return path2.resolve(parts.slice(0, index + 1).join(path2.sep) || path2.sep);
+  }
+  return void 0;
+}
+function resolvePackageWithNode(cwd, packageName) {
+  let requireFromCwd;
+  try {
+    requireFromCwd = createRequire(path2.join(cwd, "package.json"));
+  } catch {
+    return void 0;
+  }
+  for (const specifier of [`${packageName}/package.json`, packageName]) {
+    try {
+      const resolved = requireFromCwd.resolve(specifier);
+      const dir = specifier.endsWith("/package.json") ? path2.dirname(resolved) : findPackageRoot(resolved);
+      if (!dir) {
+        continue;
+      }
+      const nodeModulesDir = findPackageNodeModulesDir(dir, packageName);
+      return {
+        dir,
+        ...nodeModulesDir ? { nodeModulesDir } : {}
+      };
+    } catch {
+    }
+  }
+  return void 0;
+}
+function resolvePackageLocation(cwd, packageName, options) {
+  if (!isValidPackageName(packageName)) {
+    return void 0;
+  }
+  const nodeModulesDirs = uniqueResolvedPathsInOrder2([
+    ...options?.nodeModulesDirs ?? [],
+    ...ancestorNodeModulesDirs(cwd)
+  ]);
+  for (const nodeModulesDir of nodeModulesDirs) {
+    const dir = packageDirInNodeModules(nodeModulesDir, packageName);
+    if (dir) {
+      return { dir, nodeModulesDir };
+    }
+  }
+  return resolvePackageWithNode(cwd, packageName);
+}
+function resolvePackageDir(cwd, packageName) {
+  return resolvePackageLocation(cwd, packageName)?.dir;
+}
+
 // src/chat/plugins/package-discovery.ts
+import path3 from "path";
 function normalizeForGlob(targetPath) {
-  return targetPath.split(path2.sep).join("/");
+  return targetPath.split(path3.sep).join("/");
 }
 function uniqueStringsInOrder(values) {
   const seen = /* @__PURE__ */ new Set();
@@ -237,33 +371,47 @@ function uniqueStringsInOrder(values) {
   return resolved;
 }
 function pathForTracingInclude(cwd, targetPath) {
-  const relative = path2.relative(cwd, targetPath);
-  if (!relative || path2.isAbsolute(relative)) {
+  const relative = path3.relative(cwd, targetPath);
+  if (!relative || path3.isAbsolute(relative) || relative === ".." || relative.startsWith(`..${path3.sep}`)) {
     return null;
   }
   const normalized = normalizeForGlob(relative);
   return normalized.startsWith(".") ? normalized : `./${normalized}`;
 }
-var configuredPluginPackages;
-function setPluginPackages(packages) {
-  configuredPluginPackages = packages;
-}
-function resolvePackageDirFromName(packageName, candidateNodeModulesDirs) {
-  for (const nodeModulesDir of candidateNodeModulesDirs) {
-    const packageDir = path2.join(nodeModulesDir, ...packageName.split("/"));
-    if (isDirectory(packageDir)) {
-      return {
-        dir: path2.resolve(packageDir),
-        nodeModulesDir: path2.resolve(nodeModulesDir)
-      };
+function normalizePluginPackageNames(packageNames) {
+  if (packageNames === void 0) {
+    return [];
+  }
+  if (!Array.isArray(packageNames)) {
+    throw new Error("plugins.packages must be an array of package names");
+  }
+  const normalized = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const packageName of packageNames) {
+    const normalizedPackageName = typeof packageName === "string" ? packageName.trim() : "";
+    if (!normalizedPackageName || !isValidPackageName(normalizedPackageName)) {
+      throw new Error("Plugin package names must be valid npm package names");
+    }
+    if (seen.has(normalizedPackageName)) {
+      continue;
     }
+    seen.add(normalizedPackageName);
+    normalized.push(normalizedPackageName);
   }
-  return null;
+  return normalized;
+}
+function formatNodeModulesDirs(candidateNodeModulesDirs) {
+  return candidateNodeModulesDirs.length > 0 ? candidateNodeModulesDirs.join(", ") : "none found";
+}
+function resolvePackageDirFromName(cwd, packageName, candidateNodeModulesDirs) {
+  return resolvePackageLocation(cwd, packageName, {
+    nodeModulesDirs: candidateNodeModulesDirs
+  }) ?? null;
 }
 function readPluginPackageFlags(dir) {
-  const hasRootPluginManifest = isFile(path2.join(dir, "plugin.yaml"));
-  const hasPluginsDir = isDirectory(path2.join(dir, "plugins"));
-  const hasSkillsDir = isDirectory(path2.join(dir, "skills"));
+  const hasRootPluginManifest = isFile(path3.join(dir, "plugin.yaml"));
+  const hasPluginsDir = isDirectory(path3.join(dir, "plugins"));
+  const hasSkillsDir = isDirectory(path3.join(dir, "skills"));
   if (!hasRootPluginManifest && !hasPluginsDir && !hasSkillsDir) {
     return null;
   }
@@ -273,26 +421,29 @@ function readPluginPackageFlags(dir) {
     hasSkillsDir
   };
 }
-function discoverDeclaredPackages(packageNames, candidateNodeModulesDirs) {
+function discoverDeclaredPackages(packageNames, candidateNodeModulesDirs, cwd) {
   const discovered = [];
-  const seenPackageNames = /* @__PURE__ */ new Set();
   const seenPackageDirs = /* @__PURE__ */ new Set();
   for (const packageName of packageNames) {
     const resolved = resolvePackageDirFromName(
+      cwd,
       packageName,
       candidateNodeModulesDirs
     );
     if (!resolved) {
-      continue;
+      throw new Error(
+        `Plugin package "${packageName}" was configured but could not be resolved from node_modules or package resolution (${formatNodeModulesDirs(candidateNodeModulesDirs)})`
+      );
     }
-    if (seenPackageNames.has(packageName) || seenPackageDirs.has(resolved.dir)) {
+    if (seenPackageDirs.has(resolved.dir)) {
       continue;
     }
     const pluginFlags = readPluginPackageFlags(resolved.dir);
     if (!pluginFlags) {
-      continue;
+      throw new Error(
+        `Plugin package "${packageName}" was configured but does not contain plugin content; expected plugin.yaml, plugins/, or skills/ in ${resolved.dir}`
+      );
     }
-    seenPackageNames.add(packageName);
     seenPackageDirs.add(resolved.dir);
     discovered.push({
       name: packageName,
@@ -304,12 +455,13 @@ function discoverDeclaredPackages(packageNames, candidateNodeModulesDirs) {
   return discovered;
 }
 function discoverInstalledPluginPackageContent(cwd = process.cwd(), options) {
-  const resolvedCwd = path2.resolve(cwd);
-  const packageNames = options?.packageNames ?? configuredPluginPackages ?? [];
+  const resolvedCwd = path3.resolve(cwd);
+  const packageNames = normalizePluginPackageNames(options?.packageNames);
   const nodeModulesDirs = options?.nodeModulesDirs ?? discoverNodeModulesDirs(resolvedCwd);
   const discoveredPackages = discoverDeclaredPackages(
     packageNames,
-    nodeModulesDirs
+    nodeModulesDirs,
+    resolvedCwd
   );
   const manifestRoots = [];
   const skillRoots2 = [];
@@ -317,7 +469,7 @@ function discoverInstalledPluginPackageContent(cwd = process.cwd(), options) {
   for (const pkg of discoveredPackages) {
     const tracingBasePath = pkg.nodeModulesDir ? pathForTracingInclude(
       resolvedCwd,
-      path2.join(pkg.nodeModulesDir, ...pkg.name.split("/"))
+      path3.join(pkg.nodeModulesDir, ...pkg.name.split("/"))
     ) : pathForTracingInclude(resolvedCwd, pkg.dir);
     if (pkg.hasRootPluginManifest) {
       manifestRoots.push(pkg.dir);
@@ -326,13 +478,13 @@ function discoverInstalledPluginPackageContent(cwd = process.cwd(), options) {
       }
     }
     if (pkg.hasPluginsDir) {
-      manifestRoots.push(path2.join(pkg.dir, "plugins"));
+      manifestRoots.push(path3.join(pkg.dir, "plugins"));
       if (tracingBasePath) {
         tracingIncludes.push(`${tracingBasePath}/plugins/**/*`);
       }
     }
     if (pkg.hasSkillsDir) {
-      skillRoots2.push(path2.join(pkg.dir, "skills"));
+      skillRoots2.push(path3.join(pkg.dir, "skills"));
       if (tracingBasePath) {
         tracingIncludes.push(`${tracingBasePath}/skills/**/*`);
       }
@@ -355,6 +507,8 @@ export {
   soulPathCandidates,
   worldPathCandidates,
   listReferenceFiles,
-  setPluginPackages,
+  isValidPackageName,
+  resolvePackageDir,
+  normalizePluginPackageNames,
   discoverInstalledPluginPackageContent
 };

package/dist/{chunk-ZNFNY53B.js → chunk-D3G3YOU4.js}

@@ -2,10 +2,10 @@ import {
   getPluginForSkillPath,
   getPluginSkillRoots,
   logWarn
-} from "./chunk-Q3FDONU7.js";
+} from "./chunk-TTUY467K.js";
 import {
   skillRoots
-} from "./chunk-XPXD3FCE.js";
+} from "./chunk-5LUISFEY.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";

package/dist/chunk-SCQPBJAU.js

@@ -0,0 +1,21 @@
+// src/vercel.ts
+function juniorVercelConfig(options = {}) {
+  const buildCommand = options.buildCommand === void 0 ? "pnpm build" : options.buildCommand;
+  const config = {
+    framework: "nitro",
+    crons: [
+      {
+        path: "/api/internal/heartbeat",
+        schedule: "* * * * *"
+      }
+    ]
+  };
+  if (buildCommand !== null) {
+    config.buildCommand = buildCommand;
+  }
+  return config;
+}
+
+export {
+  juniorVercelConfig
+};

package/dist/{chunk-Q3FDONU7.js → chunk-TTUY467K.js}

@@ -3,8 +3,9 @@ import {
 } from "./chunk-Z3YD6NHK.js";
 import {
   discoverInstalledPluginPackageContent,
+  normalizePluginPackageNames,
   pluginRoots
-} from "./chunk-XPXD3FCE.js";
+} from "./chunk-5LUISFEY.js";
 
 // src/chat/logging.ts
 import { AsyncLocalStorage } from "async_hooks";
@@ -296,6 +297,8 @@ function contextToAttributes(context) {
     "enduser.id": context.slackUserId,
     "enduser.pseudo.id": context.slackUserName,
     "app.run.id": context.runId,
+    "app.actor.type": context.actorType,
+    "app.actor.id": context.actorId,
     "gen_ai.agent.name": context.assistantUserName,
     "gen_ai.request.model": context.modelId,
     "app.skill.name": context.skillName,
@@ -591,6 +594,10 @@ function pushPrettyConsoleToken(tokens, token) {
 function numericConsoleToken(label, value) {
   return typeof value === "number" ? `${label}=${value}` : void 0;
 }
+function stringConsoleToken(label, value) {
+  const normalized = toOptionalString(value);
+  return normalized ? `${label}=${normalized}` : void 0;
+}
 function booleanConsoleToken(label, value) {
   return typeof value === "boolean" ? `${label}=${value ? "yes" : "no"}` : void 0;
 }
@@ -605,7 +612,7 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
   );
   pushPrettyConsoleToken(
     tokens,
-    toOptionalString(attributes["app.plugin.name"]) ?? void 0
+    eventName.startsWith("trusted_plugin_heartbeat") ? stringConsoleToken("plugin", attributes["app.plugin.name"]) : toOptionalString(attributes["app.plugin.name"]) ?? void 0
   );
   pushPrettyConsoleToken(
     tokens,
@@ -623,6 +630,10 @@ function getPrettyConsoleSummaryTokens(level, eventName, attributes) {
     tokens,
     numericConsoleToken("plugins", attributes["app.plugin.count"])
   );
+  pushPrettyConsoleToken(
+    tokens,
+    numericConsoleToken("dispatches", attributes["app.dispatch.count"])
+  );
   pushPrettyConsoleToken(
     tokens,
     numericConsoleToken("skills", attributes["app.skill.count"])
@@ -2472,10 +2483,7 @@ function createGitHubAppBroker(manifest, credentials) {
     const normalizedApiDomain = apiDomain.toLowerCase();
     return normalizedDomain === "github.com" || normalizedApiDomain.startsWith("api.") && normalizedDomain === normalizedApiDomain.slice("api.".length);
   }
-  const permissions = capabilitiesToPermissions(
-    manifest.capabilities,
-    provider
-  );
+  const permissions = manifest.capabilities?.length ? capabilitiesToPermissions(manifest.capabilities, provider) : void 0;
   function createLease(params) {
     return {
       id: randomUUID2(),
@@ -2515,9 +2523,7 @@ function createGitHubAppBroker(manifest, credentials) {
   return {
     async issue(input) {
       const installationId = resolveInstallationId();
-      const tokenRequestBody = {
-        permissions
-      };
+      const tokenRequestBody = permissions ? { permissions } : {};
       const appId = resolveAppId(appIdEnv);
       const appJwt = createAppJwt(appId, privateKeyEnv);
       const accessTokenResponse = await githubRequest(apiBase, `/app/installations/${installationId}/access_tokens`, {
@@ -2881,33 +2887,9 @@ function normalizePluginRoots(roots) {
   }
   return resolved;
 }
-function getExtraPluginRoots() {
-  const raw = process.env.JUNIOR_EXTRA_PLUGIN_ROOTS?.trim();
-  if (!raw) {
-    return [];
-  }
-  if (raw.startsWith("[")) {
-    try {
-      const parsed = JSON.parse(raw);
-      if (Array.isArray(parsed)) {
-        return normalizePluginRoots(
-          parsed.filter((value) => typeof value === "string")
-        );
-      }
-    } catch {
-      return [];
-    }
-  }
-  return normalizePluginRoots(
-    raw.split(path2.delimiter).map((entry) => entry.trim()).filter((entry) => entry.length > 0)
-  );
-}
 function getPluginCatalogSource() {
-  const packagedContent = discoverInstalledPluginPackageContent();
-  const localRoots = normalizePluginRoots([
-    ...pluginRoots(),
-    ...getExtraPluginRoots()
-  ]);
+  const packagedContent = discoverConfiguredPluginPackageContent();
+  const localRoots = normalizePluginRoots(pluginRoots());
   const manifestRoots = normalizePluginRoots([
     ...localRoots,
     ...packagedContent.manifestRoots
@@ -2924,6 +2906,29 @@ function getPluginCatalogSource() {
     })
   };
 }
+function normalizePluginConfig(config) {
+  if (!config) {
+    return void 0;
+  }
+  return {
+    packages: normalizePluginPackageNames(config.packages),
+    ...config.manifests ? { manifests: structuredClone(config.manifests) } : {}
+  };
+}
+function clonePluginConfig(config) {
+  if (!config) {
+    return void 0;
+  }
+  return {
+    packages: [...config.packages ?? []],
+    ...config.manifests ? { manifests: structuredClone(config.manifests) } : {}
+  };
+}
+function discoverConfiguredPluginPackageContent() {
+  return discoverInstalledPluginPackageContent(process.cwd(), {
+    packageNames: pluginConfig?.packages
+  });
+}
 function buildLoadedPluginState(source) {
   const state = createLoadedPluginState(source.signature);
   for (const skillRoot of source.packagedSkillRoots) {
@@ -3037,7 +3042,12 @@ function ensurePluginsLoaded() {
   return state;
 }
 function setPluginConfig(config) {
-  pluginConfig = config;
+  const previousConfig = clonePluginConfig(pluginConfig);
+  pluginConfig = normalizePluginConfig(config);
+  return previousConfig;
+}
+function getPluginPackageContent() {
+  return discoverConfiguredPluginPackageContent();
 }
 function getPluginCatalogSignature() {
   return ensurePluginsLoaded().signature;
@@ -3199,7 +3209,6 @@ export {
   serializeGenAiAttribute,
   extractGenAiUsageSummary,
   extractGenAiUsageAttributes,
-  mergeHeaderTransforms,
   resolvePluginCommandEnv,
   resolveAuthTokenPlaceholder,
   parsePluginManifest,
@@ -3208,6 +3217,7 @@ export {
   buildOAuthTokenRequest,
   parseOAuthTokenResponse,
   setPluginConfig,
+  getPluginPackageContent,
   getPluginCatalogSignature,
   getPluginCapabilityProviders,
   getPluginProviders,