@sentry/junior 0.63.0 → 0.65.0

package/dist/{chunk-LRVKJAR2.js → chunk-K3JNVV4Q.js}

@@ -2,12 +2,12 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   toOptionalTrimmed
-} from "./chunk-PEF6UXTY.js";
+} from "./chunk-OMQ5X5QH.js";
 import {
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall,
   withSpan
-} from "./chunk-H652GMDH.js";
+} from "./chunk-EDHJIYHS.js";
 
 // src/chat/sandbox/runtime-dependency-snapshots.ts
 import { createHash } from "crypto";

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

@@ -383,7 +383,7 @@ function normalizePluginPackageNames(packageNames) {
     return [];
   }
   if (!Array.isArray(packageNames)) {
-    throw new Error("plugins.packages must be an array of package names");
+    throw new Error("Plugin package names must be an array");
   }
   const normalized = [];
   const seen = /* @__PURE__ */ new Set();
@@ -494,6 +494,11 @@ function discoverInstalledPluginPackageContent(cwd = process.cwd(), options) {
     packageNames: uniqueStringsInOrder(
       discoveredPackages.map((pkg) => pkg.name)
     ),
+    packages: discoveredPackages.map((pkg) => ({
+      dir: pkg.dir,
+      hasSkillsDir: pkg.hasSkillsDir,
+      name: pkg.name
+    })),
     manifestRoots: uniqueStringsInOrder(manifestRoots),
     skillRoots: uniqueStringsInOrder(skillRoots2),
     tracingIncludes: uniqueStringsInOrder(tracingIncludes)

package/dist/{chunk-PEF6UXTY.js → chunk-OMQ5X5QH.js}

@@ -6,7 +6,7 @@ import {
   setSpanAttributes,
   toOptionalString,
   withSpan
-} from "./chunk-H652GMDH.js";
+} from "./chunk-EDHJIYHS.js";
 
 // src/chat/slack/context.ts
 function toTrimmedSlackString(value) {

package/dist/{chunk-ITOW4DED.js → chunk-PYU2YB35.js}

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

package/dist/cli/check.js

@@ -1,11 +1,11 @@
 import {
   parseSkillFile
-} from "../chunk-ITOW4DED.js";
+} from "../chunk-PYU2YB35.js";
 import {
   parsePluginManifest
-} from "../chunk-H652GMDH.js";
+} from "../chunk-EDHJIYHS.js";
 import "../chunk-Z3YD6NHK.js";
-import "../chunk-5LUISFEY.js";
+import "../chunk-KVZL5NZS.js";
 import "../chunk-2KG3PWR4.js";
 
 // src/cli/check.ts
@@ -396,7 +396,12 @@ async function validateAppSourceFiles(rootDir, registeredConfigKeys) {
     }
     if (/\bpluginPackages\s*:/.test(source)) {
       errors.push(
-        `${sourcePath}: pluginPackages is no longer supported. Use plugins: { packages: [...] }.`
+        `${sourcePath}: pluginPackages is no longer supported. Export a defineJuniorPlugins(...) set and point juniorNitro({ plugins: "./plugins" }) at it.`
+      );
+    }
+    if (/\bplugins\s*:\s*\{\s*packages\s*:/.test(source)) {
+      errors.push(
+        `${sourcePath}: plugins.packages is no longer supported. Export a defineJuniorPlugins(...) set and point juniorNitro({ plugins: "./plugins" }) at it.`
       );
     }
     for (const defaultsBlock of source.matchAll(

package/dist/cli/snapshot-warmup.js

@@ -1,16 +1,16 @@
 import {
   resolveRuntimeDependencySnapshot
-} from "../chunk-LRVKJAR2.js";
+} from "../chunk-K3JNVV4Q.js";
 import {
   disconnectStateAdapter
-} from "../chunk-PEF6UXTY.js";
+} from "../chunk-OMQ5X5QH.js";
 import {
   getPluginProviders,
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall
-} from "../chunk-H652GMDH.js";
+} from "../chunk-EDHJIYHS.js";
 import "../chunk-Z3YD6NHK.js";
