@sentry/junior 0.48.0 → 0.49.0

package/dist/{chunk-ELM6HJ6S.js → chunk-AQ4RO2WA.js}

@@ -7,7 +7,7 @@ import {
   serializeGenAiAttribute,
   setSpanAttributes,
   withSpan
-} from "./chunk-BCG3I2T2.js";
+} from "./chunk-UKR24HLJ.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";

package/dist/{chunk-ZUUJTQ2H.js → chunk-AYM42AN3.js}

@@ -2,7 +2,7 @@ import {
   getPluginForSkillPath,
   getPluginSkillRoots,
   logWarn
-} from "./chunk-BCG3I2T2.js";
+} from "./chunk-UKR24HLJ.js";
 import {
   skillRoots
 } from "./chunk-XPXD3FCE.js";
@@ -88,6 +88,9 @@ var skillFrontmatterSchema = z.object({
   }).optional(),
   "allowed-tools": z.string({
     error: 'Frontmatter field "allowed-tools" must be a string when present'
+  }).optional(),
+  "disable-model-invocation": z.boolean({
+    error: 'Frontmatter field "disable-model-invocation" must be a boolean when present'
   }).optional()
 }).passthrough();
 function stripFrontmatter(raw) {
@@ -113,7 +116,7 @@ function parseSkillFile(raw, expectedName) {
   if ("requires-capabilities" in parsed) {
     return {
       ok: false,
-      error: 'Frontmatter field "requires-capabilities" is no longer supported; plugin-backed skills inherit credentials from their plugin.'
+      error: 'Frontmatter field "requires-capabilities" is no longer supported; provider credentials are declared by plugin.yaml.'
     };
   }
   if ("uses-config" in parsed) {
@@ -136,6 +139,7 @@ function parseSkillFile(raw, expectedName) {
     };
   }
   const allowedTools = parseTokenList(result.data["allowed-tools"]);
+  const disableModelInvocation = result.data["disable-model-invocation"] === true;
   return {
     ok: true,
     skill: {
@@ -145,7 +149,8 @@ function parseSkillFile(raw, expectedName) {
       ...result.data.metadata ? { metadata: result.data.metadata } : {},
       ...result.data.compatibility !== void 0 ? { compatibility: result.data.compatibility } : {},
       ...result.data.license !== void 0 ? { license: result.data.license } : {},
-      ...allowedTools ? { allowedTools } : {}
+      ...allowedTools ? { allowedTools } : {},
+      ...disableModelInvocation ? { disableModelInvocation } : {}
     }
   };
 }
@@ -225,14 +230,15 @@ async function readSkillDirectory(skillDir) {
       );
       return null;
     }
-    const { name, description, allowedTools } = parsed.skill;
+    const { name, description, allowedTools, disableModelInvocation } = parsed.skill;
     const plugin = getPluginForSkillPath(skillDir);
     return {
       name,
       description,
       skillPath: skillDir,
       ...plugin ? { pluginProvider: plugin.manifest.name } : {},
-      ...allowedTools ? { allowedTools } : {}
+      ...allowedTools ? { allowedTools } : {},
+      ...disableModelInvocation ? { disableModelInvocation } : {}
     };
   } catch (error) {
     logWarn(
@@ -292,19 +298,39 @@ async function discoverSkills(options) {
 }
 function parseSkillInvocation(messageText, availableSkills) {
   const trimmed = messageText.trim();
-  const match = /(?:^|\s)\/([a-z0-9]+(?:-[a-z0-9]+)*)(?:\s+([\s\S]*))?/i.exec(
-    trimmed
-  );
-  if (!match) {
-    return null;
+  const escapePattern = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const slashMatch = /(?:^|\s)\/([a-z0-9]+(?:-[a-z0-9]+)*)(?:\s+([\s\S]*))?/i.exec(trimmed);
+  if (slashMatch) {
+    const skillName = slashMatch[1].toLowerCase();
+    if (!availableSkills.some((skill) => skill.name === skillName)) {
+      return null;
+    }
+    return {
+      skillName,
+      args: (slashMatch[2] ?? "").trim()
+    };
   }
-  const skillName = match[1].toLowerCase();
-  if (!availableSkills.some((skill) => skill.name === skillName)) {
+  const namedSkill = availableSkills.find((skill) => {
+    if (skill.disableModelInvocation !== true) {
+      return false;
+    }
+    const skillPattern = escapePattern(skill.name);
+    const explicitUse = new RegExp(
+      `\\b(?:use|run|load|call|invoke)\\s+(?:the\\s+)?${skillPattern}(?:\\s+skill)?\\b`,
+      "i"
+    );
+    const negatedUse = new RegExp(
+      `\\b(?:do\\s+not|don't|dont|never)\\s+(?:use|run|load|call|invoke)\\s+(?:the\\s+)?${skillPattern}(?:\\s+skill)?\\b`,
+      "i"
+    );
+    return explicitUse.test(trimmed) && !negatedUse.test(trimmed);
+  });
+  if (!namedSkill) {
     return null;
   }
   return {
-    skillName,
-    args: (match[2] ?? "").trim()
+    skillName: namedSkill.name,
+    args: trimmed
   };
 }
 function findSkillByName(skillName, available) {
@@ -329,7 +355,8 @@ async function loadSkillsByName(skillNames, available) {
       description: parsed.skill.description,
       skillPath: meta.skillPath,
       ...plugin ? { pluginProvider: plugin.manifest.name } : {},
-      ...parsed.skill.allowedTools ? { allowedTools: parsed.skill.allowedTools } : {}
+      ...parsed.skill.allowedTools ? { allowedTools: parsed.skill.allowedTools } : {},
+      ...parsed.skill.disableModelInvocation ? { disableModelInvocation: parsed.skill.disableModelInvocation } : {}
     };
     skills.push({
       ...loadedMeta,

package/dist/{chunk-BCG3I2T2.js → chunk-UKR24HLJ.js}

@@ -1463,6 +1463,130 @@ var manifestSourceSchema = z.object({
     error: "must be an object"
   }).optional()
 }).passthrough();
+function setDefined(target, key, value) {
+  if (value !== void 0) {
+    target[key] = value;
+  }
+}
+function manifestConfigPatch(config) {
+  const result = {};
+  setDefined(result, "description", config.description);
+  setDefined(result, "capabilities", config.capabilities);
+  setDefined(result, "config-keys", config.configKeys);
+  setDefined(result, "domains", config.domains);
+  setDefined(result, "api-headers", config.apiHeaders);
+  setDefined(result, "command-env", config.commandEnv);
+  setDefined(result, "env-vars", config.envVars);
+  if (config.credentials !== void 0) {
+    if (!config.credentials) {
+      result.credentials = null;
+    } else {
+      const credentials = {};
+      setDefined(credentials, "type", config.credentials.type);
+      setDefined(credentials, "domains", config.credentials.domains);
+      setDefined(credentials, "api-headers", config.credentials.apiHeaders);
+      setDefined(
+        credentials,
+        "auth-token-env",
+        config.credentials.authTokenEnv
+      );
+      setDefined(
+        credentials,
+        "auth-token-placeholder",
+        config.credentials.authTokenPlaceholder
+      );
+      setDefined(credentials, "app-id-env", config.credentials.appIdEnv);
+      setDefined(
+        credentials,
+        "private-key-env",
+        config.credentials.privateKeyEnv
+      );
+      setDefined(
+        credentials,
+        "installation-id-env",
+        config.credentials.installationIdEnv
+      );
+      result.credentials = credentials;
+    }
+  }
+  setDefined(result, "runtime-dependencies", config.runtimeDependencies);
+  setDefined(result, "runtime-postinstall", config.runtimePostinstall);
+  if (config.mcp !== void 0) {
+    if (!config.mcp) {
+      result.mcp = null;
+    } else {
+      const mcp = {};
+      setDefined(mcp, "transport", config.mcp.transport);
+      setDefined(mcp, "url", config.mcp.url);
+      setDefined(mcp, "headers", config.mcp.headers);
+      setDefined(mcp, "allowed-tools", config.mcp.allowedTools);
+      result.mcp = mcp;
+    }
+  }
+  if (config.oauth !== void 0) {
+    if (!config.oauth) {
+      result.oauth = null;
+    } else {
+      const oauth = {};
+      setDefined(oauth, "client-id-env", config.oauth.clientIdEnv);
+      setDefined(oauth, "client-secret-env", config.oauth.clientSecretEnv);
+      setDefined(oauth, "authorize-endpoint", config.oauth.authorizeEndpoint);
+      setDefined(oauth, "token-endpoint", config.oauth.tokenEndpoint);
+      setDefined(oauth, "scope", config.oauth.scope);
+      setDefined(oauth, "authorize-params", config.oauth.authorizeParams);
+      setDefined(oauth, "token-auth-method", config.oauth.tokenAuthMethod);
+      setDefined(oauth, "token-extra-headers", config.oauth.tokenExtraHeaders);
+      result.oauth = oauth;
+    }
+  }
+  if (config.target !== void 0) {
+    if (!config.target) {
+      result.target = null;
+    } else {
+      const target = {};
+      setDefined(target, "type", config.target.type);
+      setDefined(target, "config-key", config.target.configKey);
+      setDefined(target, "command-flags", config.target.commandFlags);
+      result.target = target;
+    }
+  }
+  return result;
+}
+function isPlainRecord(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function mergeManifestConfig(base, patch, options = {}) {
+  const merged = { ...base };
+  for (const [key, value] of Object.entries(patch)) {
+    if (options.root && key === "name") {
+      throw new Error("plugins.manifests cannot change plugin names");
+    }
+    if (value === null) {
+      delete merged[key];
+      continue;
+    }
+    const current = merged[key];
+    if (isPlainRecord(current) && isPlainRecord(value)) {
+      merged[key] = mergeManifestConfig(current, value);
+      continue;
+    }
+    merged[key] = value;
+  }
+  return merged;
+}
+function applyManifestConfig(source, config) {
+  const name = source.name;
+  if (typeof name !== "string") {
+    return source;
+  }
+  const manifestConfig = config?.manifests?.[name];
+  if (manifestConfig && "name" in manifestConfig) {
+    throw new Error("plugins.manifests cannot change plugin names");
+  }
+  return manifestConfig ? mergeManifestConfig(source, manifestConfigPatch(manifestConfig), {
+    root: true
+  }) : source;
+}
 function formatPath(path3) {
   return path3.map((segment) => String(segment)).join(".");
 }
@@ -1835,7 +1959,7 @@ function normalizeMcp(data, envVars, name) {
     ...result.data["allowed-tools"] ? { allowedTools: result.data["allowed-tools"] } : {}
   };
 }
-function parsePluginManifest(raw, dir) {
+function parsePluginManifest(raw, dir, config) {
   let parsedYaml;
   try {
     parsedYaml = parseYaml(raw);
@@ -1847,7 +1971,8 @@ function parsePluginManifest(raw, dir) {
   if (!parsedYaml || typeof parsedYaml !== "object" || Array.isArray(parsedYaml)) {
     throw new Error(`Invalid plugin manifest in ${dir}: expected an object`);
   }
-  const sourceResult = manifestSourceSchema.safeParse(parsedYaml);
+  const source = applyManifestConfig(parsedYaml, config);
+  const sourceResult = manifestSourceSchema.safeParse(source);
   if (!sourceResult.success) {
     const issue = sourceResult.error.issues[0];
     const path3 = formatPath(issue?.path ?? []);
@@ -2681,6 +2806,7 @@ function createOAuthBearerBroker(manifest, credentials, deps) {
 
 // src/chat/plugins/registry.ts
 var loadedPluginState;
+var pluginConfig;
 function getLoggedPluginNames() {
   const globalState = globalThis;
   globalState.__juniorLoggedPluginNames ??= /* @__PURE__ */ new Set();
@@ -2706,7 +2832,7 @@ function providerDomains(manifest) {
   ].sort((left, right) => left.localeCompare(right));
 }
 function registerPluginManifest(state, raw, pluginDir) {
-  const manifest = parsePluginManifest(raw, pluginDir);
+  const manifest = parsePluginManifest(raw, pluginDir, pluginConfig);
   if (state.pluginsByName.has(manifest.name)) {
     throw new Error(`Duplicate plugin name "${manifest.name}"`);
   }
@@ -2721,7 +2847,7 @@ function registerPluginManifest(state, raw, pluginDir) {
     const owner = state.domainToPlugin.get(domain);
     if (owner) {
       throw new Error(
-        `Duplicate provider domain "${domain}" in plugin "${manifest.name}" already declared by plugin "${owner}"`
+        `Duplicate provider domain "${domain}" in plugin "${manifest.name}" already declared by plugin "${owner}". Use plugins.manifests in PluginConfig to change one plugin's domains or credentials.`
       );
     }
   }
@@ -2793,7 +2919,8 @@ function getPluginCatalogSource() {
     signature: JSON.stringify({
       manifestRoots,
       packagedSkillRoots,
-      packageNames: [...packagedContent.packageNames].sort()
+      packageNames: [...packagedContent.packageNames].sort(),
+      pluginConfig: pluginConfig ?? {}
     })
   };
 }
@@ -2866,6 +2993,13 @@ function buildLoadedPluginState(source) {
       registerPluginManifest(state, raw, pluginDir);
     }
   }
+  for (const name of Object.keys(pluginConfig?.manifests ?? {})) {
+    if (!state.pluginsByName.has(name)) {
+      throw new Error(
+        `plugins.manifests.${name} does not match a loaded plugin`
+      );
+    }
+  }
   return state;
 }
 function logLoadedPlugins(state) {
@@ -2902,6 +3036,9 @@ function ensurePluginsLoaded() {
   logLoadedPlugins(state);
   return state;
 }
+function setPluginConfig(config) {
+  pluginConfig = config;
+}
 function getPluginCatalogSignature() {
   return ensurePluginsLoaded().signature;
 }
@@ -3069,6 +3206,7 @@ export {
   hasRequiredOAuthScope,
   buildOAuthTokenRequest,
   parseOAuthTokenResponse,
+  setPluginConfig,
   getPluginCatalogSignature,
   getPluginCapabilityProviders,
   getPluginProviders,

package/dist/cli/check.js

@@ -1,9 +1,9 @@
 import {
   parseSkillFile
-} from "../chunk-ZUUJTQ2H.js";
+} from "../chunk-AYM42AN3.js";
 import {
   parsePluginManifest
-} from "../chunk-BCG3I2T2.js";
+} from "../chunk-UKR24HLJ.js";
 import "../chunk-Z3YD6NHK.js";
 import "../chunk-XPXD3FCE.js";
 import "../chunk-2KG3PWR4.js";
@@ -383,6 +383,38 @@ function reportSkillGroup(label, skillResults, io) {
 function reportAppSkills(skillResults, io) {
   reportSkillGroup("app skills", skillResults, io);
 }
+async function validateAppSourceFiles(rootDir, registeredConfigKeys) {
+  const errors = [];
+  const warnings = [];
+  for (const fileName of ["server.ts", "server.js", "nitro.config.ts"]) {
+    const sourcePath = path.join(rootDir, fileName);
+    let source;
+    try {
+      source = await fs.readFile(sourcePath, "utf8");
+    } catch {
+      continue;
+    }
+    if (/\bpluginPackages\s*:/.test(source)) {
+      errors.push(
+        `${sourcePath}: pluginPackages is no longer supported. Use plugins: { packages: [...] }.`
+      );
+    }
+    for (const defaultsBlock of source.matchAll(
+      /\bconfigDefaults\s*:\s*\{([\s\S]*?)\}/g
+    )) {
+      const block = defaultsBlock[1] ?? "";
+      for (const keyMatch of block.matchAll(/["']([^"']+)["']\s*:/g)) {
+        const key = keyMatch[1];
+        if (key && !registeredConfigKeys.has(key)) {
+          errors.push(
+            `${sourcePath}: configDefaults key "${key}" is not a registered plugin config key`
+          );
+        }
+      }
+    }
+  }
+  return { errors, warnings };
+}
 async function validateAppFiles(appDir) {
   const errors = [];
   const warnings = [];
@@ -505,6 +537,15 @@ async function runCheck(rootDir = process.cwd(), io = DEFAULT_IO) {
     });
     errors.push(...result.errors);
   }
+  const registeredConfigKeys = new Set(
+    pluginResults.flatMap((result) => result.manifest?.configKeys ?? [])
+  );
+  const appSourceResult = await validateAppSourceFiles(
+    resolvedRoot,
+    registeredConfigKeys
+  );
+  warnings.push(...appSourceResult.warnings);
+  errors.push(...appSourceResult.errors);
   for (const skillDir of appAndLocalPluginSkillDirs) {
     const result = await validateSkillDirectory(skillDir, duplicateSkillNames);
     skillResultsByDir.set(skillDir, result);

package/dist/cli/snapshot-warmup.js

@@ -1,12 +1,12 @@
 import {
   disconnectStateAdapter,
   resolveRuntimeDependencySnapshot
-} from "../chunk-ELM6HJ6S.js";
+} from "../chunk-AQ4RO2WA.js";
 import {
   getPluginProviders,
   getPluginRuntimeDependencies,
   getPluginRuntimePostinstall
-} from "../chunk-BCG3I2T2.js";
+} from "../chunk-UKR24HLJ.js";
 import "../chunk-Z3YD6NHK.js";
 import "../chunk-XPXD3FCE.js";
 import "../chunk-2KG3PWR4.js";

package/dist/nitro.d.ts

@@ -1,7 +1,10 @@
+import { P as PluginConfig } from './types-X_iCClPb.js';
+
 interface JuniorNitroOptions {
     cwd?: string;
     maxDuration?: number;
-    pluginPackages?: string[];
+    /** Plugin packages and manifest overrides bundled into the app. */
+    plugins?: PluginConfig;
     /**
      * 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

@@ -46,10 +46,10 @@ function resolvePackageDir(pkgName) {
 }
 
 // src/build/copy-build-content.ts
-function copyAppAndPluginContent(cwd, serverRoot, pluginPackages) {
+function copyAppAndPluginContent(cwd, serverRoot, packageNames) {
   copyIfExists(path2.join(cwd, "app"), path2.join(serverRoot, "app"));
   const packagedContent = discoverInstalledPluginPackageContent(cwd, {
-    packageNames: pluginPackages
+    packageNames
   });
   for (const root of packagedContent.manifestRoots) {
     if (existsSync2(path2.join(root, "plugin.yaml"))) {
@@ -109,8 +109,8 @@ function copyRootIntoServerOutput(cwd, serverRoot, root) {
 }
 
 // src/build/virtual-config.ts
-function injectVirtualConfig(nitro, pluginPackages) {
-  nitro.options.virtual["#junior/config"] = `export const pluginPackages = ${JSON.stringify(pluginPackages)};`;
+function injectVirtualConfig(nitro, plugins) {
+  nitro.options.virtual["#junior/config"] = `export const plugins = ${JSON.stringify(plugins ?? { packages: [] })};`;
 }
 
 // src/nitro.ts
@@ -125,12 +125,12 @@ function juniorNitro(options = {}) {
         nitro.options.vercel.functions ??= {};
         nitro.options.vercel.functions.maxDuration ??= options.maxDuration ?? 800;
         applyRolldownTreeshakeWorkaround(nitro);
-        injectVirtualConfig(nitro, options.pluginPackages ?? []);
+        injectVirtualConfig(nitro, options.plugins);
         nitro.hooks.hook("compiled", () => {
           copyAppAndPluginContent(
             cwd,
             nitro.options.output.serverDir,
-            options.pluginPackages
+            options.plugins?.packages
           );
           copyIncludedFiles(
             nitro.options.output.serverDir,

package/dist/types-X_iCClPb.d.ts

@@ -0,0 +1,75 @@
+interface PluginOAuthConfig {
+    clientIdEnv: string;
+    clientSecretEnv: string;
+    authorizeEndpoint: string;
+    tokenEndpoint: string;
+    scope?: string;
+    authorizeParams?: Record<string, string>;
+    tokenAuthMethod?: "body" | "basic";
+    tokenExtraHeaders?: Record<string, string>;
+}
+interface PluginRuntimePostinstallCommand {
+    cmd: string;
+    args?: string[];
+    sudo?: boolean;
+}
+interface PluginEnvVarDeclaration {
+    default?: string;
+}
+type PluginRuntimeDependencyConfig = {
+    type: "npm";
+    package: string;
+    version?: string;
+} | {
+    type: "system";
+    package: string;
+} | {
+    type: "system";
+    url: string;
+    sha256: string;
+};
+interface PluginOAuthConfigPatch extends Omit<Partial<PluginOAuthConfig>, "authorizeParams" | "tokenExtraHeaders"> {
+    authorizeParams?: Record<string, string | null> | null;
+    tokenExtraHeaders?: Record<string, string | null> | null;
+}
+/** Install-level changes applied to one plugin manifest before validation. */
+interface PluginManifestConfig {
+    description?: string;
+    capabilities?: string[];
+    configKeys?: string[];
+    domains?: string[] | null;
+    apiHeaders?: Record<string, string | null> | null;
+    commandEnv?: Record<string, string | null> | null;
+    envVars?: Record<string, PluginEnvVarDeclaration | null> | null;
+    credentials?: {
+        type?: "oauth-bearer" | "github-app";
+        domains?: string[];
+        apiHeaders?: Record<string, string | null> | null;
+        authTokenEnv?: string;
+        authTokenPlaceholder?: string | null;
+        appIdEnv?: string;
+        privateKeyEnv?: string;
+        installationIdEnv?: string;
+    } | null;
+    runtimeDependencies?: PluginRuntimeDependencyConfig[] | null;
+    runtimePostinstall?: PluginRuntimePostinstallCommand[] | null;
+    mcp?: {
+        transport?: "http";
+        url?: string;
+        headers?: Record<string, string | null> | null;
+        allowedTools?: string[] | null;
+    } | null;
+    oauth?: PluginOAuthConfigPatch | null;
+    target?: {
+        type?: string;
+        configKey?: string;
+        commandFlags?: string[] | null;
+    } | null;
+}
+/** Install-level plugin package list and manifest configuration. */
+interface PluginConfig {
+    packages?: string[];
+    manifests?: Record<string, PluginManifestConfig>;
+}
+
+export type { PluginConfig as P };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "private": false,
   "publishConfig": {
     "access": "public"