Skip to content

The open alternative to Salesforce, designed for AI.

feat(slack): store the agent chat thread on the Slack request (#28070)

Abdul Rahmance39b20ba10d
diff --git a/packages/twenty-apps/public/slack/package.json b/packages/twenty-apps/public/slack/package.json
index ca4976f7c34..e4d6b8b39ca 100644
--- a/packages/twenty-apps/public/slack/package.json
+++ b/packages/twenty-apps/public/slack/package.json
@@ -1,6 +1,6 @@
{
"name": "@twentyhq/slack",
- "version": "1.8.0",
+ "version": "1.9.0",
"description": "Slack assistant and workflow steps for Twenty",
"license": "MIT",
"engines": {
@@ -41,8 +41,8 @@
"oxlint": "^0.16.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "twenty-client-sdk": "^2.42.0",
- "twenty-sdk": "^2.42.0",
+ "twenty-client-sdk": "^2.46.0",
+ "twenty-sdk": "^2.46.0",
"twenty-ui": "^1.0.0-alpha.1",
"typescript": "^5.9.3",
"vite-tsconfig-paths": "^4.2.1",
diff --git a/packages/twenty-apps/public/slack/src/__tests__/slack-assistant-worker.integration-test.ts b/packages/twenty-apps/public/slack/src/__tests__/slack-assistant-worker.integration-test.ts
index b80a44d9f04..50647a88725 100644
--- a/packages/twenty-apps/public/slack/src/__tests__/slack-assistant-worker.integration-test.ts
+++ b/packages/twenty-apps/public/slack/src/__tests__/slack-assistant-worker.integration-test.ts
@@ -23,6 +23,7 @@ const CHANNEL_ID = 'C0WORKERTEST';
const DIRECT_MESSAGE_CHANNEL_ID = 'D0WORKERTEST';
const REQUESTER_USER_ID = 'U0REQUESTER';
const CONFIRMED_MEMBER_EMAIL = '[email protected]';
+const AGENT_CHAT_THREAD_ID = '7e4b1d4a-2c3f-4a5b-9c8d-1e2f3a4b5c6d';
type SlackAssistantRequestRecordFields = {
id?: string;
@@ -30,6 +31,7 @@ type SlackAssistantRequestRecordFields = {
requestText?: string | null;
responseText?: string | null;
errorMessage?: string | null;
+ agentChatThreadId?: string | null;
};
type WorkerRecord = Parameters<typeof slackAssistantWorkerHandler>[0];
@@ -105,6 +107,7 @@ describe('Slack assistant worker', () => {
requestText: true,
responseText: true,
errorMessage: true,
+ agentChatThreadId: true,
},
});
@@ -225,6 +228,7 @@ describe('Slack assistant worker', () => {
});
appRuntime.setAgentResult({
+ threadId: AGENT_CHAT_THREAD_ID,
success: true,
result: { response: 'Acme has 3 open deals.' },
error: null,
@@ -315,6 +319,7 @@ describe('Slack assistant worker', () => {
expect.objectContaining({
status: SLACK_ASSISTANT_REQUEST_STATUS.DONE,
responseText: 'Acme has 3 open deals.',
+ agentChatThreadId: AGENT_CHAT_THREAD_ID,
}),
);
@@ -474,6 +479,7 @@ describe('Slack assistant worker', () => {
});
appRuntime.setAgentResult({
+ threadId: AGENT_CHAT_THREAD_ID,
success: false,
result: null,
error: 'Agent is not available',
@@ -508,6 +514,7 @@ describe('Slack assistant worker', () => {
expect.objectContaining({
status: SLACK_ASSISTANT_REQUEST_STATUS.FAILED,
errorMessage: 'Agent is not available',
+ agentChatThreadId: AGENT_CHAT_THREAD_ID,
}),
);
});
diff --git a/packages/twenty-apps/public/slack/src/__tests__/types/app-runtime-mock.type.ts b/packages/twenty-apps/public/slack/src/__tests__/types/app-runtime-mock.type.ts
index 80e6dc746be..c268e410a7d 100644
--- a/packages/twenty-apps/public/slack/src/__tests__/types/app-runtime-mock.type.ts
+++ b/packages/twenty-apps/public/slack/src/__tests__/types/app-runtime-mock.type.ts
@@ -7,12 +7,20 @@ import {
import { type AppKeyValueScope } from 'src/__tests__/types/app-key-value-scope.type';
+export type AppRuntimeAgentResult = Pick<
+ RunAgentResult,
+ 'success' | 'result' | 'error'
+> &
+ Partial<Pick<RunAgentResult, 'threadId'>>;
+
export type AppRuntimeMock = {
handlers: RequestHandler[];
workspaceId: string;
setConnections: (connections: AppConnection[]) => void;
setAgentResult: (
- implementation: RunAgentResult | ((input: RunAgentInput) => RunAgentResult),
+ implementation:
+ | AppRuntimeAgentResult
+ | ((input: RunAgentInput) => AppRuntimeAgentResult),
) => void;
readonly agentRuns: RunAgentInput[];
readonly lastAgentMessages: NonNullable<RunAgentInput['messages']>;
diff --git a/packages/twenty-apps/public/slack/src/__tests__/utils/create-app-runtime-mock.util.ts b/packages/twenty-apps/public/slack/src/__tests__/utils/create-app-runtime-mock.util.ts
index 1c1a80645d7..578d8a1b776 100644
--- a/packages/twenty-apps/public/slack/src/__tests__/utils/create-app-runtime-mock.util.ts
+++ b/packages/twenty-apps/public/slack/src/__tests__/utils/create-app-runtime-mock.util.ts
@@ -1,3 +1,5 @@
+import { randomUUID } from 'node:crypto';
+
import { http, HttpResponse, passthrough, type RequestHandler } from 'msw';
import {
type AppConnection,
@@ -7,7 +9,10 @@ import {
import { isDefined } from 'twenty-sdk/utils';
import { type AppKeyValueScope } from 'src/__tests__/types/app-key-value-scope.type';
-import { type AppRuntimeMock } from 'src/__tests__/types/app-runtime-mock.type';
+import {
+ type AppRuntimeAgentResult,
+ type AppRuntimeMock,
+} from 'src/__tests__/types/app-runtime-mock.type';
// The app runtime services (`kv`, `listConnections`, `getConnection`,
// `runAgent`) are GraphQL calls the server only answers for an
@@ -34,6 +39,21 @@ type StoredKeyValueEntry = {
workspaceId: string | null;
};
+const DEFAULT_AGENT_RESULT: AppRuntimeAgentResult = {
+ success: true,
+ result: { response: 'Agent answer.' },
+ error: null,
+};
+
+const completeAgentResult = ({
+ threadId = randomUUID(),
+ ...agentResult
+}: AppRuntimeAgentResult): RunAgentResult => ({
+ threadId,
+ status: agentResult.success ? 'COMPLETED' : 'FAILED',
+ ...agentResult,
+});
+
export const createAppRuntimeMock = ({
apiUrl,
workspaceId,
@@ -44,11 +64,7 @@ export const createAppRuntimeMock = ({
let agentRuns: RunAgentInput[] = [];
let runAgentImplementation: (
input: RunAgentInput,
- ) => RunAgentResult = () => ({
- success: true,
- result: { response: 'Agent answer.' },
- error: null,
- });
+ ) => AppRuntimeAgentResult = () => DEFAULT_AGENT_RESULT;
const getKeyValue = (key: string, scope: AppKeyValueScope): unknown => {
const entry = keyValueStore.get(buildKeyValueStoreKey(key, scope));
@@ -186,7 +202,9 @@ export const createAppRuntimeMock = ({
agentRuns.push(input);
return HttpResponse.json({
- data: { runAgent: runAgentImplementation(input) },
+ data: {
+ runAgent: completeAgentResult(runAgentImplementation(input)),
+ },
});
}
default:
@@ -220,8 +238,8 @@ export const createAppRuntimeMock = ({
setAgentResult: (
implementation:
- | RunAgentResult
- | ((input: RunAgentInput) => RunAgentResult),
+ | AppRuntimeAgentResult
+ | ((input: RunAgentInput) => AppRuntimeAgentResult),
): void => {
runAgentImplementation =
typeof implementation === 'function'
@@ -258,11 +276,7 @@ export const createAppRuntimeMock = ({
appConnections = connections;
keyValueStore = new Map();
agentRuns = [];
- runAgentImplementation = () => ({
- success: true,
- result: { response: 'Agent answer.' },
- error: null,
- });
+ runAgentImplementation = () => DEFAULT_AGENT_RESULT;
},
};
};
diff --git a/packages/twenty-apps/public/slack/src/constants/universal-identifiers.ts b/packages/twenty-apps/public/slack/src/constants/universal-identifiers.ts
index 0cd11ab943e..6e984dfec44 100644
--- a/packages/twenty-apps/public/slack/src/constants/universal-identifiers.ts
+++ b/packages/twenty-apps/public/slack/src/constants/universal-identifiers.ts
@@ -130,6 +130,9 @@ export const SLACK_ASSISTANT_REQUEST_ERROR_FIELD_UNIVERSAL_IDENTIFIER =
export const SLACK_ASSISTANT_REQUEST_FEEDBACK_RATING_FIELD_UNIVERSAL_IDENTIFIER =
'9b7d83e1-e526-474b-8d93-dad5c0a4a6aa';
+export const SLACK_ASSISTANT_REQUEST_AGENT_CHAT_THREAD_ID_FIELD_UNIVERSAL_IDENTIFIER =
+ '6113868b-467f-41cd-9736-a977077f9947';
+
export const SLACK_ASSISTANT_REQUEST_SLACK_MESSAGE_INDEX_UNIVERSAL_IDENTIFIER =
'486c87fe-c557-4dd1-a7ec-133e4e0324ae';
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/constants/slack-assistant-deadline-run-result.ts b/packages/twenty-apps/public/slack/src/logic-functions/constants/slack-assistant-deadline-run-result.ts
new file mode 100644
index 00000000000..f8004d80659
--- /dev/null
+++ b/packages/twenty-apps/public/slack/src/logic-functions/constants/slack-assistant-deadline-run-result.ts
@@ -0,0 +1,10 @@
+import { SLACK_ASSISTANT_DEADLINE_ERROR } from 'src/logic-functions/constants/slack-assistant-deadline-error';
+import { type SlackAssistantAgentRunResult } from 'src/logic-functions/types/slack-assistant-agent-run-result.type';
+
+export const SLACK_ASSISTANT_DEADLINE_RUN_RESULT: SlackAssistantAgentRunResult =
+ {
+ threadId: null,
+ result: null,
+ error: SLACK_ASSISTANT_DEADLINE_ERROR,
+ success: false,
+ };
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/data/update-slack-assistant-request.ts b/packages/twenty-apps/public/slack/src/logic-functions/data/update-slack-assistant-request.ts
index f9829de0edb..f6a4cccb9db 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/data/update-slack-assistant-request.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/data/update-slack-assistant-request.ts
@@ -11,12 +11,14 @@ export const updateSlackAssistantRequest = async (
responseText,
errorMessage,
workspaceMemberId,
+ agentChatThreadId,
}: {
id: string;
status?: SlackAssistantRequestStatus;
responseText?: string;
errorMessage?: string;
workspaceMemberId?: string;
+ agentChatThreadId?: string;
},
): Promise<void> => {
await client.mutation({
@@ -28,6 +30,7 @@ export const updateSlackAssistantRequest = async (
...(isDefined(responseText) ? { responseText } : {}),
...(isDefined(errorMessage) ? { errorMessage } : {}),
...(isDefined(workspaceMemberId) ? { workspaceMemberId } : {}),
+ ...(isDefined(agentChatThreadId) ? { agentChatThreadId } : {}),
},
},
id: true,
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/__tests__/slack-deliver-message-handler.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/__tests__/slack-deliver-message-handler.test.ts
index 3c2da3c7d95..34514428f0d 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/__tests__/slack-deliver-message-handler.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/__tests__/slack-deliver-message-handler.test.ts
@@ -38,12 +38,14 @@ vi.mock('twenty-client-sdk/core', () => ({
const CHANNEL_ID = 'C0123456789';
const REQUEST_ID = '7b1a0f2e-1c2d-4a3b-9e8f-0a1b2c3d4e5f';
+const AGENT_CHAT_THREAD_ID = '7e4b1d4a-2c3f-4a5b-9c8d-1e2f3a4b5c6d';
const ANSWER_PAYLOAD = {
slackChannelId: CHANNEL_ID,
messageText: 'here is your answer',
parentMessageTimestamp: '1700000000.000100',
slackAssistantRequestId: REQUEST_ID,
+ agentChatThreadId: AGENT_CHAT_THREAD_ID,
};
describe('slackDeliverMessageHandler', () => {
@@ -71,6 +73,7 @@ describe('slackDeliverMessageHandler', () => {
id: REQUEST_ID,
status: 'DONE',
responseText: 'here is your answer',
+ agentChatThreadId: AGENT_CHAT_THREAD_ID,
});
expect(enqueueDeliveryMock).not.toHaveBeenCalled();
});
@@ -123,6 +126,7 @@ describe('slackDeliverMessageHandler', () => {
requestId: REQUEST_ID,
slackChannelId: CHANNEL_ID,
parentMessageTimestamp: '1700000000.000100',
+ agentChatThreadId: AGENT_CHAT_THREAD_ID,
}),
);
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
index 8533aa07379..3b2f764a905 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-assistant-worker-handler.ts
@@ -79,6 +79,8 @@ export const slackAssistantWorkerHandler = async (
parentMessageTimestamp,
};
+ let agentChatThreadId: string | undefined;
+
const stopStatusUpdates = startSlackAssistantStatusUpdates({
slackChannelId,
threadTimestamp: parentMessageTimestamp,
@@ -229,9 +231,13 @@ export const slackAssistantWorkerHandler = async (
deadlineAtMs: agentDeadlineAtMs,
}).finally(() => stopStatusUpdates());
+ agentChatThreadId = agentResult.threadId ?? undefined;
+
+ const agentRunFailureContext = { ...failureContext, agentChatThreadId };
+
if (!agentResult.success) {
return await finishSlackAssistantRequestWithFailure({
- ...failureContext,
+ ...agentRunFailureContext,
errorMessage: agentResult.error ?? 'Agent execution failed',
});
}
@@ -240,7 +246,7 @@ export const slackAssistantWorkerHandler = async (
if (responseText === undefined) {
return await finishSlackAssistantRequestWithFailure({
- ...failureContext,
+ ...agentRunFailureContext,
errorMessage: SLACK_ASSISTANT_EMPTY_RESPONSE_ERROR,
});
}
@@ -269,7 +275,7 @@ export const slackAssistantWorkerHandler = async (
if (!deliveryResult.success && !isDefined(deferredRetryAfterSeconds)) {
return await finishSlackAssistantRequestWithFailure({
- ...failureContext,
+ ...agentRunFailureContext,
errorMessage: buildSlackAnswerDeliveryFailureMessage(deliveryResult),
responseText,
});
@@ -277,7 +283,11 @@ export const slackAssistantWorkerHandler = async (
if (isDefined(deferredRetryAfterSeconds)) {
await enqueueSlackMessageDelivery({
- payload: { ...answerMessage, slackAssistantRequestId: record.id },
+ payload: {
+ ...answerMessage,
+ slackAssistantRequestId: record.id,
+ agentChatThreadId: agentResult.threadId,
+ },
retryAfterSeconds: deferredRetryAfterSeconds,
});
} else {
@@ -285,6 +295,7 @@ export const slackAssistantWorkerHandler = async (
id: record.id,
status: SLACK_ASSISTANT_REQUEST_STATUS.DONE,
responseText,
+ agentChatThreadId: agentResult.threadId,
});
}
@@ -311,6 +322,7 @@ export const slackAssistantWorkerHandler = async (
return await finishSlackAssistantRequestWithFailure({
...failureContext,
+ agentChatThreadId,
errorMessage:
error instanceof Error ? error.message : 'Unexpected worker error',
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-deliver-message-handler.ts b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-deliver-message-handler.ts
index d5ce99b8a01..9634c16cb56 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-deliver-message-handler.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/handlers/slack-deliver-message-handler.ts
@@ -14,7 +14,12 @@ import { sendSlackMessage } from 'src/logic-functions/utils/send-slack-message';
export const slackDeliverMessageHandler = async (
payload: SlackDeliverMessagePayload,
): Promise<SlackDeliverMessageResult> => {
- const { attempt = 1, slackAssistantRequestId, ...message } = payload;
+ const {
+ attempt = 1,
+ slackAssistantRequestId,
+ agentChatThreadId,
+ ...message
+ } = payload;
const result = await sendSlackMessage(message, {
waitOutRateLimit: false,
@@ -25,6 +30,7 @@ export const slackDeliverMessageHandler = async (
? await markSlackAssistantRequestDone({
requestId: slackAssistantRequestId,
responseText: message.messageText,
+ agentChatThreadId,
})
: true;
@@ -56,6 +62,7 @@ export const slackDeliverMessageHandler = async (
parentMessageTimestamp: message.parentMessageTimestamp,
errorMessage: failureMessage,
responseText: message.messageText,
+ agentChatThreadId,
});
}
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/types/slack-assistant-agent-run-result.type.ts b/packages/twenty-apps/public/slack/src/logic-functions/types/slack-assistant-agent-run-result.type.ts
new file mode 100644
index 00000000000..1988f5829d1
--- /dev/null
+++ b/packages/twenty-apps/public/slack/src/logic-functions/types/slack-assistant-agent-run-result.type.ts
@@ -0,0 +1,5 @@
+import { type RunAgentResult } from 'twenty-sdk/logic-function';
+
+export type SlackAssistantAgentRunResult =
+ | RunAgentResult
+ | { threadId: null; result: null; error: string; success: false };
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/types/slack-deliver-message-payload.type.ts b/packages/twenty-apps/public/slack/src/logic-functions/types/slack-deliver-message-payload.type.ts
index fa2fe155979..33bbf1a2b70 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/types/slack-deliver-message-payload.type.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/types/slack-deliver-message-payload.type.ts
@@ -3,4 +3,5 @@ import { type SlackPostMessageInput } from 'src/logic-functions/types/slack-post
export type SlackDeliverMessagePayload = SlackPostMessageInput & {
attempt?: number;
slackAssistantRequestId?: string;
+ agentChatThreadId?: string;
};
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/race-slack-assistant-agent-deadline.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/race-slack-assistant-agent-deadline.test.ts
index 484201e2cb0..96ed3e1beef 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/race-slack-assistant-agent-deadline.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/race-slack-assistant-agent-deadline.test.ts
@@ -1,9 +1,12 @@
+import { type RunAgentResult } from 'twenty-sdk/logic-function';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { SLACK_ASSISTANT_DEADLINE_ERROR } from 'src/logic-functions/constants/slack-assistant-deadline-error';
import { raceSlackAssistantAgentDeadline } from 'src/logic-functions/utils/race-slack-assistant-agent-deadline';
-const AGENT_RESULT = {
+const AGENT_RESULT: RunAgentResult = {
+ threadId: '7e4b1d4a-2c3f-4a5b-9c8d-1e2f3a4b5c6d',
+ status: 'COMPLETED',
result: { text: 'Acme has 3 open deals' },
error: null,
success: true,
@@ -36,6 +39,7 @@ describe('raceSlackAssistantAgentDeadline', () => {
await vi.advanceTimersByTimeAsync(10_000);
await expect(race).resolves.toEqual({
+ threadId: null,
result: null,
error: SLACK_ASSISTANT_DEADLINE_ERROR,
success: false,
@@ -73,6 +77,7 @@ describe('raceSlackAssistantAgentDeadline', () => {
await vi.advanceTimersByTimeAsync(0);
await expect(race).resolves.toEqual({
+ threadId: null,
result: null,
error: SLACK_ASSISTANT_DEADLINE_ERROR,
success: false,
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/run-slack-assistant-agent-with-deadline.test.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/run-slack-assistant-agent-with-deadline.test.ts
index b4918d1f409..50ceccc0ad5 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/run-slack-assistant-agent-with-deadline.test.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/__tests__/run-slack-assistant-agent-with-deadline.test.ts
@@ -32,6 +32,7 @@ describe('runSlackAssistantAgentWithDeadline', () => {
});
expect(result).toEqual({
+ threadId: null,
result: null,
error: SLACK_ASSISTANT_DEADLINE_ERROR,
success: false,
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/extract-agent-response-text.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/extract-agent-response-text.ts
index e1728edba1e..f1bddf4a0b5 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/extract-agent-response-text.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/extract-agent-response-text.ts
@@ -1,5 +1,6 @@
import { isNonEmptyString } from '@sniptt/guards';
-import { type RunAgentResult } from 'twenty-sdk/logic-function';
+
+import { type SlackAssistantAgentRunResult } from 'src/logic-functions/types/slack-assistant-agent-run-result.type';
const SLACK_ASSISTANT_EMPTY_RESPONSE_FALLBACK_TEXT =
'Done. I finished the requested action, but did not get a text summary back from the model.';
@@ -8,7 +9,7 @@ const hasResponseText = (result: object): result is { response: string } =>
'response' in result && typeof result.response === 'string';
export const extractAgentResponseText = (
- agentResult: RunAgentResult,
+ agentResult: SlackAssistantAgentRunResult,
): string | undefined => {
if (!agentResult.success || agentResult.result === null) {
return undefined;
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/finish-slack-assistant-request-with-failure.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/finish-slack-assistant-request-with-failure.ts
index 14da759c3f0..3f4bd32148f 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/finish-slack-assistant-request-with-failure.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/finish-slack-assistant-request-with-failure.ts
@@ -17,6 +17,7 @@ export const finishSlackAssistantRequestWithFailure = async ({
parentMessageTimestamp,
errorMessage,
responseText,
+ agentChatThreadId,
}: {
client: CoreApiClient;
requestId: string;
@@ -24,6 +25,7 @@ export const finishSlackAssistantRequestWithFailure = async ({
parentMessageTimestamp: string;
errorMessage: string;
responseText?: string;
+ agentChatThreadId?: string;
}): Promise<SlackAssistantRequestFailureResult> => {
await slackPostMessageHandler({
slackChannelId,
@@ -36,6 +38,7 @@ export const finishSlackAssistantRequestWithFailure = async ({
status: SLACK_ASSISTANT_REQUEST_STATUS.FAILED,
errorMessage,
responseText,
+ agentChatThreadId,
});
return { failed: true, reason: errorMessage };
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/mark-slack-assistant-request-done.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/mark-slack-assistant-request-done.ts
index 3a78a023166..4d035b72169 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/mark-slack-assistant-request-done.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/mark-slack-assistant-request-done.ts
@@ -8,15 +8,18 @@ import { toErrorMessage } from 'src/logic-functions/utils/to-error-message.util'
export const markSlackAssistantRequestDone = async ({
requestId,
responseText,
+ agentChatThreadId,
}: {
requestId: string;
responseText: string;
+ agentChatThreadId?: string;
}): Promise<boolean> => {
try {
await updateSlackAssistantRequest(new CoreApiClient(), {
id: requestId,
status: SLACK_ASSISTANT_REQUEST_STATUS.DONE,
responseText,
+ agentChatThreadId,
});
return true;
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/race-slack-assistant-agent-deadline.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/race-slack-assistant-agent-deadline.ts
index 16d7327415e..b1a5c5c35fd 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/race-slack-assistant-agent-deadline.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/race-slack-assistant-agent-deadline.ts
@@ -1,6 +1,7 @@
import { type RunAgentResult } from 'twenty-sdk/logic-function';
-import { SLACK_ASSISTANT_DEADLINE_ERROR } from 'src/logic-functions/constants/slack-assistant-deadline-error';
+import { SLACK_ASSISTANT_DEADLINE_RUN_RESULT } from 'src/logic-functions/constants/slack-assistant-deadline-run-result';
+import { type SlackAssistantAgentRunResult } from 'src/logic-functions/types/slack-assistant-agent-run-result.type';
import { runWithTimeout } from 'src/logic-functions/utils/run-with-timeout';
export const raceSlackAssistantAgentDeadline = async ({
@@ -9,13 +10,9 @@ export const raceSlackAssistantAgentDeadline = async ({
}: {
agentRun: Promise<RunAgentResult>;
deadlineAtMs: number;
-}): Promise<RunAgentResult> =>
- await runWithTimeout({
+}): Promise<SlackAssistantAgentRunResult> =>
+ await runWithTimeout<SlackAssistantAgentRunResult>({
operation: agentRun,
timeoutMs: Math.max(deadlineAtMs - Date.now(), 0),
- buildTimeoutValue: () => ({
- result: null,
- error: SLACK_ASSISTANT_DEADLINE_ERROR,
- success: false,
- }),
+ buildTimeoutValue: () => SLACK_ASSISTANT_DEADLINE_RUN_RESULT,
});
diff --git a/packages/twenty-apps/public/slack/src/logic-functions/utils/run-slack-assistant-agent-with-deadline.ts b/packages/twenty-apps/public/slack/src/logic-functions/utils/run-slack-assistant-agent-with-deadline.ts
index cb205009d54..37dfd3035bf 100644
--- a/packages/twenty-apps/public/slack/src/logic-functions/utils/run-slack-assistant-agent-with-deadline.ts
+++ b/packages/twenty-apps/public/slack/src/logic-functions/utils/run-slack-assistant-agent-with-deadline.ts
@@ -1,11 +1,8 @@
-import {
- runAgent,
- type RunAgentInput,
- type RunAgentResult,
-} from 'twenty-sdk/logic-function';
+import { runAgent, type RunAgentInput } from 'twenty-sdk/logic-function';
-import { SLACK_ASSISTANT_DEADLINE_ERROR } from 'src/logic-functions/constants/slack-assistant-deadline-error';
+import { SLACK_ASSISTANT_DEADLINE_RUN_RESULT } from 'src/logic-functions/constants/slack-assistant-deadline-run-result';
import { type SlackAssistantAgentMessage } from 'src/logic-functions/types/slack-assistant-agent-message.type';
+import { type SlackAssistantAgentRunResult } from 'src/logic-functions/types/slack-assistant-agent-run-result.type';
import { raceSlackAssistantAgentDeadline } from 'src/logic-functions/utils/race-slack-assistant-agent-deadline';
type RunSlackAssistantAgentInput = Pick<
@@ -14,7 +11,7 @@ type RunSlackAssistantAgentInput = Pick<
> & {
runAsWorkspaceMemberId: string;
messages: SlackAssistantAgentMessage[];
- thread: { key: string; title?: string };
+ thread: NonNullable<RunAgentInput['thread']>;
deadlineAtMs: number;
};
@@ -24,24 +21,18 @@ export const runSlackAssistantAgentWithDeadline = async ({
runAsWorkspaceMemberId,
thread,
deadlineAtMs,
-}: RunSlackAssistantAgentInput): Promise<RunAgentResult> => {
+}: RunSlackAssistantAgentInput): Promise<SlackAssistantAgentRunResult> => {
if (deadlineAtMs - Date.now() <= 0) {
- return {
- result: null,
- error: SLACK_ASSISTANT_DEADLINE_ERROR,
- success: false,
- };
+ return SLACK_ASSISTANT_DEADLINE_RUN_RESULT;
}
- const input: RunAgentInput & Pick<RunSlackAssistantAgentInput, 'thread'> = {
- agentUniversalIdentifier,
- messages,
- runAsWorkspaceMemberId,
- thread,
- };
-
return await raceSlackAssistantAgentDeadline({
- agentRun: runAgent(input),
+ agentRun: runAgent({
+ agentUniversalIdentifier,
+ messages,
+ runAsWorkspaceMemberId,
+ thread,
+ }),
deadlineAtMs,
});
};
diff --git a/packages/twenty-apps/public/slack/src/objects/slack-assistant-request.object.ts b/packages/twenty-apps/public/slack/src/objects/slack-assistant-request.object.ts
index 282348dca40..9af1e26a9ba 100644
--- a/packages/twenty-apps/public/slack/src/objects/slack-assistant-request.object.ts
+++ b/packages/twenty-apps/public/slack/src/objects/slack-assistant-request.object.ts
@@ -7,6 +7,7 @@ import {
} from 'twenty-sdk/define';
import {
+ SLACK_ASSISTANT_REQUEST_AGENT_CHAT_THREAD_ID_FIELD_UNIVERSAL_IDENTIFIER,
SLACK_ASSISTANT_REQUEST_CHANNEL_ID_FIELD_UNIVERSAL_IDENTIFIER,
SLACK_ASSISTANT_REQUEST_CHANNEL_TYPE_FIELD_UNIVERSAL_IDENTIFIER,
SLACK_ASSISTANT_REQUEST_ERROR_FIELD_UNIVERSAL_IDENTIFIER,
@@ -219,5 +220,16 @@ export default defineObject({
],
name: 'feedbackRating',
},
+ {
+ universalIdentifier:
+ SLACK_ASSISTANT_REQUEST_AGENT_CHAT_THREAD_ID_FIELD_UNIVERSAL_IDENTIFIER,
+ type: FieldType.UUID,
+ label: 'Agent chat thread ID',
+ description:
+ 'Agent chat thread holding the conversation of the Slack thread',
+ icon: 'IconMessage',
+ name: 'agentChatThreadId',
+ isNullable: true,
+ },
],
});
diff --git a/packages/twenty-apps/public/slack/yarn.lock b/packages/twenty-apps/public/slack/yarn.lock
index 2461a30f524..870ff78608e 100644
--- a/packages/twenty-apps/public/slack/yarn.lock
+++ b/packages/twenty-apps/public/slack/yarn.lock
@@ -1475,8 +1475,8 @@ __metadata:
oxlint: "npm:^0.16.0"
react: "npm:^18.2.0"
react-dom: "npm:^18.2.0"
- twenty-client-sdk: "npm:^2.42.0"
- twenty-sdk: "npm:^2.42.0"
+ twenty-client-sdk: "npm:^2.46.0"
+ twenty-sdk: "npm:^2.46.0"
twenty-ui: "npm:^1.0.0-alpha.1"
typescript: "npm:^5.9.3"
vite-tsconfig-paths: "npm:^4.2.1"
@@ -3333,10 +3333,15 @@ __metadata:
languageName: node
linkType: hard
-"preact@npm:^10.28.3":
- version: 10.29.1
- resolution: "preact@npm:10.29.1"
- checksum: 10c0/55da3994d0d9ebcc26476552c6571f8be1150cccdafe842aad40eff9abc84c867555f6d01db386fc63ac4cbe9f9da245002468bb24df0642365162d8f1b545e2
+"preact@npm:^11.0.0":
+ version: 11.0.1
+ resolution: "preact@npm:11.0.1"
+ peerDependencies:
+ preact-render-to-string: ">=6.7.0"
+ peerDependenciesMeta:
+ preact-render-to-string:
+ optional: true
+ checksum: 10c0/b1d0db9f9b9ef6468004104e0f22ccd4e0b9e21ed06d3918738b4db9c09d82a300af20eddc618875ff14e4d37191e0cc0785cf0796cbc1e6d29fca4d3ffdb4fd
languageName: node
linkType: hard
@@ -4073,22 +4078,22 @@ __metadata:
languageName: node
linkType: hard
-"twenty-client-sdk@npm:2.42.0, twenty-client-sdk@npm:^2.42.0":
- version: 2.42.0
- resolution: "twenty-client-sdk@npm:2.42.0"
+"twenty-client-sdk@npm:2.47.0, twenty-client-sdk@npm:^2.46.0":
+ version: 2.47.0
+ resolution: "twenty-client-sdk@npm:2.47.0"
dependencies:
"@genql/runtime": "npm:^2.10.0"
esbuild: "npm:^0.28.1"
graphql: "npm:^16.8.1"
lodash: "npm:^4.17.21"
prettier: "npm:^3.8.3"
- checksum: 10c0/38f77595ffc2bb365cef23a30d7ab7096fcf129d407921bb97497327da27526e9721ba6a1a16d299bd9b3a2e3f0eeac3fb41ec360c0547e7a2c0f0c044cc570b
+ checksum: 10c0/9feb12441b49f3d437ff4f71b42acda369eefbe0e1e1cf620f4ca0c5aa22ad05d9783b3abf87404a3f2b8e670be8df56972e307716b9d452b09ee957e05414fa
languageName: node
linkType: hard
-"twenty-sdk@npm:^2.42.0":
- version: 2.42.0
- resolution: "twenty-sdk@npm:2.42.0"
+"twenty-sdk@npm:^2.46.0":
+ version: 2.47.0
+ resolution: "twenty-sdk@npm:2.47.0"
dependencies:
"@sniptt/guards": "npm:^0.2.0"
axios: "npm:^1.16.0"
@@ -4101,18 +4106,18 @@ __metadata:
ink: "npm:^6.8.0"
inquirer: "npm:^14.0.0"
jsonc-parser: "npm:^3.2.0"
- preact: "npm:^10.28.3"
+ preact: "npm:^11.0.0"
react: "npm:^19.2.0"
react-dom: "npm:^19.2.0"
semver: "npm:7.6.3"
sharp: "npm:^0.35.3"
tinyglobby: "npm:^0.2.15"
- twenty-client-sdk: "npm:2.42.0"
+ twenty-client-sdk: "npm:2.47.0"
typescript: "npm:^5.9.3"
uuid: "npm:^13.0.2"
bin:
twenty: dist/cli.cjs
- checksum: 10c0/1e43d0c2af55ab8705506f55fe693688575325e506b6cfb16ba4d486d0bfdc0c0f257fc8963ee86f218c10d09b87bacdc769803b6b59283f9e24c7a88346fb84
+ checksum: 10c0/85d615f9de5057940cc04f766bf47e5da2ac6a3ba0324f03dc6e99ab20c52a2059f30c5ef630534097e7f34923d882cb896da536a6302ab2393c1291662cd1aa
languageName: node
linkType: hard