-import "../chunk-5LUISFEY.js";
+import "../chunk-KVZL5NZS.js";
 import "../chunk-2KG3PWR4.js";
 
 // src/cli/snapshot-warmup.ts

package/dist/nitro.d.ts

@@ -1,9 +1,16 @@
-import type { PluginConfig } from "@/chat/plugins/types";
+import { type JuniorPluginSet } from "@/plugins";
+export interface JuniorPluginModuleReference {
+    /** Runtime-safe module that exports a `defineJuniorPlugins(...)` set. */
+    module: string;
+    /** Named export to import from `module`. Defaults to `plugins`. */
+    exportName?: string;
+}
+export type JuniorNitroPluginSource = JuniorPluginModuleReference | JuniorPluginSet | string;
 export interface JuniorNitroOptions {
     cwd?: string;
     maxDuration?: number;
-    /** Plugin packages and manifest overrides bundled into the app. */
-    plugins?: PluginConfig;
+    /** Plugin catalog set or runtime-safe plugin module. Direct sets must not include trusted hooks. */
+    plugins?: JuniorNitroPluginSource;
     /**
      * Extra file patterns to copy into the server output for files that the
      * bundler cannot trace (e.g. dynamically imported providers).

package/dist/nitro.js

@@ -1,12 +1,19 @@
+import {
+  pluginCatalogConfigFromPluginSet,
+  trustedPluginRegistrationsFromPluginSet
+} from "./chunk-5VDO6LSG.js";
 import {
   discoverInstalledPluginPackageContent,
   isValidPackageName,
   resolvePackageDir
-} from "./chunk-5LUISFEY.js";
+} from "./chunk-KVZL5NZS.js";
 import "./chunk-2KG3PWR4.js";
 
 // src/nitro.ts
 import path2 from "path";
+import { statSync as statSync2 } from "fs";
+import { createRequire } from "module";
+import { pathToFileURL } from "url";
 
 // src/build/rolldown-workarounds.ts
 function applyRolldownTreeshakeWorkaround(nitro) {
@@ -166,11 +173,135 @@ function nodeModulesRelativePath(sourcePath) {
 }
 
 // src/build/virtual-config.ts
-function injectVirtualConfig(nitro, plugins) {
-  nitro.options.virtual["#junior/config"] = `export const plugins = ${JSON.stringify(plugins ?? { packages: [] })};`;
+function renderRuntimePluginImport(module) {
+  if (module.exportName === "default") {
+    return `import juniorRuntimePluginSet from ${JSON.stringify(module.specifier)};`;
+  }
+  return `import { ${module.exportName} as juniorRuntimePluginSet } from ${JSON.stringify(module.specifier)};`;
+}
+function renderVirtualConfig(options) {
+  const lines = [
+    ...options.pluginModule ? [
+      renderRuntimePluginImport(options.pluginModule),
+      "export const pluginSet = juniorRuntimePluginSet;"
+    ] : ["export const pluginSet = undefined;"],
+    `export const plugins = ${JSON.stringify(options.plugins ?? { packages: [] })};`,
+    `export const trustedPluginRegistrations = ${JSON.stringify(options.trustedPluginRegistrations ?? [])};`
+  ];
+  return lines.join("\n");
+}
+function injectVirtualConfig(nitro, options = {}) {
+  nitro.options.virtual["#junior/config"] = async () => {
+    if (!options.loadPluginSet) {
+      return renderVirtualConfig(options);
+    }
+    const pluginSet = await options.loadPluginSet();
+    return renderVirtualConfig({
+      pluginModule: options.pluginModule,
+      plugins: pluginCatalogConfigFromPluginSet(pluginSet),
+      trustedPluginRegistrations: trustedPluginRegistrationsFromPluginSet(
+        pluginSet
+      ).map((plugin) => plugin.name)
+    });
+  };
 }
 
 // src/nitro.ts
+var PLUGIN_MODULE_EXTENSIONS = [
+  "",
+  ".ts",
+  ".tsx",
+  ".mts",
+  ".mjs",
+  ".js",
+  ".cjs"
+];
+function isPluginModuleReference(value) {
+  return typeof value === "string" || Boolean(value && "module" in value);
+}
+function isPluginSet(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  return "packageNames" in value && "registrations" in value;
+}
+function resolveRelativePluginModule(cwd, specifier) {
+  const basePath = path2.resolve(cwd, specifier);
+  for (const extension of PLUGIN_MODULE_EXTENSIONS) {
+    const candidate = `${basePath}${extension}`;
+    try {
+      if (statSync2(candidate).isFile()) {
+        return candidate;
+      }
+    } catch {
+    }
+  }
+  for (const extension of PLUGIN_MODULE_EXTENSIONS) {
+    const candidate = path2.join(basePath, `index${extension}`);
+    try {
+      if (statSync2(candidate).isFile()) {
+        return candidate;
+      }
+    } catch {
+    }
+  }
+  throw new Error(`Plugin module "${specifier}" could not be resolved`);
+}
+function resolvePluginModule(cwd, input) {
+  const moduleSpecifier = typeof input === "string" ? input : input.module;
+  const exportName = typeof input === "string" ? "plugins" : input.exportName ?? "plugins";
+  if (!moduleSpecifier.trim()) {
+    throw new Error("Plugin module specifier must not be empty");
+  }
+  if (moduleSpecifier.startsWith(".") || path2.isAbsolute(moduleSpecifier)) {
+    const resolvedPath2 = resolveRelativePluginModule(cwd, moduleSpecifier);
+    return {
+      exportName,
+      importUrl: pathToFileURL(resolvedPath2).href,
+      runtimeModule: {
+        exportName,
+        specifier: resolvedPath2.split(path2.sep).join("/")
+      }
+    };
+  }
+  const requireFromApp = createRequire(path2.join(cwd, "package.json"));
+  const resolvedPath = requireFromApp.resolve(moduleSpecifier);
+  return {
+    exportName,
+    importUrl: pathToFileURL(resolvedPath).href,
+    runtimeModule: {
+      exportName,
+      specifier: moduleSpecifier
+    }
+  };
+}
+function assertPluginSet(value, source) {
+  if (!value || typeof value !== "object" || !Array.isArray(value.packageNames) || !Array.isArray(value.registrations)) {
+    throw new Error(
+      `Plugin module ${source} must export a defineJuniorPlugins(...) set`
+    );
+  }
+  return value;
+}
+async function loadPluginSetFromModule(moduleRef) {
+  const mod = await import(moduleRef.importUrl);
+  const value = moduleRef.exportName === "default" ? mod.default : mod[moduleRef.exportName];
+  return assertPluginSet(
+    value,
+    `${moduleRef.importUrl}#${moduleRef.exportName}`
+  );
+}
+function assertSerializableDirectPluginSet(pluginSet) {
+  const trustedPluginNames = trustedPluginRegistrationsFromPluginSet(
+    pluginSet
+  ).map((plugin) => plugin.name);
+  if (trustedPluginNames.length === 0) {
+    return;
+  }
+  throw new Error(
+    `juniorNitro({ plugins }) cannot receive a direct defineJuniorPlugins(...) set with trusted plugin registration(s): ${trustedPluginNames.join(", ")}. Export the set from a runtime-safe plugin module and pass juniorNitro({ plugins: "./plugins" }) so createApp() can import the same hooks at runtime.`
+  );
+}
 function juniorNitro(options = {}) {
   return {
     nitro: {
@@ -182,12 +313,36 @@ function juniorNitro(options = {}) {
         nitro.options.vercel.functions ??= {};
         nitro.options.vercel.functions.maxDuration ??= options.maxDuration ?? 800;
         applyRolldownTreeshakeWorkaround(nitro);
-        injectVirtualConfig(nitro, options.plugins);
-        nitro.hooks.hook("compiled", () => {
+        const pluginSource = options.plugins;
+        const pluginModule = isPluginModuleReference(pluginSource) ? resolvePluginModule(cwd, pluginSource) : void 0;
+        const directPluginSet = isPluginSet(pluginSource) ? pluginSource : void 0;
+        if (directPluginSet) {
+          assertSerializableDirectPluginSet(directPluginSet);
+        }
+        let pluginSetPromise;
+        const loadConfiguredPluginSet = () => {
+          pluginSetPromise ??= pluginModule ? loadPluginSetFromModule(pluginModule) : Promise.resolve(directPluginSet);
+          return pluginSetPromise;
+        };
+        const pluginCatalogConfig = pluginCatalogConfigFromPluginSet(directPluginSet);
+        const trustedPluginRegistrations = trustedPluginRegistrationsFromPluginSet(directPluginSet).map(
+          (plugin) => plugin.name
+        );
+        injectVirtualConfig(nitro, {
+          ...pluginModule ? {
+            loadPluginSet: loadConfiguredPluginSet,
+            pluginModule: pluginModule.runtimeModule
+          } : {},
+          plugins: pluginCatalogConfig,
+          trustedPluginRegistrations
+        });
+        nitro.hooks.hook("compiled", async () => {
+          const pluginSet = await loadConfiguredPluginSet();
+          const compiledPluginCatalogConfig = pluginCatalogConfigFromPluginSet(pluginSet);
           copyAppAndPluginContent(
             cwd,
             nitro.options.output.serverDir,
-            options.plugins?.packages
+            compiledPluginCatalogConfig?.packages
           );
           copyIncludedFiles(
             cwd,

package/dist/plugins.d.ts

@@ -0,0 +1,22 @@
+import type { JuniorPluginRegistration } from "@sentry/junior-plugin-api";
+import type { PluginCatalogConfig, PluginManifestConfig } from "@/chat/plugins/types";
+export type JuniorPluginInput = JuniorPluginRegistration | string;
+export interface JuniorPluginSetOptions {
+    /** Install-level manifest overrides applied before validation. */
+    manifests?: Record<string, PluginManifestConfig>;
+}
+/** Reusable plugin registrations and manifest overrides. */
+export interface JuniorPluginSet {
+    /** Install-level manifest overrides applied before validation. */
+    manifests?: Record<string, PluginManifestConfig>;
+    /** Manifest-only plugin packages included by package name. */
+    packageNames: string[];
+    /** JavaScript plugin definitions included by package factories. */
+    registrations: JuniorPluginRegistration[];
+}
+/** Define package-name plugins and JS plugin definitions for one app. */
+export declare function defineJuniorPlugins(inputs: JuniorPluginInput[], options?: JuniorPluginSetOptions): JuniorPluginSet;
+/** Build the manifest catalog config implied by one plugin set. */
+export declare function pluginCatalogConfigFromPluginSet(pluginSet: JuniorPluginSet | undefined): PluginCatalogConfig | undefined;
+/** Return registrations that expose trusted in-process runtime behavior. */
+export declare function trustedPluginRegistrationsFromPluginSet(pluginSet: JuniorPluginSet | undefined): JuniorPluginRegistration[];

