[Improve] Make guided agent interactions reliable

apps/api/src/handlers/discord/request-user-input.ts

@@ -3,15 +3,21 @@ import {
   buildDiscordCancelledRequestUserInputText,
   getDiscordRequestUserInputCurrentQuestion,
   getPendingCommunicationRequestUserInput,
+  matchesDiscordRequestUserInputRequestToken,
   parseDiscordRequestUserInputAnswerCallbackData,
   parseDiscordRequestUserInputCancelCallbackData,
+  rebindPendingCommunicationRequestUserInputRun,
   submitPendingCommunicationRequestUserInputAnswer,
   type PendingCommunicationRequestUserInput,
 } from '@roomote/communication';
 import type { DiscordInteraction } from '@roomote/communication/discord-event';
 import type { DiscordCommunicationProvider } from '@roomote/communication/discord-provider';
-import { type AcpRequestUserInputAnswers } from '@roomote/types';
+import {
+  TaskPayloadKind,
+  type AcpRequestUserInputAnswers,
+} from '@roomote/types';
 import { setTrustedRunActingUserOnSuccess } from '@roomote/db/server';
+import { findActiveCommunicationTaskRun } from '@roomote/sdk/server/communication';
 
 import { apiLogger } from '../../logging.js';
 import { replyToDiscordEvent } from './replies.js';
@@ -186,7 +192,7 @@ export async function tryHandleDiscordRequestUserInputCallback(params: {
   }
 
   const conversationId = conversationIdForChannel(params.channel);
-  const pendingRequest = await getPendingCommunicationRequestUserInput(
+  let pendingRequest = await getPendingCommunicationRequestUserInput(
     'discord',
     conversationId,
   );
@@ -207,10 +213,15 @@ export async function tryHandleDiscordRequestUserInputCallback(params: {
     return true;
   }
 
-  const expectedToken = pendingRequest.requestId.slice(-8);
   const receivedToken =
     answerCallback?.requestToken ?? cancelCallback?.requestToken;
-  if (receivedToken !== expectedToken) {
+  if (
+    !receivedToken ||
+    !matchesDiscordRequestUserInputRequestToken(
+      pendingRequest.requestId,
+      receivedToken,
+    )
+  ) {
     await replyToDiscordEvent({
       provider: params.provider,
       applicationId: params.applicationId,
@@ -225,6 +236,75 @@ export async function tryHandleDiscordRequestUserInputCallback(params: {
     return true;
   }
 
+  const activeRun = await findActiveCommunicationTaskRun({
+    provider: 'discord',
+    channelId: params.channel.parentChannelId ?? params.channel.channelId,
+    ...(params.channel.parentChannelId
+      ? { threadId: params.channel.channelId }
+      : {}),
+    taskId: pendingRequest.taskId,
+  });
+  if (!activeRun) {
+    await replyToDiscordEvent({
+      provider: params.provider,
+      applicationId: params.applicationId,
+      channel: params.channel,
+      interaction: {
+        interaction: params.interaction,
+        interactionDeferred: params.interactionDeferred,
+      },
+      text: 'This prompt is no longer active.',
+      ephemeral: true,
+    });
+    return true;
+  }
+
+  if (activeRun.id !== pendingRequest.runId) {
+    const sourceRunId =
+      activeRun.payloadKind === TaskPayloadKind.SnapshotResume &&
+      activeRun.payload &&
+      typeof activeRun.payload === 'object'
+        ? (activeRun.payload as { sourceRunId?: unknown }).sourceRunId
+        : undefined;
+    if (sourceRunId !== pendingRequest.runId) {
+      await replyToDiscordEvent({
+        provider: params.provider,
+        applicationId: params.applicationId,
+        channel: params.channel,
+        interaction: {
+          interaction: params.interaction,
+          interactionDeferred: params.interactionDeferred,
+        },
+        text: 'This prompt is no longer active.',
+        ephemeral: true,
+      });
+      return true;
+    }
+
+    const rebound = await rebindPendingCommunicationRequestUserInputRun({
+      provider: 'discord',
+      conversationId,
+      taskId: pendingRequest.taskId,
+      sourceRunId: pendingRequest.runId,
+      resumedRunId: activeRun.id,
+    });
+    if (!rebound) {
+      await replyToDiscordEvent({
+        provider: params.provider,
+        applicationId: params.applicationId,
+        channel: params.channel,
+        interaction: {
+          interaction: params.interaction,
+          interactionDeferred: params.interactionDeferred,
+        },
+        text: 'This prompt is no longer active.',
+        ephemeral: true,
+      });
+      return true;
+    }
+    pendingRequest = { ...pendingRequest, runId: activeRun.id };
+  }
+
   if (pendingRequest.status === 'submitted') {
     await postAlreadyReceivedNotice({
       provider: params.provider,

apps/docs/self-hosting.mdx

@@ -202,6 +202,19 @@ recommendations. Detailed provider instructions and credential entry open in a
 dialog from the source-control card; Roomote never asks for credentials in
 chat.
 
+The conversation also asks briefly about the tools your team uses for
+documents, monitoring, and project tracking, one topic at a time.
+You can skip these questions. The optional integrations card lists only supported
+tools you said you use and opens their secure configuration without leaving setup.
+If there are no eligible matches, setup moves on without showing suggestions.
+Tools without a built-in connector are not presented as supported. Use
+**Keep going** to move on without connecting; you can connect tools later in
+Settings. Integration choices do not change the starter tasks offered.
+Services that are also source-control, communications, inference, or sandbox
+providers are excluded from this optional step; their separate setup is unchanged.
+The Vercel deployments integration remains available separately from Vercel AI
+Gateway inference.
+
 Setup completes once inference and a sandbox provider are ready, source control
 is successfully configured, and at least one repository has synchronized.
 Roomote then offers preselected starter tasks in one structured multi-select