@agent-native/core 0.103.1 → 0.104.0

package/dist/ingestion/website.js

@@ -0,0 +1,100 @@
+import { extractCssColors, rankColorSamples } from "./media.js";
+export function extractStaticWebsiteContext(html, baseUrl) {
+    const title = decodeEntities(html.match(/<title\b[^>]*>([\s\S]*?)<\/title>/i)?.[1] ?? "").trim();
+    const assets = new Map();
+    const links = new Set();
+    for (const match of html.matchAll(/<(img|video|audio|script|link)\b[^>]*(?:src|href)=["']([^"']+)["'][^>]*>/gi)) {
+        const tag = match[1].toLowerCase();
+        const url = resolveUrl(match[2], baseUrl);
+        if (!url)
+            continue;
+        const kind = tag === "link"
+            ? /icon/i.test(match[0])
+                ? "image"
+                : /font/i.test(match[0])
+                    ? "font"
+                    : "stylesheet"
+            : tag === "img"
+                ? "image"
+                : tag;
+        if (["image", "video", "audio", "font", "stylesheet", "script"].includes(kind)) {
+            const role = /(?:alt|class|id|rel)=["'][^"']*(?:logo|wordmark|brandmark|icon)[^"']*["']/i.test(match[0])
+                ? "logo"
+                : undefined;
+            assets.set(url, {
+                url,
+                kind: kind,
+                ...(role ? { role } : {}),
+            });
+        }
+    }
+    for (const match of html.matchAll(/<meta\b[^>]*(?:property|name)=["'](?:og:image(?::url)?|twitter:image)["'][^>]*content=["']([^"']+)["'][^>]*>|<meta\b[^>]*content=["']([^"']+)["'][^>]*(?:property|name)=["'](?:og:image(?::url)?|twitter:image)["'][^>]*>/gi)) {
+        const url = resolveUrl(match[1] ?? match[2], baseUrl);
+        if (url)
+            assets.set(url, { url, kind: "image", role: "open-graph" });
+    }
+    for (const match of html.matchAll(/<a\b[^>]*href=["']([^"']+)["'][^>]*>/gi)) {
+        const url = resolveUrl(match[1], baseUrl);
+        if (url && new URL(url).origin === new URL(baseUrl).origin)
+            links.add(url);
+    }
+    const styleText = [...html.matchAll(/<style\b[^>]*>([\s\S]*?)<\/style>/gi)]
+        .map((match) => match[1])
+        .join("\n");
+    const cssVariables = Object.fromEntries([...styleText.matchAll(/(--[\w-]+)\s*:\s*([^;}{]+)/g)].map((match) => [
+        match[1],
+        match[2].trim(),
+    ]));
+    return {
+        title,
+        text: htmlToText(html),
+        assets: [...assets.values()],
+        internalLinks: [...links],
+        designTokens: {
+            colors: rankColorSamples(extractCssColors(styleText)),
+            typography: [],
+            spacing: uniqueMatches(styleText, /(?:margin|padding|gap)\s*:\s*([^;}{]+)/gi),
+            radii: uniqueMatches(styleText, /border-radius\s*:\s*([^;}{]+)/gi),
+            cssVariables,
+        },
+    };
+}
+function uniqueMatches(value, pattern) {
+    return [
+        ...new Set([...value.matchAll(pattern)].map((match) => match[1].trim())),
+    ].slice(0, 100);
+}
+function htmlToText(html) {
+    return decodeEntities(html
+        .replace(/<!--[\s\S]*?-->/g, " ")
+        .replace(/<(script|style|noscript|template)\b[^>]*>[\s\S]*?<\/\1>/gi, " ")
+        .replace(/<\s*br\s*\/?\s*>/gi, "\n")
+        .replace(/<\/(p|div|li|h[1-6]|section|article|main)>/gi, "\n")
+        .replace(/<[^>]+>/g, " "))
+        .replace(/[\t ]+/g, " ")
+        .replace(/ *\n */g, "\n")
+        .replace(/\n{3,}/g, "\n\n")
+        .trim();
+}
+function resolveUrl(value, baseUrl) {
+    try {
+        const url = new URL(decodeEntities(value), baseUrl);
+        if (url.protocol !== "http:" && url.protocol !== "https:")
+            return null;
+        url.hash = "";
+        return url.href;
+    }
+    catch {
+        return null;
+    }
+}
+function decodeEntities(value) {
+    return value
+        .replace(/&nbsp;/gi, " ")
+        .replace(/&amp;/gi, "&")
+        .replace(/&lt;/gi, "<")
+        .replace(/&gt;/gi, ">")
+        .replace(/&quot;/gi, '"')
+        .replace(/&#39;|&apos;/gi, "'");
+}
+//# sourceMappingURL=website.js.map

package/dist/ingestion/website.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/ingestion/website.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AA8BhE,MAAM,UAAU,2BAA2B,CACzC,IAAY,EACZ,OAAe;IAEf,MAAM,KAAK,GAAG,cAAc,CAC1B,IAAI,CAAC,KAAK,CAAC,oCAAoC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAC5D,CAAC,IAAI,EAAE,CAAC;IACT,MAAM,MAAM,GAAG,IAAI,GAAG,EAAwB,CAAC;IAC/C,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAC/B,4EAA4E,CAC7E,EAAE,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,MAAM,IAAI,GACR,GAAG,KAAK,MAAM;YACZ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACtB,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,YAAY;YAClB,CAAC,CAAC,GAAG,KAAK,KAAK;gBACb,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,GAAG,CAAC;QACZ,IAEI,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,CAC3D,CAAC,QAAQ,CAAC,IAAI,CAAC,EAChB,CAAC;YACD,MAAM,IAAI,GACR,4EAA4E,CAAC,IAAI,CAC/E,KAAK,CAAC,CAAC,CAAC,CACT;gBACC,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,SAAS,CAAC;YAChB,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE;gBACd,GAAG;gBACH,IAAI,EAAE,IAA4B;gBAClC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC1B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAC/B,6NAA6N,CAC9N,EAAE,CAAC;QACF,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACtD,IAAI,GAAG;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,wCAAwC,CAAC,EAAE,CAAC;QAC5E,MAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAI,GAAG,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM;YAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC;IACD,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAC;SACxE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACxB,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,MAAM,YAAY,GAAG,MAAM,CAAC,WAAW,CACrC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACpE,KAAK,CAAC,CAAC,CAAC;QACR,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;KAChB,CAAC,CACH,CAAC;IACF,OAAO;QACL,KAAK;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC;QACtB,MAAM,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5B,aAAa,EAAE,CAAC,GAAG,KAAK,CAAC;QACzB,YAAY,EAAE;YACZ,MAAM,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACrD,UAAU,EAAE,EAAE;YACd,OAAO,EAAE,aAAa,CACpB,SAAS,EACT,0CAA0C,CAC3C;YACD,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE,iCAAiC,CAAC;YAClE,YAAY;SACb;KACF,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,KAAa,EAAE,OAAe;IACnD,OAAO;QACL,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;KACzE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,cAAc,CACnB,IAAI;SACD,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC;SAChC,OAAO,CAAC,2DAA2D,EAAE,GAAG,CAAC;SACzE,OAAO,CAAC,oBAAoB,EAAE,IAAI,CAAC;SACnC,OAAO,CAAC,8CAA8C,EAAE,IAAI,CAAC;SAC7D,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAC5B;SACE,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;SACxB,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;SAC1B,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,OAAe;IAChD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QACpD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QACvE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;QACd,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,KAAK;SACT,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC;SACxB,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC;SACvB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;SACtB,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC;SACxB,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;AACpC,CAAC","sourcesContent":["import { extractCssColors, rankColorSamples } from \"./media.js\";\n\nexport interface WebsiteAsset {\n  url: string;\n  kind: \"image\" | \"video\" | \"audio\" | \"font\" | \"stylesheet\" | \"script\";\n  role?: \"logo\" | \"open-graph\";\n}\n\nexport interface WebsiteDesignTokens {\n  colors: string[];\n  typography: Array<{\n    family: string;\n    size: string;\n    weight: string;\n    lineHeight: string;\n    letterSpacing: string;\n  }>;\n  spacing: string[];\n  radii: string[];\n  cssVariables: Record<string, string>;\n}\n\nexport interface WebsiteExtraction {\n  title: string;\n  text: string;\n  assets: WebsiteAsset[];\n  internalLinks: string[];\n  designTokens: WebsiteDesignTokens;\n}\n\nexport function extractStaticWebsiteContext(\n  html: string,\n  baseUrl: string,\n): WebsiteExtraction {\n  const title = decodeEntities(\n    html.match(/<title\\b[^>]*>([\\s\\S]*?)<\\/title>/i)?.[1] ?? \"\",\n  ).trim();\n  const assets = new Map<string, WebsiteAsset>();\n  const links = new Set<string>();\n  for (const match of html.matchAll(\n    /<(img|video|audio|script|link)\\b[^>]*(?:src|href)=[\"']([^\"']+)[\"'][^>]*>/gi,\n  )) {\n    const tag = match[1].toLowerCase();\n    const url = resolveUrl(match[2], baseUrl);\n    if (!url) continue;\n    const kind =\n      tag === \"link\"\n        ? /icon/i.test(match[0])\n          ? \"image\"\n          : /font/i.test(match[0])\n            ? \"font\"\n            : \"stylesheet\"\n        : tag === \"img\"\n          ? \"image\"\n          : tag;\n    if (\n      (\n        [\"image\", \"video\", \"audio\", \"font\", \"stylesheet\", \"script\"] as string[]\n      ).includes(kind)\n    ) {\n      const role =\n        /(?:alt|class|id|rel)=[\"'][^\"']*(?:logo|wordmark|brandmark|icon)[^\"']*[\"']/i.test(\n          match[0],\n        )\n          ? \"logo\"\n          : undefined;\n      assets.set(url, {\n        url,\n        kind: kind as WebsiteAsset[\"kind\"],\n        ...(role ? { role } : {}),\n      });\n    }\n  }\n  for (const match of html.matchAll(\n    /<meta\\b[^>]*(?:property|name)=[\"'](?:og:image(?::url)?|twitter:image)[\"'][^>]*content=[\"']([^\"']+)[\"'][^>]*>|<meta\\b[^>]*content=[\"']([^\"']+)[\"'][^>]*(?:property|name)=[\"'](?:og:image(?::url)?|twitter:image)[\"'][^>]*>/gi,\n  )) {\n    const url = resolveUrl(match[1] ?? match[2], baseUrl);\n    if (url) assets.set(url, { url, kind: \"image\", role: \"open-graph\" });\n  }\n  for (const match of html.matchAll(/<a\\b[^>]*href=[\"']([^\"']+)[\"'][^>]*>/gi)) {\n    const url = resolveUrl(match[1], baseUrl);\n    if (url && new URL(url).origin === new URL(baseUrl).origin) links.add(url);\n  }\n  const styleText = [...html.matchAll(/<style\\b[^>]*>([\\s\\S]*?)<\\/style>/gi)]\n    .map((match) => match[1])\n    .join(\"\\n\");\n  const cssVariables = Object.fromEntries(\n    [...styleText.matchAll(/(--[\\w-]+)\\s*:\\s*([^;}{]+)/g)].map((match) => [\n      match[1],\n      match[2].trim(),\n    ]),\n  );\n  return {\n    title,\n    text: htmlToText(html),\n    assets: [...assets.values()],\n    internalLinks: [...links],\n    designTokens: {\n      colors: rankColorSamples(extractCssColors(styleText)),\n      typography: [],\n      spacing: uniqueMatches(\n        styleText,\n        /(?:margin|padding|gap)\\s*:\\s*([^;}{]+)/gi,\n      ),\n      radii: uniqueMatches(styleText, /border-radius\\s*:\\s*([^;}{]+)/gi),\n      cssVariables,\n    },\n  };\n}\n\nfunction uniqueMatches(value: string, pattern: RegExp): string[] {\n  return [\n    ...new Set([...value.matchAll(pattern)].map((match) => match[1].trim())),\n  ].slice(0, 100);\n}\n\nfunction htmlToText(html: string): string {\n  return decodeEntities(\n    html\n      .replace(/<!--[\\s\\S]*?-->/g, \" \")\n      .replace(/<(script|style|noscript|template)\\b[^>]*>[\\s\\S]*?<\\/\\1>/gi, \" \")\n      .replace(/<\\s*br\\s*\\/?\\s*>/gi, \"\\n\")\n      .replace(/<\\/(p|div|li|h[1-6]|section|article|main)>/gi, \"\\n\")\n      .replace(/<[^>]+>/g, \" \"),\n  )\n    .replace(/[\\t ]+/g, \" \")\n    .replace(/ *\\n */g, \"\\n\")\n    .replace(/\\n{3,}/g, \"\\n\\n\")\n    .trim();\n}\n\nfunction resolveUrl(value: string, baseUrl: string): string | null {\n  try {\n    const url = new URL(decodeEntities(value), baseUrl);\n    if (url.protocol !== \"http:\" && url.protocol !== \"https:\") return null;\n    url.hash = \"\";\n    return url.href;\n  } catch {\n    return null;\n  }\n}\n\nfunction decodeEntities(value: string): string {\n  return value\n    .replace(/&nbsp;/gi, \" \")\n    .replace(/&amp;/gi, \"&\")\n    .replace(/&lt;/gi, \"<\")\n    .replace(/&gt;/gi, \">\")\n    .replace(/&quot;/gi, '\"')\n    .replace(/&#39;|&apos;/gi, \"'\");\n}\n"]}

package/dist/integrations/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/integrations/plugin.ts"],"names":[],"mappings":"AA0IA,OAAO,KAAK,EAEV,yBAAyB,EAI1B,MAAM,YAAY,CAAC;AAOpB,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AA4F9D,KAAK,yBAAyB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAgCF,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,yBAAyB,GAClC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAsFlC;AA+ND;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,CAAC,EAAE,yBAAyB,GAClC,cAAc,CAipEhB;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,gBAA6B,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/integrations/plugin.ts"],"names":[],"mappings":"AA0IA,OAAO,KAAK,EAEV,yBAAyB,EAI1B,MAAM,YAAY,CAAC;AAOpB,KAAK,cAAc,GAAG,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AA4F9D,KAAK,yBAAyB,GAAG;IAC/B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAgCF,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,yBAAyB,GAClC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAsFlC;AA+ND;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,CAAC,EAAE,yBAAyB,GAClC,cAAc,CAypEhB;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,gBAA6B,CAAC"}

package/dist/integrations/plugin.js

@@ -1731,30 +1731,35 @@ export function createIntegrationsPlugin(options) {
                     error: err instanceof Error ? err.message : "Slack access denied",
                 };
             }
-            const clientId = await resolveSecret("SLACK_CLIENT_ID");
-            const clientSecret = await resolveSecret("SLACK_CLIENT_SECRET");
-            const signingSecret = await resolveSecret("SLACK_SIGNING_SECRET");
-            if (!clientId || !clientSecret || !signingSecret) {
-                setResponseStatus(event, 503);
-                return {
-                    error: "Slack OAuth is not configured. Add the Slack client id, client secret, and signing secret first.",
-                };
-            }
-            const redirectUri = resolveOAuthRedirectUri(event, `${P}/slack/oauth/callback`);
-            if (!redirectUri) {
-                setResponseStatus(event, 400);
-                return { error: "Slack OAuth redirect URL is not allowed." };
-            }
-            const query = getQuery(event);
-            const state = encodeOAuthState({
-                redirectUri,
-                owner: session.email,
+            return await runWithRequestContext({
+                userEmail: session.email,
                 orgId: org?.orgId ?? session.orgId ?? undefined,
-                app: "agent-native:slack",
-                addAccount: true,
-                returnUrl: typeof query.return === "string" ? query.return : "/messaging",
+            }, async () => {
+                const clientId = await resolveSecret("SLACK_CLIENT_ID");
+                const clientSecret = await resolveSecret("SLACK_CLIENT_SECRET");
+                const signingSecret = await resolveSecret("SLACK_SIGNING_SECRET");
+                if (!clientId || !clientSecret || !signingSecret) {
+                    setResponseStatus(event, 503);
+                    return {
+                        error: "Slack OAuth is not configured. Add the Slack client id, client secret, and signing secret first.",
+                    };
+                }
+                const redirectUri = resolveOAuthRedirectUri(event, `${P}/slack/oauth/callback`);
+                if (!redirectUri) {
+                    setResponseStatus(event, 400);
+                    return { error: "Slack OAuth redirect URL is not allowed." };
+                }
+                const query = getQuery(event);
+                const state = encodeOAuthState({
+                    redirectUri,
+                    owner: session.email,
+                    orgId: org?.orgId ?? session.orgId ?? undefined,
+                    app: "agent-native:slack",
+                    addAccount: true,
+                    returnUrl: typeof query.return === "string" ? query.return : "/messaging",
+                });
+                return sendRedirect(event, buildSlackAuthorizeUrl({ clientId, redirectUri, state }), 302);
             });
-            return sendRedirect(event, buildSlackAuthorizeUrl({ clientId, redirectUri, state }), 302);
         }));
         h3.use(`${P}/slack/oauth/callback`, defineEventHandler(async (event) => {
             if (getMethod(event) !== "GET") {
@@ -1788,15 +1793,15 @@ export function createIntegrationsPlugin(options) {
                     orgId: org?.orgId ?? session.orgId ?? null,
                     orgRole: org?.role ?? null,
                 });
-                const clientId = await resolveSecret("SLACK_CLIENT_ID");
-                const clientSecret = await resolveSecret("SLACK_CLIENT_SECRET");
-                if (!clientId || !clientSecret) {
-                    return oauthErrorPage("Slack OAuth is not configured.");
-                }
                 return await runWithRequestContext({
                     userEmail: access.ownerEmail,
                     orgId: access.orgId ?? undefined,
                 }, async () => {
+                    const clientId = await resolveSecret("SLACK_CLIENT_ID");
+                    const clientSecret = await resolveSecret("SLACK_CLIENT_SECRET");
+                    if (!clientId || !clientSecret) {
+                        return oauthErrorPage("Slack OAuth is not configured.");
+                    }
                     const oauth = await exchangeSlackOAuthCode({
                         code,
                         clientId,