package/dist/reporting.d.ts

@@ -36,7 +36,7 @@ export interface DashboardRequesterIdentity {
 }
 export interface DashboardSessionReport {
     conversationTitle?: string;
-    cumulativeDurationMs?: number;
+    cumulativeDurationMs: number;
     cumulativeUsage?: DashboardTurnUsage;
     conversationId: string;
     id: string;

package/dist/reporting.js

@@ -6,24 +6,24 @@ import {
   getAgentTurnSessionRecord,
   listAgentTurnSessionSummaries,
   listAgentTurnSessionSummariesForConversation
-} from "./chunk-ITZ2F7UE.js";
+} from "./chunk-7KZXQNA6.js";
 import {
   discoverSkills
-} from "./chunk-ITOW4DED.js";
+} from "./chunk-PYU2YB35.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
   resolveConversationPrivacy
-} from "./chunk-PEF6UXTY.js";
+} from "./chunk-OMQ5X5QH.js";
 import {
   getPluginPackageContent,
   getPluginProviders,
   isRecord
-} from "./chunk-H652GMDH.js";
+} from "./chunk-EDHJIYHS.js";
 import "./chunk-Z3YD6NHK.js";
 import {
   homeDir
-} from "./chunk-5LUISFEY.js";
+} from "./chunk-KVZL5NZS.js";
 import "./chunk-2KG3PWR4.js";
 
 // src/reporting.ts
