@sentry/junior 0.2.0 → 0.4.0

package/dist/handlers/router.js

@@ -1,30 +1,34 @@
 import {
   POST as POST2
-} from "../chunk-JDBWDYGR.js";
+} from "../chunk-TEQ3UIS7.js";
 import {
   POST
-} from "../chunk-TQSDLJVE.js";
+} from "../chunk-DGKNXMK4.js";
 import {
   escapeXml,
+  formatProviderLabel,
   generateAssistantReply,
-  getOAuthProviderConfig,
   getSlackClient,
   getUserTokenStore,
   publishAppHomeView,
   resolveBaseUrl,
   truncateStatusText
-} from "../chunk-RXNMJQPY.js";
+} from "../chunk-RFUE5VBK.js";
 import {
   GET
 } from "../chunk-4RBEYCOG.js";
 import {
   botConfig,
-  getStateAdapter
-} from "../chunk-QHDDCUTN.js";
+  buildOAuthTokenRequest,
+  getPluginOAuthConfig,
+  getStateAdapter,
+  parseOAuthTokenResponse
+} from "../chunk-OZFXD5IG.js";
 import {
   logException,
   logInfo
 } from "../chunk-PY4AI2GZ.js";
+import "../chunk-Z5E25LRN.js";
 
 // src/handlers/oauth-callback.ts
 import { after } from "next/server";
@@ -49,13 +53,21 @@ function htmlErrorResponse(title, message, status) {
 }
 async function postSlackMessage(channelId, threadTs, text) {
   try {
-    await getSlackClient().chat.postMessage({ channel: channelId, thread_ts: threadTs, text });
+    await getSlackClient().chat.postMessage({
+      channel: channelId,
+      thread_ts: threadTs,
+      text
+    });
   } catch {
   }
 }
 async function setAssistantStatus(channelId, threadTs, status) {
   try {
-    await getSlackClient().assistant.threads.setStatus({ channel_id: channelId, thread_ts: threadTs, status });
+    await getSlackClient().assistant.threads.setStatus({
+      channel_id: channelId,
+      thread_ts: threadTs,
+      status
+    });
   } catch {
   }
 }
