@inkeep/agents-work-apps 0.53.0 → 0.53.1

package/dist/env.d.ts

@@ -14,11 +14,11 @@ declare const envSchema: z.ZodObject<{
     pentest: "pentest";
   }>>;
   LOG_LEVEL: z.ZodDefault<z.ZodEnum<{
+    error: "error";
     trace: "trace";
     debug: "debug";
     info: "info";
     warn: "warn";
-    error: "error";
   }>>;
   INKEEP_AGENTS_RUN_DATABASE_URL: z.ZodOptional<z.ZodString>;
   INKEEP_AGENTS_MANAGE_UI_URL: z.ZodOptional<z.ZodString>;
@@ -44,7 +44,7 @@ declare const envSchema: z.ZodObject<{
 declare const env: {
   NODE_ENV: "development" | "production" | "test";
   ENVIRONMENT: "development" | "production" | "test" | "pentest";
-  LOG_LEVEL: "trace" | "debug" | "info" | "warn" | "error";
+  LOG_LEVEL: "error" | "trace" | "debug" | "info" | "warn";
   INKEEP_AGENTS_RUN_DATABASE_URL?: string | undefined;
   INKEEP_AGENTS_MANAGE_UI_URL?: string | undefined;
   GITHUB_APP_ID?: string | undefined;

package/dist/github/mcp/index.d.ts

@@ -1,11 +1,11 @@
 import { Hono } from "hono";
-import * as hono_types0 from "hono/types";
+import * as hono_types7 from "hono/types";
 
 //#region src/github/mcp/index.d.ts
 declare const app: Hono<{
   Variables: {
     toolId: string;
   };
-}, hono_types0.BlankSchema, "/">;
+}, hono_types7.BlankSchema, "/">;
 //#endregion
 export { app as default };

package/dist/github/mcp/index.js

@@ -331,7 +331,8 @@ const getServer = async (toolId) => {
 		repo: z.string().describe("Repository name"),
 		from_branch: z.string().optional().describe("Branch to create from (defaults to default branch)")
 	}, async ({ owner, repo, from_branch }) => {
-		const branch_name = `docs-writer-ai-update-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
+		const suffix = Math.random().toString(36).slice(2, 8);
+		const branch_name = `docs-writer-ai-update-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}-${suffix}`;
 		try {
 			const githubClient = getGitHubClientFromRepo(owner, repo, installationIdMap);
 			const repoInfo = await githubClient.rest.repos.get({

package/dist/github/routes/setup.d.ts

@@ -1,7 +1,7 @@
 import { Hono } from "hono";
-import * as hono_types4 from "hono/types";
+import * as hono_types5 from "hono/types";
 
 //#region src/github/routes/setup.d.ts
-declare const app: Hono<hono_types4.BlankEnv, hono_types4.BlankSchema, "/">;
+declare const app: Hono<hono_types5.BlankEnv, hono_types5.BlankSchema, "/">;
 //#endregion
 export { app as default };

package/dist/github/routes/tokenExchange.d.ts

@@ -1,7 +1,7 @@
 import { Hono } from "hono";
-import * as hono_types6 from "hono/types";
+import * as hono_types8 from "hono/types";
 
 //#region src/github/routes/tokenExchange.d.ts
-declare const app: Hono<hono_types6.BlankEnv, hono_types6.BlankSchema, "/">;
+declare const app: Hono<hono_types8.BlankEnv, hono_types8.BlankSchema, "/">;
 //#endregion
 export { app as default };

package/dist/github/routes/webhooks.d.ts

@@ -1,5 +1,5 @@
 import { Hono } from "hono";
-import * as hono_types8 from "hono/types";
+import * as hono_types3 from "hono/types";
 
 //#region src/github/routes/webhooks.d.ts
 interface WebhookVerificationResult {
@@ -7,6 +7,6 @@ interface WebhookVerificationResult {
   error?: string;
 }
 declare function verifyWebhookSignature(payload: string, signature: string | undefined, secret: string): WebhookVerificationResult;
-declare const app: Hono<hono_types8.BlankEnv, hono_types8.BlankSchema, "/">;
+declare const app: Hono<hono_types3.BlankEnv, hono_types3.BlankSchema, "/">;
 //#endregion
 export { WebhookVerificationResult, app as default, verifyWebhookSignature };

package/dist/slack/dispatcher.js

@@ -62,6 +62,7 @@ async function dispatchSlackEvent(eventType, payload, options, span) {
 				slackUserId: event.user,
 				channel: event.channel,
 				text: question,
+				attachments: event.attachments,
 				threadTs: event.thread_ts || event.ts || "",
 				messageTs: event.ts || "",
 				teamId,

package/dist/slack/routes/users.js

@@ -2,8 +2,9 @@ import { getLogger } from "../../logger.js";
 import runDbClient_default from "../../db/runDbClient.js";
 import { createConnectSession } from "../services/nango.js";
 import "../services/index.js";
+import { resumeSmartLinkIntent } from "../services/resume-intent.js";
 import { OpenAPIHono, z } from "@hono/zod-openapi";
-import { createWorkAppSlackUserMapping, deleteWorkAppSlackUserMapping, findWorkAppSlackUserMapping, findWorkAppSlackUserMappingByInkeepUserId, isUniqueConstraintError, verifySlackLinkToken } from "@inkeep/agents-core";
+import { createWorkAppSlackUserMapping, deleteWorkAppSlackUserMapping, findWorkAppSlackUserMapping, findWorkAppSlackUserMappingByInkeepUserId, flushTraces, getWaitUntil, isUniqueConstraintError, verifySlackLinkToken } from "@inkeep/agents-core";
 import { createProtectedRoute, inheritedWorkAppsAuth } from "@inkeep/agents-core/middleware";
 
 //#region src/slack/routes/users.ts
@@ -105,8 +106,13 @@ app.openapi(createProtectedRoute({
 	try {
 		const verifyResult = await verifySlackLinkToken(body.token);
 		if (!verifyResult.valid || !verifyResult.payload) {
-			logger.warn({ error: verifyResult.error }, "Invalid link token");
-			return c.json({ error: verifyResult.error || "Invalid or expired link token. Please run /inkeep link in Slack to get a new one." }, 400);
+			const isExpired = verifyResult.error?.includes("\"exp\" claim timestamp check failed");
+			const errorMessage = isExpired ? "Token expired. Please run /inkeep link in Slack to get a new one." : verifyResult.error || "Invalid or expired link token. Please run /inkeep link in Slack to get a new one.";
+			logger.warn({
+				error: verifyResult.error,
+				isExpired
+			}, "Invalid link token");
+			return c.json({ error: errorMessage }, 400);
 		}
 		const { tenantId, slack } = verifyResult.payload;
 		const { teamId, userId: slackUserId, enterpriseId, username } = slack;
@@ -157,6 +163,26 @@ app.openapi(createProtectedRoute({
 			inkeepUserId: body.userId,
 			linkId: slackUserMapping.id
 		}, "Successfully linked Slack user to Inkeep account via JWT token");
+		const { intent } = verifyResult.payload;
+		if (intent) {
+			logger.info({
+				event: "smart_link_intent_resume_triggered",
+				entryPoint: intent.entryPoint,
+				questionLength: intent.question.length
+			}, "Smart link intent detected in verify-token");
+			const resumeWork = resumeSmartLinkIntent({
+				intent,
+				teamId,
+				slackUserId,
+				inkeepUserId,
+				tenantId,
+				slackEnterpriseId: enterpriseId,
+				slackUsername: username
+			}).catch((error) => logger.error({ error }, "Resume smart link intent failed")).finally(() => flushTraces());
+			const waitUntil = await getWaitUntil();
+			if (waitUntil) waitUntil(resumeWork);
+			else logger.warn({ entryPoint: intent.entryPoint }, "waitUntil not available, resume work may not complete");
+		}
 		return c.json({
 			success: true,
 			linkId: slackUserMapping.id,

package/dist/slack/services/agent-resolution.d.ts

@@ -8,6 +8,7 @@
 /** Configuration for a resolved agent */
 interface ResolvedAgentConfig {
   projectId: string;
+  projectName?: string;
   agentId: string;
   agentName?: string;
   source: 'channel' | 'workspace' | 'none';

package/dist/slack/services/agent-resolution.js

@@ -1,7 +1,7 @@
 import { getLogger } from "../../logger.js";
 import runDbClient_default from "../../db/runDbClient.js";
 import { getWorkspaceDefaultAgentFromNango } from "./nango.js";
-import { fetchAgentsForProject } from "./events/utils.js";
+import { fetchAgentsForProject, fetchProjectsForTenant } from "./events/utils.js";
 import { findWorkAppSlackChannelAgentConfig } from "@inkeep/agents-core";
 
 //#region src/slack/services/agent-resolution.ts
@@ -41,6 +41,35 @@ async function lookupAgentName(tenantId, projectId, agentId) {
 	}
 	return agents.find((a) => a.id === agentId)?.name || void 0;
 }
+const PROJECT_NAME_CACHE_TTL_MS = 300 * 1e3;
+const PROJECT_NAME_CACHE_MAX_SIZE = 200;
+const projectNameCache = /* @__PURE__ */ new Map();
+async function lookupProjectName(tenantId, projectId) {
+	const cacheKey = `${tenantId}:${projectId}`;
+	const cached = projectNameCache.get(cacheKey);
+	if (cached && cached.expiresAt > Date.now()) return cached.name || void 0;
+	const projects = await fetchProjectsForTenant(tenantId);
+	for (const project of projects) {
+		const key = `${tenantId}:${project.id}`;
+		projectNameCache.set(key, {
+			name: project.name || null,
+			expiresAt: Date.now() + PROJECT_NAME_CACHE_TTL_MS
+		});
+	}
+	if (projectNameCache.size > PROJECT_NAME_CACHE_MAX_SIZE) {
+		const now = Date.now();
+		for (const [key, entry] of projectNameCache) if (entry.expiresAt <= now) projectNameCache.delete(key);
+		if (projectNameCache.size > PROJECT_NAME_CACHE_MAX_SIZE) {
+			const excess = projectNameCache.size - PROJECT_NAME_CACHE_MAX_SIZE;
+			const keys = projectNameCache.keys();
+			for (let i = 0; i < excess; i++) {
+				const { value } = keys.next();
+				if (value) projectNameCache.delete(value);
+			}
+		}
+	}
+	return projects.find((p) => p.id === projectId)?.name || void 0;
+}
 /**
 * Resolve the effective agent configuration.
 * Priority: Channel default > Workspace default
@@ -83,6 +112,7 @@ async function resolveEffectiveAgent(params) {
 			}, "Resolved agent from workspace config");
 			result = {
 				projectId: workspaceConfig.projectId,
+				projectName: workspaceConfig.projectName,
 				agentId: workspaceConfig.agentId,
 				agentName: workspaceConfig.agentName,
 				source: "workspace",
@@ -100,6 +130,10 @@ async function resolveEffectiveAgent(params) {
 			}, "Enriched agent config with name from manage API");
 		}
 	}
+	if (result && !result.projectName) {
+		const projectName = await lookupProjectName(tenantId, result.projectId);
+		if (projectName) result.projectName = projectName;
+	}
 	if (!result) logger.debug({
 		tenantId,
 		teamId,
@@ -130,6 +164,7 @@ async function getAgentConfigSources(params) {
 	const wsConfig = await getWorkspaceDefaultAgentFromNango(teamId);
 	if (wsConfig?.agentId && wsConfig.projectId) workspaceConfig = {
 		projectId: wsConfig.projectId,
+		projectName: wsConfig.projectName,
 		agentId: wsConfig.agentId,
 		agentName: wsConfig.agentName,
 		source: "workspace",
@@ -140,6 +175,10 @@ async function getAgentConfigSources(params) {
 		const name = await lookupAgentName(tenantId, effective.projectId, effective.agentId);
 		if (name) effective.agentName = name;
 	}
+	if (effective && !effective.projectName) {
+		const projectName = await lookupProjectName(tenantId, effective.projectId);
+		if (projectName) effective.projectName = projectName;
+	}
 	return {
 		channelConfig,
 		workspaceConfig,

package/dist/slack/services/blocks/index.d.ts

@@ -53,18 +53,25 @@ interface AgentConfigSources {
   channelConfig: {
     agentName?: string;
     agentId: string;
+    projectId: string;
+    projectName?: string;
   } | null;
   workspaceConfig: {
     agentName?: string;
     agentId: string;
+    projectId: string;
+    projectName?: string;
   } | null;
   effective: {
     agentName?: string;
     agentId: string;
+    projectId: string;
+    projectName?: string;
     source: string;
   } | null;
 }
 declare function createStatusMessage(email: string, linkedAt: string, dashboardUrl: string, agentConfigs: AgentConfigSources): Readonly<slack_block_builder0.SlackMessageDto>;
+declare function createSmartLinkMessage(linkUrl: string): Readonly<slack_block_builder0.SlackMessageDto>;
 interface ToolApprovalButtonValue {
   toolCallId: string;
   conversationId: string;
@@ -143,7 +150,6 @@ declare function buildCitationsBlock(citations: Array<{
   title?: string;
   url?: string;
 }>): any[];
-declare function createJwtLinkMessage(linkUrl: string, expiresInMinutes: number): Readonly<slack_block_builder0.SlackMessageDto>;
 declare function createCreateInkeepAccountMessage(acceptUrl: string, expiresInMinutes: number): Readonly<slack_block_builder0.SlackMessageDto>;
 //#endregion
-export { AgentConfigSources, ContextBlockParams, FollowUpButtonParams, ToolApprovalButtonValue, ToolApprovalButtonValueSchema, buildCitationsBlock, buildConversationResponseBlocks, buildDataArtifactBlocks, buildDataComponentBlocks, buildFollowUpButton, buildSummaryBreadcrumbBlock, buildToolApprovalBlocks, buildToolApprovalDoneBlocks, buildToolApprovalExpiredBlocks, buildToolOutputErrorBlock, createAlreadyLinkedMessage, createContextBlock, createCreateInkeepAccountMessage, createErrorMessage, createJwtLinkMessage, createNotLinkedMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage };
+export { AgentConfigSources, ContextBlockParams, FollowUpButtonParams, ToolApprovalButtonValue, ToolApprovalButtonValueSchema, buildCitationsBlock, buildConversationResponseBlocks, buildDataArtifactBlocks, buildDataComponentBlocks, buildFollowUpButton, buildSummaryBreadcrumbBlock, buildToolApprovalBlocks, buildToolApprovalDoneBlocks, buildToolApprovalExpiredBlocks, buildToolOutputErrorBlock, createAlreadyLinkedMessage, createContextBlock, createCreateInkeepAccountMessage, createErrorMessage, createNotLinkedMessage, createSmartLinkMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage };

package/dist/slack/services/blocks/index.js

@@ -67,10 +67,32 @@ function createNotLinkedMessage() {
 }
 function createStatusMessage(email, linkedAt, dashboardUrl, agentConfigs) {
 	const { effective } = agentConfigs;
+	const baseUrl = dashboardUrl.replace(/\/work-apps\/slack$/, "");
 	let agentLine;
-	if (effective) agentLine = `${Md.bold("Agent:")} ${effective.agentName || effective.agentId}`;
-	else agentLine = `${Md.bold("Agent:")} None configured\n${Md.italic("Ask your admin to set up an agent in the dashboard.")}`;
-	return Message().blocks(Blocks.Section().text(Md.bold("Connected to Inkeep") + `\n\n${Md.bold("Account:")} ${email}\n${Md.bold("Linked:")} ${new Date(linkedAt).toLocaleDateString()}\n` + agentLine), Blocks.Actions().elements(Elements.Button().text(SlackStrings.buttons.openDashboard).url(dashboardUrl).actionId("open_dashboard"))).buildToObject();
+	let projectLine;
+	if (effective) {
+		const agentDisplayName = effective.agentName || effective.agentId;
+		const agentUrl = `${baseUrl}/projects/${effective.projectId}/agents/${effective.agentId}`;
+		agentLine = `${Md.bold("Agent:")} <${agentUrl}|${agentDisplayName}>`;
+		const projectDisplayName = effective.projectName || effective.projectId;
+		const projectUrl = `${baseUrl}/projects/${effective.projectId}/agents`;
+		projectLine = `${Md.bold("Project:")} <${projectUrl}|${projectDisplayName}>`;
+	} else {
+		agentLine = `${Md.bold("Agent:")} None configured\n${Md.italic("Ask your admin to set up an agent in the dashboard.")}`;
+		projectLine = "";
+	}
+	const lines = [
+		Md.bold("Connected to Inkeep"),
+		"",
+		`${Md.bold("Account:")} ${email}`,
+		`${Md.bold("Linked:")} ${new Date(linkedAt).toLocaleDateString()}`,
+		agentLine
+	];
+	if (projectLine) lines.push(projectLine);
+	return Message().blocks(Blocks.Section().text(lines.join("\n")), Blocks.Actions().elements(Elements.Button().text(SlackStrings.buttons.openDashboard).url(dashboardUrl).actionId("open_dashboard"))).buildToObject();
+}
+function createSmartLinkMessage(linkUrl) {
+	return Message().blocks(Blocks.Section().text("To get started, let's connect your Inkeep account with Slack."), Blocks.Actions().elements(Elements.Button().text("Link Account").url(linkUrl).actionId("smart_link_account").primary()), Blocks.Context().elements("🕐 This only needs to happen once.")).buildToObject();
 }
 const ToolApprovalButtonValueSchema = z.object({
 	toolCallId: z.string(),
@@ -297,12 +319,9 @@ function buildCitationsBlock(citations) {
 		}
 	}];
 }
-function createJwtLinkMessage(linkUrl, expiresInMinutes) {
-	return Message().blocks(Blocks.Section().text(`${Md.bold("Link your Inkeep account")}\n\nConnect your Slack and Inkeep accounts to use Inkeep agents.`), Blocks.Actions().elements(Elements.Button().text("Link Account").url(linkUrl).actionId("link_account").primary()), Blocks.Context().elements(`This link expires in ${expiresInMinutes} minutes.`)).buildToObject();
-}
 function createCreateInkeepAccountMessage(acceptUrl, expiresInMinutes) {
 	return Message().blocks(Blocks.Section().text(`${Md.bold("Create your Inkeep account")}\n\nYou've been invited to join Inkeep. Create an account to start using Inkeep agents in Slack.`), Blocks.Actions().elements(Elements.Button().text("Create Account").url(acceptUrl).actionId("create_account").primary()), Blocks.Context().elements(`This link expires in ${expiresInMinutes} minutes.`)).buildToObject();
 }
 
 //#endregion
