@sentry/junior 0.66.0 → 0.66.2

package/dist/app.js

@@ -36,13 +36,13 @@ import {
   truncateStatusText,
   upsertAgentTurnSessionRecord,
   withSlackRetries
-} from "./chunk-X2HJLKQT.js";
+} from "./chunk-DG2I6GXC.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-F57QSMOJ.js";
+} from "./chunk-YL5G5YC4.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -51,7 +51,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-HRQQS63X.js";
+} from "./chunk-JA5QR3N4.js";
 import {
   ACTIVE_LOCK_TTL_MS,
   FUNCTION_TIMEOUT_BUFFER_SECONDS,
@@ -86,7 +86,7 @@ import {
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes,
   toGenAiTextMetadata
-} from "./chunk-ZOV3XJAH.js";
+} from "./chunk-SAYCFF7O.js";
 import {
   CredentialUnavailableError,
   buildOAuthTokenRequest,
@@ -127,7 +127,7 @@ import {
   toOptionalString,
   withContext,
   withSpan
-} from "./chunk-657CJCUO.js";
+} from "./chunk-6QWWMZCK.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";
@@ -11904,7 +11904,7 @@ async function generateAssistantReply(messageText2, context = {}) {
   let canRecordMcpProviders = false;
   let sandboxExecutor;
   let timedOut = false;
-  let yielded = false;
+  let cooperativeYieldError;
   let inputCommitted = false;
   let turnUsage;
   let thinkingSelection;
@@ -12502,11 +12502,11 @@ async function generateAssistantReply(messageText2, context = {}) {
       if (!context.shouldYield?.()) {
         return;
       }
-      yielded = true;
       timeoutResumeMessages = getResumeSnapshot();
-      throw new CooperativeTurnYieldError(
+      cooperativeYieldError = new CooperativeTurnYieldError(
         `Agent turn yielded at a safe boundary after ${Date.now() - replyStartedAtMs}ms`
       );
+      throw cooperativeYieldError;
     };
     agent = new Agent2({
       getApiKey: () => getPiGatewayApiKeyOverride(),
@@ -12668,6 +12668,9 @@ async function generateAssistantReply(messageText2, context = {}) {
           let retryUsage;
           for (let attempt = 0; ; attempt += 1) {
             promptResult = await runAgentStep(run);
+            if (cooperativeYieldError) {
+              throw cooperativeYieldError;
+            }
             newMessages = agent.state.messages.slice(beforeMessageCount);
             const outputMessages = newMessages.filter(isAssistantMessage);
             const outputMessagesAttribute = serializeGenAiAttribute(
@@ -12768,7 +12771,7 @@ async function generateAssistantReply(messageText2, context = {}) {
       assistantUserName: botConfig.userName
     });
   } catch (error) {
-    if (yielded && error instanceof CooperativeTurnYieldError && timeoutResumeConversationId && timeoutResumeSessionId) {
+    if (cooperativeYieldError && error instanceof CooperativeTurnYieldError && timeoutResumeConversationId && timeoutResumeSessionId) {
       turnUsage = turnUsage ?? extractSliceUsage(timeoutResumeMessages, beforeMessageCount);
       await recordActiveMcpProviders();
       const sessionRecord = await persistYieldSessionRecord({

package/dist/{chunk-657CJCUO.js → chunk-6QWWMZCK.js}

@@ -3616,6 +3616,7 @@ export {
   resolvePluginCommandEnv,
   resolveAuthTokenPlaceholder,
   parsePluginManifest,
+  parseInlinePluginManifest,
   CredentialUnavailableError,
   parseCredentialContext,
   hasRequiredOAuthScope,

package/dist/{chunk-X2HJLKQT.js → chunk-DG2I6GXC.js}

@@ -8,12 +8,12 @@ import {
   getStateAdapter,
   parseSlackThreadId,
   sandboxSkillDir
-} from "./chunk-ZOV3XJAH.js";
+} from "./chunk-SAYCFF7O.js";
 import {
   isRecord,
   logInfo,
   logWarn
-} from "./chunk-657CJCUO.js";
+} from "./chunk-6QWWMZCK.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";

package/dist/{chunk-HRQQS63X.js → chunk-JA5QR3N4.js}

@@ -2,12 +2,12 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   toOptionalTrimmed
-} from "./chunk-ZOV3XJAH.js";
+} from "./chunk-SAYCFF7O.js";
 import {
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall,
   withSpan
-} from "./chunk-657CJCUO.js";
+} from "./chunk-6QWWMZCK.js";
 
 // src/chat/sandbox/runtime-dependency-snapshots.ts
 import { createHash } from "crypto";

package/dist/{chunk-ZOV3XJAH.js → chunk-SAYCFF7O.js}

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

package/dist/{chunk-F57QSMOJ.js → chunk-YL5G5YC4.js}

@@ -2,7 +2,7 @@ import {
   getPluginForSkillPath,
   getPluginSkillRoots,
   logWarn
-} from "./chunk-657CJCUO.js";
+} from "./chunk-6QWWMZCK.js";
 import {
   skillRoots
 } from "./chunk-KVZL5NZS.js";

package/dist/cli/check.js

@@ -1,9 +1,10 @@
 import {
   parseSkillFile
-} from "../chunk-F57QSMOJ.js";
+} from "../chunk-YL5G5YC4.js";
 import {
+  parseInlinePluginManifest,
   parsePluginManifest
-} from "../chunk-657CJCUO.js";
+} from "../chunk-6QWWMZCK.js";
 import "../chunk-Z3YD6NHK.js";
 import {
   JUNIOR_CONVERSATION_WORK_CALLBACK_ROUTE,
@@ -16,6 +17,7 @@ import "../chunk-2KG3PWR4.js";
 // src/cli/check.ts
 import fs from "fs/promises";
 import path from "path";
+import { pathToFileURL } from "url";
 var DEFAULT_IO = {
   info: console.log,
   warn: console.warn,
@@ -187,35 +189,12 @@ async function validatePluginDirectory(pluginDir, duplicatePluginNames, duplicat
   try {
     const raw = await fs.readFile(manifestPath, "utf8");
     const manifest = parsePluginManifest(raw, pluginDir);
-    const errors = [];
-    const firstSeen = duplicatePluginNames.get(manifest.name);
-    if (firstSeen) {
-      errors.push(
-        `${manifestPath}: duplicate plugin name "${manifest.name}" (already defined in ${firstSeen})`
-      );
-    }
-    const domains = [
-      .../* @__PURE__ */ new Set([
-        ...manifest.credentials?.domains ?? [],
-        ...manifest.domains ?? []
-      ])
-    ];
-    for (const domain of domains) {
-      const firstDomainSeen = duplicateProviderDomains.get(domain);
-      if (firstDomainSeen) {
-        errors.push(
-          `${manifestPath}: duplicate provider domain "${domain}" (already defined in ${firstDomainSeen})`
-        );
-      }
-    }
-    if (errors.length > 0) {
-      return { manifestPath, manifest, errors };
-    }
-    duplicatePluginNames.set(manifest.name, manifestPath);
-    for (const domain of domains) {
-      duplicateProviderDomains.set(domain, manifestPath);
-    }
-    return { manifestPath, manifest, errors: [] };
+    return validatePluginManifest(
+      manifestPath,
+      manifest,
+      duplicatePluginNames,
+      duplicateProviderDomains
+    );
   } catch (error) {
     return {
       manifestPath,
@@ -225,6 +204,135 @@ async function validatePluginDirectory(pluginDir, duplicatePluginNames, duplicat
     };
   }
 }
+function validatePluginManifest(manifestPath, manifest, duplicatePluginNames, duplicateProviderDomains) {
+  const errors = [];
+  const firstSeen = duplicatePluginNames.get(manifest.name);
+  if (firstSeen) {
+    errors.push(
+      `${manifestPath}: duplicate plugin name "${manifest.name}" (already defined in ${firstSeen})`
+    );
+  }
+  const domains = [
+    .../* @__PURE__ */ new Set([
+      ...manifest.credentials?.domains ?? [],
+      ...manifest.domains ?? []
+    ])
+  ];
+  for (const domain of domains) {
+    const firstDomainSeen = duplicateProviderDomains.get(domain);
+    if (firstDomainSeen) {
+      errors.push(
+        `${manifestPath}: duplicate provider domain "${domain}" (already defined in ${firstDomainSeen})`
+      );
+    }
+  }
+  if (errors.length > 0) {
+    return { manifestPath, manifest, errors };
+  }
+  duplicatePluginNames.set(manifest.name, manifestPath);
+  for (const domain of domains) {
+    duplicateProviderDomains.set(domain, manifestPath);
+  }
+  return { manifestPath, manifest, errors: [] };
+}
+function packageExportsEntryPath(exportsValue) {
+  if (typeof exportsValue === "string") {
+    return exportsValue;
+  }
+  if (!isRecord(exportsValue)) {
+    return void 0;
+  }
+  const rootExport = exportsValue["."] ?? exportsValue;
+  if (typeof rootExport === "string") {
+    return rootExport;
+  }
+  if (!isRecord(rootExport)) {
+    return void 0;
+  }
+  for (const condition of ["default", "import", "node"]) {
+    const target = rootExport[condition];
+    if (typeof target === "string") {
+      return target;
+    }
+  }
+  return void 0;
+}
+async function resolvePackageEntryPath(packageDir) {
+  const packageJson = await readJsonFile(
+    path.join(packageDir, "package.json")
+  );
+  const entry = packageExportsEntryPath(packageJson?.exports) ?? packageJson?.main;
+  const candidates = [
+    ...entry ? [entry] : [],
+    "./index.js",
+    "./dist/index.js"
+  ];
+  for (const candidate of candidates) {
+    if (path.isAbsolute(candidate) || candidate.startsWith("../")) {
+      continue;
+    }
+    const normalizedCandidate = candidate.startsWith("./") ? candidate : `./${candidate}`;
+    const entryPath = path.resolve(packageDir, normalizedCandidate);
+    if (await pathIsFile(entryPath)) {
+      return entryPath;
+    }
+  }
+  return void 0;
+}
+function isPluginFactoryExport(name, value) {
+  return typeof value === "function" && (name === "default" || name.endsWith("Plugin"));
+}
+function isPluginRegistrationLike(value) {
+  return isRecord(value) && isRecord(value.manifest);
+}
+async function collectPackageJsPluginSources(packageDir, packageName) {
+  const entryPath = await resolvePackageEntryPath(packageDir);
+  if (!entryPath) {
+    return [];
+  }
+  let moduleExports;
+  try {
+    moduleExports = await import(pathToFileURL(entryPath).href);
+  } catch {
+    return [];
+  }
+  const pluginSources = [];
+  for (const [exportName, exportedValue] of Object.entries(moduleExports).sort(
+    ([left], [right]) => left.localeCompare(right)
+  )) {
+    if (!isPluginFactoryExport(exportName, exportedValue)) {
+      continue;
+    }
+    let registration;
+    try {
+      registration = await exportedValue();
+    } catch {
+      continue;
+    }
+    if (!isPluginRegistrationLike(registration)) {
+      continue;
+    }
+    const manifestPath = `${entryPath}#${exportName}`;
+    try {
+      pluginSources.push({
+        pluginDir: packageDir,
+        packageName,
+        manifestPath,
+        manifest: parseInlinePluginManifest(registration.manifest, packageDir)
+      });
+    } catch (error) {
+      pluginSources.push({
+        pluginDir: packageDir,
+        packageName,
+        manifestPath,
+        errors: [
+          `${manifestPath}: ${error instanceof Error ? error.message : String(error)}`
+        ]
+      });
+    }
+  }
+  return pluginSources;
+}
 async function collectPluginDirectories(rootDir) {
   const pluginDirs = [];
   let entries;
@@ -247,7 +355,7 @@ async function collectPluginDirectories(rootDir) {
   return pluginDirs.sort((left, right) => left.localeCompare(right));
 }
 async function collectPackagedContent(rootDir, packages) {
-  const pluginDirs = [];
+  const pluginSources = [];
   const skillRoots = [];
   for (const declaredPackage of packages) {
     const packageDir = packageInstallDir(rootDir, declaredPackage.name);
@@ -257,16 +365,26 @@ async function collectPackagedContent(rootDir, packages) {
     const rootManifestPath = path.join(packageDir, "plugin.yaml");
     const hasRootManifest = await pathIsFile(rootManifestPath);
     const packageSkillsRoot = path.join(packageDir, "skills");
+    const hasPackageSkills = await pathIsDirectory(packageSkillsRoot);
     if (hasRootManifest) {
-      pluginDirs.push({
+      pluginSources.push({
         pluginDir: packageDir,
+        manifestPath: rootManifestPath,
         packageName: declaredPackage.name
       });
-    } else if (await pathIsDirectory(packageSkillsRoot)) {
-      skillRoots.push({
-        root: packageSkillsRoot,
-        packageName: declaredPackage.name
-      });
+    } else if (hasPackageSkills) {
+      const jsPluginSources = await collectPackageJsPluginSources(
+        packageDir,
+        declaredPackage.name
+      );
+      if (jsPluginSources.length > 0) {
+        pluginSources.push(...jsPluginSources);
+      } else {
+        skillRoots.push({
+          root: packageSkillsRoot,
+          packageName: declaredPackage.name
+        });
+      }
     }
     const nestedPluginsRoot = path.join(packageDir, "plugins");
     let nestedEntries;
@@ -283,15 +401,16 @@ async function collectPackagedContent(rootDir, packages) {
       }
       const pluginDir = path.join(nestedPluginsRoot, entry.name);
       if (await pathIsFile(path.join(pluginDir, "plugin.yaml"))) {
-        pluginDirs.push({
+        pluginSources.push({
           pluginDir,
+          manifestPath: path.join(pluginDir, "plugin.yaml"),
           packageName: declaredPackage.name
         });
       }
     }
   }
   return {
-    pluginDirs: pluginDirs.sort(
+    pluginSources: pluginSources.sort(
       (left, right) => `${left.packageName}:${left.pluginDir}`.localeCompare(
         `${right.packageName}:${right.pluginDir}`
       )
@@ -571,18 +690,18 @@ async function runCheck(rootDir = process.cwd(), io = DEFAULT_IO) {
   const packageWarnings = await collectPackageWarnings(resolvedRoot, packages);
   const packagedContent = await collectPackagedContent(resolvedRoot, packages);
   const appPluginDirs = await collectPluginDirectories(resolvedRoot);
-  const packagedPluginDirs = packagedContent.pluginDirs;
-  const pluginDirs = [
+  const packagedPluginSources = packagedContent.pluginSources;
+  const pluginSources = [
     ...appPluginDirs.map((pluginDir) => ({
       pluginDir,
-      packageName: void 0
+      manifestPath: path.join(pluginDir, "plugin.yaml")
     })),
-    ...packagedPluginDirs
+    ...packagedPluginSources
   ];
   const appSkillsRoot = contentRoot(resolvedRoot, "skills");
   const appSkillDirs = await collectSkillDirectories(appSkillsRoot);
   const pluginSkillDirs = /* @__PURE__ */ new Map();
-  for (const { pluginDir } of pluginDirs) {
+  for (const { pluginDir } of pluginSources) {
     pluginSkillDirs.set(
       pluginDir,
       await collectSkillDirectories(path.join(pluginDir, "skills"))
@@ -605,7 +724,7 @@ async function runCheck(rootDir = process.cwd(), io = DEFAULT_IO) {
     )
   ].sort((left, right) => left.localeCompare(right));
   const packagedSkillDirs = [
-    ...packagedPluginDirs.flatMap(
+    ...packagedPluginSources.flatMap(
       ({ pluginDir }) => pluginSkillDirs.get(pluginDir) ?? []
     ),
     ...packagedStandaloneSkillDirs
@@ -630,10 +749,20 @@ async function runCheck(rootDir = process.cwd(), io = DEFAULT_IO) {
   );
   warnings.push(...deploymentConfigResult.warnings);
   errors.push(...deploymentConfigResult.errors);
-  for (const { pluginDir, packageName } of pluginDirs) {
+  for (const source of pluginSources) {
+    const { pluginDir, packageName } = source;
     const pluginNameMap = packageName ? duplicatePackagedPluginNames : duplicatePluginNames;
     const providerDomainMap = packageName ? duplicatePackagedProviderDomains : duplicateProviderDomains;
-    const result = await validatePluginDirectory(
+    const result = source.errors ? {
+      manifestPath: source.manifestPath,
+      ...source.manifest ? { manifest: source.manifest } : {},
+      errors: source.errors
+    } : source.manifest ? validatePluginManifest(
+      source.manifestPath,
+      source.manifest,
+      pluginNameMap,
+      providerDomainMap
+    ) : await validatePluginDirectory(
       pluginDir,
       pluginNameMap,
       providerDomainMap
@@ -741,11 +870,11 @@ async function runCheck(rootDir = process.cwd(), io = DEFAULT_IO) {
       io.error(`${statusIcon("error")} error: ${error}`);
     }
     throw new Error(
-      `Validation failed (${errors.length} error${errors.length === 1 ? "" : "s"}, ${pluginDirs.length} plugin manifest${pluginDirs.length === 1 ? "" : "s"}, ${skillDirs.length} skill director${skillDirs.length === 1 ? "y" : "ies"} checked).`
+      `Validation failed (${errors.length} error${errors.length === 1 ? "" : "s"}, ${pluginSources.length} plugin manifest${pluginSources.length === 1 ? "" : "s"}, ${skillDirs.length} skill director${skillDirs.length === 1 ? "y" : "ies"} checked).`
     );
   }
   io.info(
-    `${formatHeading("ok", `Validation passed (${pluginDirs.length} plugin manifest${pluginDirs.length === 1 ? "" : "s"}, ${skillDirs.length} skill director${skillDirs.length === 1 ? "y" : "ies"} checked).`)}`
+    `${formatHeading("ok", `Validation passed (${pluginSources.length} plugin manifest${pluginSources.length === 1 ? "" : "s"}, ${skillDirs.length} skill director${skillDirs.length === 1 ? "y" : "ies"} checked).`)}`
   );
 }
 export {

package/dist/cli/snapshot-warmup.js

@@ -1,14 +1,14 @@
 import {
   resolveRuntimeDependencySnapshot
-} from "../chunk-HRQQS63X.js";
+} from "../chunk-JA5QR3N4.js";
 import {
   disconnectStateAdapter
-} from "../chunk-ZOV3XJAH.js";
+} from "../chunk-SAYCFF7O.js";
 import {
   getPluginProviders,
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall
-} from "../chunk-657CJCUO.js";
+} from "../chunk-6QWWMZCK.js";
 import "../chunk-Z3YD6NHK.js";
 import "../chunk-KVZL5NZS.js";
 import "../chunk-2KG3PWR4.js";

package/dist/reporting.js

@@ -8,20 +8,20 @@ import {
   listAgentTurnSessionSummaries,
   listAgentTurnSessionSummariesForConversation,
   resolveSlackConversationContextFromThreadId
-} from "./chunk-X2HJLKQT.js";
+} from "./chunk-DG2I6GXC.js";
 import {
   discoverSkills
-} from "./chunk-F57QSMOJ.js";
+} from "./chunk-YL5G5YC4.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
   resolveConversationPrivacy
-} from "./chunk-ZOV3XJAH.js";
+} from "./chunk-SAYCFF7O.js";
 import {
   getPluginPackageContent,
   getPluginProviders,
   isRecord
-} from "./chunk-657CJCUO.js";
+} from "./chunk-6QWWMZCK.js";
 import "./chunk-Z3YD6NHK.js";
 import {
   homeDir

package/package.json

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