@@ -134,7 +134,7 @@ function sessionReportFromSummary(summary) {
     lastProgressAt: new Date(summary.lastProgressAtMs).toISOString(),
     lastSeenAt: new Date(summary.updatedAtMs).toISOString(),
     ...summary.state === "completed" ? { completedAt: new Date(summary.updatedAtMs).toISOString() } : {},
-    ...summary.cumulativeDurationMs !== void 0 ? { cumulativeDurationMs: summary.cumulativeDurationMs } : {},
+    cumulativeDurationMs: summary.cumulativeDurationMs,
     ...cumulativeUsage ? { cumulativeUsage } : {},
     surface: surfaceFromConversationId(summary.conversationId),
     title: titleFromSummary(summary),
@@ -342,10 +342,16 @@ function turnScopedMessages(messages) {
   for (let index = messages.length - 1; index >= 0; index -= 1) {
     const record = messages[index];
     if (record.role === "user") {
-      return messages.slice(index);
+      return {
+        messages: messages.slice(index),
+        startsAtRunBoundary: index === 0
+      };
     }
   }
-  return messages;
+  return {
+    messages,
+    startsAtRunBoundary: messages.length > 0
+  };
 }
 function traceIdFromTranscript(transcript) {
   for (const message of transcript) {
@@ -379,13 +385,16 @@ async function readConversation(conversationId) {
         summary.conversationId,
         summary.sessionId
       );
-      const scopedMessages = sessionRecord?.piMessages ? turnScopedMessages(sessionRecord.piMessages) : [];
+      const scopedMessages = sessionRecord?.piMessages ? turnScopedMessages(sessionRecord.piMessages) : { messages: [], startsAtRunBoundary: false };
       const canExposeTranscript = canExposeConversationTranscript(summary);
-      const normalizedTranscript = scopedMessages.map(
+      const normalizedTranscript = scopedMessages.messages.map(
         normalizeTranscriptMessage
       );
       const transcriptMessageCount = countConversationMessages(normalizedTranscript);
-      const transcript = canExposeTranscript ? [systemPromptMessage(), ...normalizedTranscript] : [];
+      const transcript = canExposeTranscript ? [
+        ...scopedMessages.startsAtRunBoundary && normalizedTranscript.length > 0 ? [systemPromptMessage()] : [],
+        ...normalizedTranscript
+      ] : [];
       const transcriptMetadata = canExposeTranscript ? void 0 : normalizedTranscript.map(redactTranscriptMessage);
       const traceId = summary.traceId ?? sessionRecord?.traceId ?? (canExposeTranscript ? traceIdFromTranscript(transcript) : void 0);
       const sentryTraceUrl = traceId ? buildSentryTraceUrl(traceId) : void 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.63.0",
+  "version": "0.65.0",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -64,7 +64,7 @@
     "node-html-markdown": "^2.0.0",
     "yaml": "^2.9.0",
     "zod": "^4.4.3",
-    "@sentry/junior-plugin-api": "0.63.0"
+    "@sentry/junior-plugin-api": "0.65.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",
@@ -76,7 +76,7 @@
     "typescript": "^6.0.3",
     "vercel": "^54.4.0",
     "vitest": "^4.1.7",
-    "@sentry/junior-scheduler": "0.63.0"
+    "@sentry/junior-scheduler": "0.65.0"
   },
   "scripts": {
     "build": "tsup && tsc -p tsconfig.build.json --emitDeclarationOnly",