-export { ToolApprovalButtonValueSchema, buildCitationsBlock, buildConversationResponseBlocks, buildDataArtifactBlocks, buildDataComponentBlocks, buildFollowUpButton, buildSummaryBreadcrumbBlock, buildToolApprovalBlocks, buildToolApprovalDoneBlocks, buildToolApprovalExpiredBlocks, buildToolOutputErrorBlock, createAlreadyLinkedMessage, createContextBlock, createCreateInkeepAccountMessage, createErrorMessage, createJwtLinkMessage, createNotLinkedMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage };
+export { ToolApprovalButtonValueSchema, buildCitationsBlock, buildConversationResponseBlocks, buildDataArtifactBlocks, buildDataComponentBlocks, buildFollowUpButton, buildSummaryBreadcrumbBlock, buildToolApprovalBlocks, buildToolApprovalDoneBlocks, buildToolApprovalExpiredBlocks, buildToolOutputErrorBlock, createAlreadyLinkedMessage, createContextBlock, createCreateInkeepAccountMessage, createErrorMessage, createNotLinkedMessage, createSmartLinkMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage };

package/dist/slack/services/commands/index.d.ts

@@ -11,7 +11,7 @@ declare function handleHelpCommand(): Promise<SlackCommandResponse>;
  * Similar to @mention behavior in channels
  */
 declare function handleAgentPickerCommand(payload: SlackCommandPayload, tenantId: string, workspaceConnection?: SlackWorkspaceConnection | null): Promise<SlackCommandResponse>;