@@ -94,9 +106,12 @@ function createDebouncedStatusPoster(channelId, threadTs) {
     }
     pendingStatus = truncated;
     if (!pendingTimer) {
-      pendingTimer = setTimeout(() => {
-        void flush();
-      }, Math.max(1, STATUS_DEBOUNCE_MS - elapsed));
+      pendingTimer = setTimeout(
+        () => {
+          void flush();
+        },
+        Math.max(1, STATUS_DEBOUNCE_MS - elapsed)
+      );
     }
   };
   post.stop = () => {
@@ -137,13 +152,16 @@ function createReadOnlyConfigService(values) {
 }
 async function resumePendingMessage(stored) {
   if (!stored.pendingMessage || !stored.channelId || !stored.threadTs) return;
-  const providerLabel = stored.provider.charAt(0).toUpperCase() + stored.provider.slice(1);
+  const providerLabel = formatProviderLabel(stored.provider);
   await postSlackMessage(
     stored.channelId,
     stored.threadTs,
     `Your ${providerLabel} account is now connected. Processing your request...`
   );
-  const postStatus = createDebouncedStatusPoster(stored.channelId, stored.threadTs);
+  const postStatus = createDebouncedStatusPoster(
+    stored.channelId,
+    stored.threadTs
+  );
   await setAssistantStatus(stored.channelId, stored.threadTs, "Thinking...");
   try {
     const reply = await generateAssistantReply(stored.pendingMessage, {
@@ -190,11 +208,15 @@ async function resumePendingMessage(stored) {
 }
 async function GET2(request, context) {
   const { provider } = await context.params;
-  const providerConfig = getOAuthProviderConfig(provider);
+  const providerConfig = getPluginOAuthConfig(provider);
   if (!providerConfig) {
-    return htmlErrorResponse("Unknown provider", "The OAuth provider in this link is not recognized.", 404);
+    return htmlErrorResponse(
+      "Unknown provider",
+      "The OAuth provider in this link is not recognized.",
+      404
+    );
   }
-  const providerLabel = provider.charAt(0).toUpperCase() + provider.slice(1);
+  const providerLabel = formatProviderLabel(provider);
   const url = new URL(request.url);
   const errorParam = url.searchParams.get("error");
   const code = url.searchParams.get("code");
@@ -218,7 +240,11 @@ async function GET2(request, context) {
     );
   }
   if (!code || !state) {
-    return htmlErrorResponse("Invalid request", "This authorization link is missing required parameters.", 400);
+    return htmlErrorResponse(
+      "Invalid request",
+      "This authorization link is missing required parameters.",
+      400
+    );
   }
   const stateAdapter = getStateAdapter();
   const stateKey = `oauth-state:${state}`;
@@ -231,51 +257,76 @@ async function GET2(request, context) {
     );
   }
   if (stored.provider !== provider) {
-    return htmlErrorResponse("Provider mismatch", "This authorization link does not match the expected provider.", 400);
+    return htmlErrorResponse(
+      "Provider mismatch",
+      "This authorization link does not match the expected provider.",
+      400
+    );
   }
   await stateAdapter.delete(stateKey);
   const clientId = process.env[providerConfig.clientIdEnv]?.trim();
   const clientSecret = process.env[providerConfig.clientSecretEnv]?.trim();
   if (!clientId || !clientSecret) {
-    return htmlErrorResponse("Configuration error", "OAuth client credentials are not configured on the server.", 500);
+    return htmlErrorResponse(
+      "Configuration error",
+      "OAuth client credentials are not configured on the server.",
+      500
+    );
   }
   const baseUrl = resolveBaseUrl();
   if (!baseUrl) {
-    return htmlErrorResponse("Configuration error", "The server cannot determine its base URL.", 500);
+    return htmlErrorResponse(
+      "Configuration error",
+      "The server cannot determine its base URL.",
+      500
+    );
   }
   const redirectUri = `${baseUrl}${providerConfig.callbackPath}`;
   let tokenResponse;
   try {
-    tokenResponse = await fetch(providerConfig.tokenEndpoint, {
-      method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams({
+    const tokenRequest = buildOAuthTokenRequest({
+      clientId,
+      clientSecret,
+      payload: {
         grant_type: "authorization_code",
         code,
-        client_id: clientId,
-        client_secret: clientSecret,
         redirect_uri: redirectUri
-      })
+      },
+      tokenAuthMethod: providerConfig.tokenAuthMethod,
+      tokenExtraHeaders: providerConfig.tokenExtraHeaders
+    });
+    tokenResponse = await fetch(providerConfig.tokenEndpoint, {
+      method: "POST",
+      headers: tokenRequest.headers,
+      body: tokenRequest.body
     });
   } catch {
-    return htmlErrorResponse("Connection failed", "Failed to exchange the authorization code. Please try again.", 500);
+    return htmlErrorResponse(
+      "Connection failed",
+      "Failed to exchange the authorization code. Please try again.",
+      500
+    );
   }
   if (!tokenResponse.ok) {
-    return htmlErrorResponse("Connection failed", "The token exchange with the provider failed. Please try again.", 500);
+    return htmlErrorResponse(
+      "Connection failed",
+      "The token exchange with the provider failed. Please try again.",
+      500
+    );
   }
   const tokenData = await tokenResponse.json();
-  if (!tokenData.access_token || !tokenData.refresh_token || typeof tokenData.expires_in !== "number") {
-    return htmlErrorResponse("Connection failed", "The provider returned an incomplete token response. Please try again.", 500);
+  let parsedTokenResponse;
+  try {
+    parsedTokenResponse = parseOAuthTokenResponse(tokenData);
+  } catch {
+    return htmlErrorResponse(
+      "Connection failed",
+      "The provider returned an incomplete token response. Please try again.",
+      500
+    );
   }
-  const accessToken = tokenData.access_token;
-  const refreshToken = tokenData.refresh_token;
-  const expiresAt = Date.now() + tokenData.expires_in * 1e3;
   const userTokenStore = getUserTokenStore();
-  await userTokenStore.set(stored.userId, provider, {
-    accessToken,
-    refreshToken,
-    expiresAt
-  });
+  await userTokenStore.set(stored.userId, provider, parsedTokenResponse);
   after(async () => {
     try {
       await publishAppHomeView(getSlackClient(), stored.userId, userTokenStore);

package/dist/handlers/webhooks.js

@@ -1,6 +1,6 @@
 import {
   POST
-} from "../chunk-JDBWDYGR.js";
+} from "../chunk-TEQ3UIS7.js";
 import "../chunk-PY4AI2GZ.js";
 export {
   POST

package/dist/next-config.d.ts

@@ -7,7 +7,7 @@ interface JuniorConfigOptions {
     dataDir?: string;
     skillsDir?: string;
     pluginsDir?: string;
-    sentry?: boolean;
+    pluginPackages?: string[];
 }
 type NextConfigFactory = (phase: string, ctx: {
     defaultConfig: NextConfig;
@@ -17,6 +17,6 @@ type NextConfigFactory = (phase: string, ctx: {
  *
  * Supports both object and function-style Next config exports.
  */
-declare function withJunior(nextConfig?: NextConfig | NextConfigFactory, options?: JuniorConfigOptions): NextConfig | NextConfigFactory;
+declare function withJunior(options?: JuniorConfigOptions, nextConfig?: NextConfig | NextConfigFactory): NextConfig | NextConfigFactory;
 
 export { type JuniorConfigOptions, withJunior };

package/dist/next-config.js

@@ -1,102 +1,107 @@
+import {
+  discoverInstalledPluginPackageContent,
+  discoverNodeModulesDirs,
+  isDirectory
+} from "./chunk-Z5E25LRN.js";
+
 // src/next-config.ts
 import { createRequire } from "module";
-import { readFileSync, statSync } from "fs";
 import path from "path";
 var require2 = createRequire(import.meta.url);
-function isDirectory(targetPath) {
-  try {
-    return statSync(targetPath).isDirectory();
-  } catch {
-    return false;
-  }
+function unique(values) {
+  return [...new Set(values)];
 }
-function isFile(targetPath) {
-  try {
-    return statSync(targetPath).isFile();
-  } catch {
-    return false;
-  }
+function sentryConfigured() {
+  return Boolean(process.env.NEXT_PUBLIC_SENTRY_DSN || process.env.SENTRY_DSN);
 }
-function discoverInstalledPluginPackageTracingIncludes(cwd = process.cwd()) {
-  const rootPackageJsonPath = path.join(cwd, "package.json");
-  let rootPackageJson;
-  try {
-    rootPackageJson = JSON.parse(readFileSync(rootPackageJsonPath, "utf8"));
-  } catch {
-    return [];
-  }
-  const dependencies = [
-    ...Object.keys(rootPackageJson.dependencies ?? {}),
-    ...Object.keys(rootPackageJson.optionalDependencies ?? {})
-  ];
-  const tracingIncludes = [];
-  for (const dependency of dependencies) {
-    const packageDir = path.join(cwd, "node_modules", ...dependency.split("/"));
-    if (!isDirectory(packageDir)) {
-      continue;
-    }
-    const base = `./node_modules/${dependency}`;
-    if (isFile(path.join(packageDir, "plugin.yaml"))) {
-      tracingIncludes.push(`${base}/plugin.yaml`);
-    }
-    if (isDirectory(path.join(packageDir, "plugins"))) {
-      tracingIncludes.push(`${base}/plugins/**/*`);
-    }
-    if (isDirectory(path.join(packageDir, "skills"))) {
-      tracingIncludes.push(`${base}/skills/**/*`);
-    }
-  }
-  return [...new Set(tracingIncludes)].sort((left, right) => left.localeCompare(right));
+function isPackageInstalled(cwd, packageName) {
+  const nodeModulesDirs = discoverNodeModulesDirs(cwd);
+  return nodeModulesDirs.some(
+    (nodeModulesDir) => isDirectory(path.join(nodeModulesDir, ...packageName.split("/")))
+  );
 }
 function applyJuniorConfig(nextConfig, options) {
+  const existingEnv = nextConfig?.env ?? {};
   const dataDir = options?.dataDir ?? "./app/data";
   const skillsDir = options?.skillsDir ?? "./app/skills";
   const pluginsDir = options?.pluginsDir ?? "./app/plugins";
+  const configuredPluginPackages = unique(options?.pluginPackages ?? []);
+  const discoveredPlugins = discoverInstalledPluginPackageContent(
+    process.cwd(),
+    { packageNames: configuredPluginPackages }
+  );
+  const unresolvedConfiguredPackages = configuredPluginPackages.filter(
+    (packageName) => !discoveredPlugins.packageNames.includes(packageName)
+  );
+  const invalidPluginPackages = unresolvedConfiguredPackages.filter(
+    (packageName) => isPackageInstalled(process.cwd(), packageName)
+  );
+  const missingPluginPackages = unresolvedConfiguredPackages.filter(
+    (packageName) => !invalidPluginPackages.includes(packageName)
+  );
+  if (invalidPluginPackages.length > 0) {
+    throw new Error(
+      `withJunior pluginPackages contains installed packages that are not valid Junior plugins: ${invalidPluginPackages.join(", ")}`
+    );
+  }
+  if (missingPluginPackages.length > 0) {
+    throw new Error(
+      `withJunior pluginPackages contains unresolved packages: ${missingPluginPackages.join(", ")}`
+    );
+  }
   const defaultDataTracingIncludes = options?.dataDir ? [`${dataDir}/**/*`] : ["./app/SOUL.md", "./app/ABOUT.md"];
-  const pluginPackageTracingIncludes = discoverInstalledPluginPackageTracingIncludes();
-  const tracingIncludes = Array.from(/* @__PURE__ */ new Set([
-    ...defaultDataTracingIncludes,
-    `${skillsDir}/**/*`,
-    `${pluginsDir}/**/*`,
-    ...pluginPackageTracingIncludes
-  ]));
+  const pluginPackageTracingIncludes = discoveredPlugins.tracingIncludes;
+  const tracingIncludes = Array.from(
+    /* @__PURE__ */ new Set([
+      ...defaultDataTracingIncludes,
+      `${skillsDir}/**/*`,
+      `${pluginsDir}/**/*`,
+      ...pluginPackageTracingIncludes
+    ])
+  );
   const existingGlobalTracingIncludes = nextConfig?.outputFileTracingIncludes?.["/*"] ?? [];
-  const mergedGlobalTracingIncludes = Array.from(/* @__PURE__ */ new Set([
-    ...existingGlobalTracingIncludes,
-    ...tracingIncludes
-  ]));
+  const mergedGlobalTracingIncludes = Array.from(
+    /* @__PURE__ */ new Set([...existingGlobalTracingIncludes, ...tracingIncludes])
+  );
   const config = {
     ...nextConfig,
-    serverExternalPackages: Array.from(/* @__PURE__ */ new Set([
-      ...nextConfig?.serverExternalPackages ?? [],
-      "@vercel/sandbox",
-      "bash-tool",
-      "just-bash",
-      "@mariozechner/pi-agent-core",
-      "@mariozechner/pi-ai",
-      "@chat-adapter/slack",
-      "@slack/web-api"
-    ])),
+    serverExternalPackages: Array.from(
+      /* @__PURE__ */ new Set([
+        ...nextConfig?.serverExternalPackages ?? [],
+        "@vercel/queue",
+        "@vercel/sandbox",
+        "bash-tool",
+        "just-bash",
+        "@mariozechner/pi-agent-core",
+        "@mariozechner/pi-ai",
+        "@chat-adapter/slack",
+        "@slack/web-api"
+      ])
+    ),
     outputFileTracingIncludes: {
       ...nextConfig?.outputFileTracingIncludes,
       "/*": mergedGlobalTracingIncludes
+    },
+    env: {
+      ...existingEnv,
+      JUNIOR_PLUGIN_PACKAGES: JSON.stringify(configuredPluginPackages)
     }
   };
-  if (options?.sentry) {
-    const { withSentryConfig } = require2("@sentry/nextjs");
-    return withSentryConfig(config, {
-      org: process.env.SENTRY_ORG,
-      project: process.env.SENTRY_PROJECT,
-      authToken: process.env.SENTRY_AUTH_TOKEN,
-      silent: !process.env.CI,
-      sourcemaps: {
-        disable: false
-      }
-    });
+  if (!sentryConfigured()) {
+    return config;
   }
-  return config;
+  const { withSentryConfig } = require2("@sentry/nextjs");
+  return withSentryConfig(config, {
+    org: process.env.SENTRY_ORG,
+    project: process.env.SENTRY_PROJECT,
+    authToken: process.env.SENTRY_AUTH_TOKEN,
+    silent: !process.env.CI,
+    sourcemaps: {
+      disable: false
+    }
+  });
 }
-function withJunior(nextConfig, options) {
+function withJunior(options, nextConfig) {
   if (typeof nextConfig === "function") {
     return async (phase, ctx) => {
       const resolved = await nextConfig(phase, ctx);

package/package.json

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