-declare function handleQuestionCommand(payload: SlackCommandPayload, question: string, _dashboardUrl: string, tenantId: string): Promise<SlackCommandResponse>;
+declare function handleQuestionCommand(payload: SlackCommandPayload, question: string, _dashboardUrl: string, tenantId: string, botToken: string): Promise<SlackCommandResponse>;
 declare function handleCommand(payload: SlackCommandPayload): Promise<SlackCommandResponse>;
 //#endregion
 export { handleAgentPickerCommand, handleCommand, handleHelpCommand, handleLinkCommand, handleQuestionCommand, handleStatusCommand, handleUnlinkCommand };

package/dist/slack/services/commands/index.js

@@ -5,131 +5,32 @@ import { findWorkspaceConnectionByTeamId } from "../nango.js";
 import { extractApiErrorMessage, fetchAgentsForProject, fetchProjectsForTenant, getChannelAgentConfig, sendResponseUrlMessage } from "../events/utils.js";
 import { resolveEffectiveAgent } from "../agent-resolution.js";
 import { SlackStrings } from "../../i18n/strings.js";
-import { createAlreadyLinkedMessage, createContextBlock, createCreateInkeepAccountMessage, createErrorMessage, createJwtLinkMessage, createNotLinkedMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage } from "../blocks/index.js";
+import { createAlreadyLinkedMessage, createContextBlock, createErrorMessage, createNotLinkedMessage, createStatusMessage, createUnlinkSuccessMessage, createUpdatedHelpMessage } from "../blocks/index.js";
 import { getSlackClient } from "../client.js";
+import { buildLinkPromptMessage, resolveUnlinkedUserAction } from "../link-prompt.js";
 import { buildAgentSelectorModal } from "../modals.js";
-import { createInvitationInDb, deleteWorkAppSlackUserMapping, findWorkAppSlackUserMapping, findWorkAppSlackUserMappingBySlackUser, findWorkAppSlackWorkspaceByTeamId, flushTraces, getInProcessFetch, getOrganizationMemberByEmail, getPendingInvitationsByEmail, getWaitUntil, signSlackLinkToken, signSlackUserToken } from "@inkeep/agents-core";
+import { deleteWorkAppSlackUserMapping, findWorkAppSlackUserMapping, findWorkAppSlackUserMappingBySlackUser, flushTraces, getInProcessFetch, getWaitUntil, signSlackUserToken } from "@inkeep/agents-core";
 
 //#region src/slack/services/commands/index.ts
 const DEFAULT_CLIENT_ID = "work-apps-slack";
-const LINK_CODE_TTL_MINUTES = 10;
 const logger = getLogger("slack-commands");
-/**
-* Create an invitation for a Slack user who doesn't have an Inkeep account yet.
-* Returns the invitation ID and email so the caller can direct the user
-* to the accept-invitation page.
-*
-* Returns null if:
-* - Workspace doesn't have shouldAllowJoinFromWorkspace enabled
-* - User already has an Inkeep account (JWT link flow is sufficient)
-* - Service account is not configured
-*/
-async function tryAutoInvite(payload, tenantId, botToken) {
-	try {
-		if (!(await findWorkAppSlackWorkspaceByTeamId(runDbClient_default)(tenantId, payload.teamId))?.shouldAllowJoinFromWorkspace) return null;
-		const slackClient = getSlackClient(botToken);
-		let userEmail;
-		try {
-			userEmail = (await slackClient.users.info({ user: payload.userId })).user?.profile?.email;
-		} catch (error) {
-			logger.warn({
-				error,
-				userId: payload.userId
-			}, "Failed to get user info from Slack");
-			return null;
-		}
-		if (!userEmail) {
-			logger.warn({ userId: payload.userId }, "No email found in Slack user profile");
-			return null;
-		}
-		if (await getOrganizationMemberByEmail(runDbClient_default)(tenantId, userEmail)) {
-			logger.debug({
-				userId: payload.userId,
-				email: userEmail
-			}, "User already has Inkeep account, skipping auto-invite");
-			return null;
-		}
-		const existingInvitation = (await getPendingInvitationsByEmail(runDbClient_default)(userEmail)).find((inv) => inv.organizationId === tenantId);
-		if (existingInvitation) {
-			logger.info({
-				userId: payload.userId,
-				tenantId,
-				invitationId: existingInvitation.id,
-				email: userEmail
-			}, "Reusing existing pending invitation for Slack user");
-			return {
-				invitationId: existingInvitation.id,
-				email: userEmail
-			};
-		}
-		const invitation = await createInvitationInDb(runDbClient_default)({
-			organizationId: tenantId,
-			email: userEmail
-		});
-		logger.info({
-			userId: payload.userId,
-			tenantId,
-			invitationId: invitation.id,
-			email: userEmail
-		}, "Invitation created for Slack user without Inkeep account");
-		return {
-			invitationId: invitation.id,
-			email: userEmail
-		};
-	} catch (error) {
-		logger.warn({
-			error,
-			userId: payload.userId,
-			tenantId
-		}, "Auto-invite attempt failed");
-		return null;
-	}
-}
 async function handleLinkCommand(payload, dashboardUrl, tenantId, botToken) {
 	const existingLink = await findWorkAppSlackUserMapping(runDbClient_default)(tenantId, payload.userId, payload.teamId, DEFAULT_CLIENT_ID);
 	if (existingLink) return {
 		response_type: "ephemeral",
 		...createAlreadyLinkedMessage(existingLink.slackEmail || existingLink.slackUsername || "Unknown", existingLink.linkedAt, dashboardUrl)
 	};
-	if (botToken) {
-		const autoInvite = await tryAutoInvite(payload, tenantId, botToken);
-		if (autoInvite) {
-			const manageUiUrl = env.INKEEP_AGENTS_MANAGE_UI_URL || "http://localhost:3000";
-			const linkToken = await signSlackLinkToken({
+	try {
+		return {
+			response_type: "ephemeral",
+			...buildLinkPromptMessage(await resolveUnlinkedUserAction({
 				tenantId,
-				slackTeamId: payload.teamId,
+				teamId: payload.teamId,
 				slackUserId: payload.userId,
+				botToken: botToken || "",
 				slackEnterpriseId: payload.enterpriseId,
 				slackUsername: payload.userName
-			});
-			const linkReturnUrl = `/link?token=${encodeURIComponent(linkToken)}`;
-			const acceptUrl = `${manageUiUrl}/accept-invitation/${autoInvite.invitationId}?email=${encodeURIComponent(autoInvite.email)}&returnUrl=${encodeURIComponent(linkReturnUrl)}`;
-			logger.info({
-				invitationId: autoInvite.invitationId,
-				email: autoInvite.email
-			}, "Directing new user to accept-invitation page with link returnUrl");
-			return {
-				response_type: "ephemeral",
-				...createCreateInkeepAccountMessage(acceptUrl, LINK_CODE_TTL_MINUTES)
-			};
-		}
-	}
-	try {
-		const linkToken = await signSlackLinkToken({
-			tenantId,
-			slackTeamId: payload.teamId,
-			slackUserId: payload.userId,
-			slackEnterpriseId: payload.enterpriseId,
-			slackUsername: payload.userName
-		});
-		const linkUrl = `${env.INKEEP_AGENTS_MANAGE_UI_URL || "http://localhost:3000"}/link?token=${encodeURIComponent(linkToken)}`;
-		logger.info({
-			slackUserId: payload.userId,
-			tenantId
-		}, "Generated JWT link token");
-		return {
-			response_type: "ephemeral",
-			...createJwtLinkMessage(linkUrl, LINK_CODE_TTL_MINUTES)
+			}))
 		};
 	} catch (error) {
 		logger.error({
@@ -278,23 +179,27 @@ async function handleAgentPickerCommand(payload, tenantId, workspaceConnection)
 		};
 	}
 }
-async function generateLinkCodeWithIntent(payload, tenantId) {
+async function generateLinkCodeWithIntent(payload, tenantId, botToken, intent) {
 	try {
-		const linkToken = await signSlackLinkToken({
+		const linkResult = await resolveUnlinkedUserAction({
 			tenantId,
-			slackTeamId: payload.teamId,
+			teamId: payload.teamId,
 			slackUserId: payload.userId,
+			botToken,
 			slackEnterpriseId: payload.enterpriseId,
-			slackUsername: payload.userName
+			slackUsername: payload.userName,
+			intent
 		});
-		const linkUrl = `${env.INKEEP_AGENTS_MANAGE_UI_URL || "http://localhost:3000"}/link?token=${encodeURIComponent(linkToken)}`;
-		logger.info({
-			slackUserId: payload.userId,
-			tenantId
-		}, "Generated JWT link token with intent");
+		if (!!intent) logger.info({
+			event: "smart_link_intent_captured",
+			entryPoint: intent.entryPoint,
+			linkType: linkResult.type,
+			questionLength: intent.question.length,
+			channelId: payload.channelId
+		}, "Smart link intent captured");
 		return {
 			response_type: "ephemeral",
-			...createJwtLinkMessage(linkUrl, LINK_CODE_TTL_MINUTES)
+			...buildLinkPromptMessage(linkResult)
 		};
 	} catch (error) {
 		logger.error({
@@ -308,9 +213,14 @@ async function generateLinkCodeWithIntent(payload, tenantId) {
 		};
 	}
 }
-async function handleQuestionCommand(payload, question, _dashboardUrl, tenantId) {
+async function handleQuestionCommand(payload, question, _dashboardUrl, tenantId, botToken) {
 	const existingLink = await findWorkAppSlackUserMappingBySlackUser(runDbClient_default)(payload.userId, payload.teamId, DEFAULT_CLIENT_ID);
-	if (!existingLink) return generateLinkCodeWithIntent(payload, tenantId);
+	if (!existingLink) return generateLinkCodeWithIntent(payload, tenantId, botToken, {
+		entryPoint: "question_command",
+		question: question.slice(0, 2e3),
+		channelId: payload.channelId,
+		responseUrl: payload.responseUrl
+	});
 	const userTenantId = existingLink.tenantId;
 	const resolvedAgent = await resolveEffectiveAgent({
 		tenantId: userTenantId,
@@ -464,7 +374,7 @@ async function handleCommand(payload) {
 		case "disconnect": return handleUnlinkCommand(payload, tenantId);
 		case "help": return handleHelpCommand();
 		case "": return handleAgentPickerCommand(payload, tenantId, workspaceConnection);
-		default: return handleQuestionCommand(payload, text, dashboardUrl, tenantId);
+		default: return handleQuestionCommand(payload, text, dashboardUrl, tenantId, workspaceConnection.botToken);
 	}
 }
 

package/dist/slack/services/events/app-mention.d.ts

@@ -1,18 +1,7 @@
+import { SlackAttachment } from "./utils.js";
+
 //#region src/slack/services/events/app-mention.d.ts
-/**
- * Handler for Slack @mention events
- *
- * Flow:
- * 1. Resolve workspace connection (single lookup, cached)
- * 2. Parallel: resolve agent config + check user link
- * 3. If no agent configured → prompt to set up in dashboard
- * 4. If not linked → prompt to link account
- * 5. Handle based on context:
- *    - Channel + no query → Show usage hint
- *    - Channel + query → Execute agent with streaming response
- *    - Thread + no query → Auto-execute agent with thread context as query
- *    - Thread + query → Execute agent with thread context included
- */
+
 /**
  * Metadata passed to the agent selector modal via button value
  */
@@ -32,6 +21,7 @@ declare function handleAppMention(params: {
   slackUserId: string;
   channel: string;
   text: string;
+  attachments?: SlackAttachment[];
   threadTs: string;
   messageTs: string;
   teamId: string;