diff --git a/apps/dashboard/src/components/workflow-editor/workflow-tabs.tsx b/apps/dashboard/src/components/workflow-editor/workflow-tabs.tsx
index b17144c8550..4120a817361 100644
--- a/apps/dashboard/src/components/workflow-editor/workflow-tabs.tsx
+++ b/apps/dashboard/src/components/workflow-editor/workflow-tabs.tsx
@@ -1,16 +1,25 @@
import {
AiAgentTypeEnum,
AiResourceTypeEnum,
+ AiWorkflowSuggestion,
EnvironmentTypeEnum,
FeatureFlagsKeysEnum,
PermissionsEnum,
ResourceOriginEnum,
+ StepTypeEnum,
} from '@novu/shared';
-import { type ReactNode, useCallback, useMemo, useState } from 'react';
-import { RiArrowDownSLine, RiCodeSSlashLine, RiFileCopyLine, RiPlayCircleLine } from 'react-icons/ri';
+import { FC, SVGProps, useCallback, useMemo, useState } from 'react';
+import { IconType } from 'react-icons/lib';
+import {
+ RiArrowDownSLine,
+ RiCodeSSlashLine,
+ RiFileCopyLine,
+ RiListCheck3,
+ RiPlayCircleLine,
+ RiQuillPenLine,
+} from 'react-icons/ri';
import { Link, useMatch, useNavigate, useParams } from 'react-router-dom';
import { useWorkflow } from '@/components/workflow-editor/workflow-provider';
-
import { useAuth } from '@/context/auth/hooks';
import { useEnvironment } from '@/context/environment/hooks';
import { useDeleteWorkflow } from '@/hooks/use-delete-workflow';
@@ -26,6 +35,7 @@ import { buildRoute, ROUTES } from '@/utils/routes';
import { AiChatProvider, NovuCopilotPanel, useAiChat } from '../ai-sidekick';
import { SidekickToast } from '../ai-sidekick/sidekick-toast';
import { DeleteWorkflowDialog } from '../delete-workflow-dialog';
+import { Code2 } from '../icons/code-2';
import { Button } from '../primitives/button';
import { ButtonGroupItem, ButtonGroupRoot } from '../primitives/button-group';
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '../primitives/dropdown-menu';
@@ -320,10 +330,37 @@ export const WorkflowTabs = () => {
const { deleteWorkflow, isPending: isDeletePending } = useDeleteWorkflow();
+ const newChatSuggestions = useMemo(() => {
+ const suggestions: { label: AiWorkflowSuggestion; icon: IconType | FC
> }[] = [
+ { label: AiWorkflowSuggestion.AUTOCOMPLETE, icon: RiListCheck3 },
+ ];
+
+ const hasAnySteps = (workflow?.steps?.length ?? 0) > 0;
+ if (hasAnySteps) {
+ suggestions.push({ label: AiWorkflowSuggestion.APPLY_CONDITIONS, icon: Code2 });
+ }
+
+ const hasContentSteps = workflow?.steps.some((step) =>
+ [StepTypeEnum.EMAIL, StepTypeEnum.SMS, StepTypeEnum.PUSH, StepTypeEnum.IN_APP, StepTypeEnum.CHAT].includes(
+ step.type
+ )
+ );
+ if (hasContentSteps) {
+ suggestions.push({ label: AiWorkflowSuggestion.IMPROVE_MESSAGING, icon: RiQuillPenLine });
+ }
+
+ if (workflow?.steps.some((step) => Object.keys(step.issues?.controls ?? {}).length > 0)) {
+ suggestions.push({ label: AiWorkflowSuggestion.FIX_WORKFLOW_ISSUES, icon: RiListCheck3 });
+ }
+
+ return suggestions;
+ }, [workflow]);
+
const aiChatConfig = useMemo(
() => ({
resourceType: AiResourceTypeEnum.WORKFLOW,
resourceId: workflow?._id,
+ newChatSuggestions,
agentType: AiAgentTypeEnum.GENERATE_WORKFLOW,
metadata: { workflowId: workflow?._id },
isResourceLoading: isWorkflowPending,
@@ -335,7 +372,8 @@ export const WorkflowTabs = () => {
data.type === 'data-step-updated' ||
data.type === 'data-step-removed' ||
data.type === 'data-step-moved' ||
- data.type === 'data-workflow-metadata-updated'
+ data.type === 'data-workflow-metadata-updated' ||
+ data.type === 'data-payload-schema-updated'
) {
refetchWorkflow({ cancelRefetch: true });
}
@@ -364,7 +402,16 @@ export const WorkflowTabs = () => {
}
: undefined,
}),
- [workflow, isWorkflowPending, refetchWorkflow, deleteWorkflow, isDeletePending, navigate, currentEnvironment?.slug]
+ [
+ workflow,
+ isWorkflowPending,
+ newChatSuggestions,
+ refetchWorkflow,
+ deleteWorkflow,
+ isDeletePending,
+ navigate,
+ currentEnvironment?.slug,
+ ]
);
const content = (
@@ -498,7 +545,7 @@ export const WorkflowTabs = () => {
return showCopilot ? {content} : content;
};
-function WorkflowCopilotSidebar({ children }: { children: ReactNode }) {
+function WorkflowCopilotSidebar({ children }: { children: React.ReactNode }) {
const { isGenerating } = useAiChat();
return (
diff --git a/apps/dashboard/src/hooks/use-ai-chat-stream.ts b/apps/dashboard/src/hooks/use-ai-chat-stream.ts
index a9f5ac823f6..e2fae9c9303 100644
--- a/apps/dashboard/src/hooks/use-ai-chat-stream.ts
+++ b/apps/dashboard/src/hooks/use-ai-chat-stream.ts
@@ -16,7 +16,7 @@ import { getToken } from '@/utils/auth';
import { useDataRef } from './use-data-ref';
type UseAiChatOptions = {
- id: string;
+ id?: string;
agentType: AiAgentTypeEnum;
initialMessages?: UIMessage[];
onData?: ChatOnDataCallback;
diff --git a/apps/dashboard/src/hooks/use-form-autosave.ts b/apps/dashboard/src/hooks/use-form-autosave.ts
index 357619f24e8..14c9e354fa0 100644
--- a/apps/dashboard/src/hooks/use-form-autosave.ts
+++ b/apps/dashboard/src/hooks/use-form-autosave.ts
@@ -59,9 +59,12 @@ export function useFormAutosave, T extends Fie
lastSavedDataRef.current = serializedData;
save(values, {
onSuccess: () => {
- // Reset dirty state after successful save so that polling hooks (e.g. useStepResolverPolling)
- // are not permanently blocked. keepValues: true avoids regenerating useFieldArray field IDs.
- formRef.current.reset(values, { keepErrors: true, keepValues: true });
+ // Reset dirty state after successful save so polling hooks (e.g. useStepResolverPolling)
+ // are not permanently blocked. We reset with the CURRENT form values (not the stale `values`
+ // snapshot) to avoid overwriting edits the user made while the request was in-flight.
+ // keepValues:true prevents regenerating useFieldArray field IDs (row flicker).
+ const currentValues = formRef.current.getValues();
+ formRef.current.reset(currentValues, { keepErrors: true, keepValues: true });
options?.onSuccess?.();
},
});
diff --git a/apps/dashboard/src/hooks/use-preview-context.ts b/apps/dashboard/src/hooks/use-preview-context.ts
index 7d666d617ad..1a98cdfabbb 100644
--- a/apps/dashboard/src/hooks/use-preview-context.ts
+++ b/apps/dashboard/src/hooks/use-preview-context.ts
@@ -37,79 +37,79 @@ export function usePreviewContext>({
localParsedData: parseJsonValue(value),
}));
const isUpdatingRef = useRef(false);
- const lastValueRef = useRef(value);
+ const lastSyncedValueRef = useRef(value);
+ const latestValueRef = useRef(value);
+ latestValueRef.current = value;
+ const onDataPersistRef = useDataRef(onDataPersist);
+ const parseJsonValueRef = useDataRef(parseJsonValue);
const parsedData = useMemo(() => parseJsonValue(value), [parseJsonValue, value]);
+ // Wraps onChange to synchronously track the latest value in a ref,
+ // so that consecutive calls within the same render cycle read fresh data.
+ const trackedOnChange = useCallback(
+ (newValue: string): Error | null => {
+ const error = onChange(newValue);
+ if (!error) {
+ latestValueRef.current = newValue;
+ }
+
+ return error;
+ },
+ [onChange]
+ );
+
// Sync external value changes with local state
useEffect(() => {
- if (value === lastValueRef.current || isUpdatingRef.current) {
+ if (value === lastSyncedValueRef.current || isUpdatingRef.current) {
return;
}
- lastValueRef.current = value;
+ lastSyncedValueRef.current = value;
setState((prev) => ({
...prev,
localParsedData: parsedData,
}));
}, [value, parsedData]);
- const setError = useCallback((section: keyof E, error: string | null) => {
- setState((prev) => ({
- ...prev,
- errors: { ...prev.errors, [section]: error },
- }));
- }, []);
-
- const updateLocalData = useCallback(
- (section: keyof D, updatedData: any) => {
- setState((prev) => {
- const updatedParsedData = { ...prev.localParsedData, [section]: updatedData };
-
- onDataPersist?.(updatedParsedData);
-
- return {
- ...prev,
- localParsedData: updatedParsedData,
- };
- });
- },
- [onDataPersist]
- );
-
- const updateJsonRef = useDataRef({ onChange, value, setError, updateLocalData, parseJsonValue });
-
const updatePreviewSection = useCallback(
(section: keyof D, updatedData: any) => {
if (isUpdatingRef.current) return;
isUpdatingRef.current = true;
- const local = updateJsonRef.current;
-
try {
- const currentData = local.parseJsonValue(local.value);
+ const currentData = parseJsonValueRef.current(latestValueRef.current);
const newData = { ...currentData, [section]: updatedData };
const stringified = JSON.stringify(newData, null, 2);
- const error = local.onChange(stringified);
+ const error = trackedOnChange(stringified);
if (error) {
- local.setError(section, error.message);
+ setState((prev) => ({
+ ...prev,
+ errors: { ...prev.errors, [section]: error.message },
+ }));
} else {
- local.updateLocalData(section, updatedData);
- local.setError(section, null);
+ onDataPersistRef.current?.(newData);
+ setState((prev) => ({
+ ...prev,
+ localParsedData: newData,
+ errors: { ...prev.errors, [section]: null },
+ }));
}
} catch (error) {
const errorMessage = error instanceof Error ? error.message : 'Failed to update JSON';
- local.setError(section, errorMessage);
+ setState((prev) => ({
+ ...prev,
+ errors: { ...prev.errors, [section]: errorMessage },
+ }));
} finally {
- // Use setTimeout to ensure the ref is reset after the current execution cycle
setTimeout(() => {
isUpdatingRef.current = false;
}, 0);
}
},
- [updateJsonRef]
+ [trackedOnChange]
);
const setAccordionValue = useCallback((value: string[]) => {
@@ -122,5 +122,6 @@ export function usePreviewContext>({
errors: state.errors,
previewContext: state.localParsedData,
updatePreviewSection,
+ trackedOnChange,
};
}
diff --git a/apps/dashboard/src/pages/edit-step-template-v2.tsx b/apps/dashboard/src/pages/edit-step-template-v2.tsx
index 7469bba0083..250fd42fdbb 100644
--- a/apps/dashboard/src/pages/edit-step-template-v2.tsx
+++ b/apps/dashboard/src/pages/edit-step-template-v2.tsx
@@ -27,6 +27,11 @@ export function EditStepTemplateV2Page() {
const prevStepIdRef = useRef(undefined);
const prevHashRef = useRef(undefined);
const prevControlsFingerprintRef = useRef(null);
+ // Tracks ALL in-flight save fingerprints so that any server response that
+ // echoes back one of our own saves is recognized and does not reset the form.
+ // A single ref would be overwritten by rapid successive saves, causing the
+ // guard to fail for earlier in-flight requests.
+ const inFlightFingerprintsRef = useRef>(new Set());
useEffect(() => {
if (!step) return;
@@ -43,10 +48,25 @@ export function EditStepTemplateV2Page() {
const controlsChanged =
prevControlsFingerprintRef.current !== null && fingerprint !== prevControlsFingerprintRef.current;
- if (isFirstBind || stepIdChanged || hashChanged || controlsChanged) {
- prevStepIdRef.current = step.stepId;
- prevHashRef.current = step.stepResolverHash;
- prevControlsFingerprintRef.current = fingerprint;
+ // If there are any in-flight saves, any server-side change we receive is
+ // the result of our own edits. Skip the reset so we don't overwrite edits
+ // the user made while requests were in-flight. The invocationQueue may
+ // apply pending requests on top, so the server response FP may not exactly
+ // match any single in-flight FP â checking the count is safer.
+ const hasInFlightSaves = inFlightFingerprintsRef.current.size > 0;
+ const isOwnSaveEcho = controlsChanged && (inFlightFingerprintsRef.current.has(fingerprint) || hasInFlightSaves);
+
+ if (inFlightFingerprintsRef.current.has(fingerprint)) {
+ inFlightFingerprintsRef.current.delete(fingerprint);
+ }
+
+ const shouldReset = isFirstBind || stepIdChanged || hashChanged || (controlsChanged && !isOwnSaveEcho);
+
+ prevStepIdRef.current = step.stepId;
+ prevHashRef.current = step.stepResolverHash;
+ prevControlsFingerprintRef.current = fingerprint;
+
+ if (shouldReset) {
hasInitializedRef.current = true;
form.reset(getControlsDefaultValues(step), { keepErrors: true });
}
@@ -58,10 +78,27 @@ export function EditStepTemplateV2Page() {
save: (data, { onSuccess }) => {
if (!workflow || !step) return;
+ const fp = JSON.stringify({
+ v: data,
+ ui: step.controls?.uiSchema,
+ ds: step.controls?.dataSchema,
+ });
+
+ // Add to in-flight set before the request goes out. The fingerprint
+ // effect will recognize any server response that matches this value and
+ // skip the form.reset() that would otherwise overwrite in-progress edits.
+ inFlightFingerprintsRef.current.add(fp);
+
const updateStepData: Partial = {
controlValues: data,
};
- update(updateStepInWorkflow(workflow, step.stepId, updateStepData), { onSuccess });
+ update(updateStepInWorkflow(workflow, step.stepId, updateStepData), {
+ onSuccess: () => {
+ // Clean up the in-flight fingerprint on success.
+ inFlightFingerprintsRef.current.delete(fp);
+ onSuccess?.();
+ },
+ });
},
});
diff --git a/apps/dashboard/src/utils/conditions.ts b/apps/dashboard/src/utils/conditions.ts
index 600c017715b..798e5eb0e99 100644
--- a/apps/dashboard/src/utils/conditions.ts
+++ b/apps/dashboard/src/utils/conditions.ts
@@ -132,4 +132,4 @@ export const getUniqueOperators = (jsonLogic?: RQBJsonLogic): string[] => {
};
// Export shared configuration for use in other files
-export { customJsonLogicOperations, parseJsonLogicOptions };
+export { parseJsonLogicOptions };
diff --git a/apps/dashboard/src/utils/constants.ts b/apps/dashboard/src/utils/constants.ts
index 88e7d66b69a..05a6325556f 100644
--- a/apps/dashboard/src/utils/constants.ts
+++ b/apps/dashboard/src/utils/constants.ts
@@ -61,7 +61,6 @@ export const DEFAULT_CONTROL_THROTTLE_TYPE = 'fixed';
export const DEFAULT_CONTROL_THROTTLE_WINDOW = 1;
export const DEFAULT_CONTROL_THROTTLE_UNIT = TimeUnitEnum.MINUTES;
export const DEFAULT_CONTROL_THROTTLE_THRESHOLD = 1;
-export const DEFAULT_CONTROL_THROTTLE_KEY = '';
export const DEFAULT_CONTROL_HTTP_REQUEST_METHOD = 'POST';
export const DEFAULT_CONTROL_HTTP_REQUEST_HEADERS: unknown[] = [];
diff --git a/apps/dashboard/src/utils/context.ts b/apps/dashboard/src/utils/context.ts
index d6b7db85865..89bdb96ca13 100644
--- a/apps/dashboard/src/utils/context.ts
+++ b/apps/dashboard/src/utils/context.ts
@@ -1,6 +1,6 @@
import React from 'react';
-export function assertContextExists(contextVal: unknown, msgOrCtx: string | React.Context): asserts contextVal {
+function assertContextExists(contextVal: unknown, msgOrCtx: string | React.Context): asserts contextVal {
if (!contextVal) {
throw typeof msgOrCtx === 'string' ? new Error(msgOrCtx) : new Error(`${msgOrCtx.displayName} not found`);
}
diff --git a/apps/dashboard/src/utils/logs-filters.utils.ts b/apps/dashboard/src/utils/logs-filters.utils.ts
index 9ab6491aa48..c1f20d77bed 100644
--- a/apps/dashboard/src/utils/logs-filters.utils.ts
+++ b/apps/dashboard/src/utils/logs-filters.utils.ts
@@ -4,7 +4,7 @@ import { IS_SELF_HOSTED } from '../config';
type OrganizationLike = { createdAt: Date };
-export const LOGS_DATE_RANGE_OPTIONS = [
+const LOGS_DATE_RANGE_OPTIONS = [
{ value: '24', label: 'Last 24 Hours', ms: 24 * 60 * 60 * 1000 },
{ value: '168', label: '7 Days', ms: 7 * 24 * 60 * 60 * 1000 }, // 7 * 24
{ value: '720', label: '30 Days', ms: 30 * 24 * 60 * 60 * 1000 }, // 30 * 24
diff --git a/apps/dashboard/src/utils/schema.ts b/apps/dashboard/src/utils/schema.ts
index a4616ef6c12..3c2aab45f00 100644
--- a/apps/dashboard/src/utils/schema.ts
+++ b/apps/dashboard/src/utils/schema.ts
@@ -139,7 +139,7 @@ const getZodValueByType = (jsonSchema: JSONSchemaDefinition, key: string): ZodVa
* The function will recursively build the schema based on the JSONSchema object.
* It removes empty strings and objects with empty required fields during the transformation phase after parsing.
*/
-export const buildDynamicZodSchema = (obj: JSONSchemaDefinition, key = ''): ZodValue => {
+const buildDynamicZodSchema = (obj: JSONSchemaDefinition, key = ''): ZodValue => {
if (typeof obj === 'object' && obj.type === 'object') {
const properties = obj.properties ?? {};
const requiredFields = obj.required ?? [];
diff --git a/enterprise/packages/ai/package.json b/enterprise/packages/ai/package.json
index 4042277b25a..f976053002e 100644
--- a/enterprise/packages/ai/package.json
+++ b/enterprise/packages/ai/package.json
@@ -27,9 +27,10 @@
"@novu/ee-auth": "workspace:*",
"@novu/shared": "workspace:*",
"@novu/testing": "workspace:*",
- "@types/express": "4.17.17",
"@sentry/node": "^8.33.1",
+ "@types/express": "4.17.17",
"ai": "6.0.50",
+ "async-mutex": "^0.5.0",
"class-transformer": "0.5.1",
"class-validator": "0.14.1",
"express": "^5.0.1",
diff --git a/enterprise/packages/translation/package.json b/enterprise/packages/translation/package.json
index 64847b619bc..a0a1df452e4 100644
--- a/enterprise/packages/translation/package.json
+++ b/enterprise/packages/translation/package.json
@@ -40,7 +40,7 @@
"sinon": "^9.2.4",
"ts-node": "~10.9.1",
"typescript": "5.6.2",
- "liquidjs": "^10.25.0"
+ "liquidjs": "^10.25.5"
},
"peerDependencies": {
"@nestjs/common": "10.4.18",
diff --git a/libs/application-generic/package.json b/libs/application-generic/package.json
index 1e2cb9f6266..99e5cc014e8 100644
--- a/libs/application-generic/package.json
+++ b/libs/application-generic/package.json
@@ -95,7 +95,7 @@
"json-schema-to-ts": "^3.0.0",
"json-schema-faker": "^0.5.6",
"jsonwebtoken": "9.0.3",
- "liquidjs": "^10.25.0",
+ "liquidjs": "^10.25.5",
"lodash": "^4.18.0",
"lru-cache": "^11.2.4",
"mixpanel": "^0.17.0",
diff --git a/libs/application-generic/src/factories/sms/handlers/index.ts b/libs/application-generic/src/factories/sms/handlers/index.ts
index 14434082e3f..949ef28cc01 100644
--- a/libs/application-generic/src/factories/sms/handlers/index.ts
+++ b/libs/application-generic/src/factories/sms/handlers/index.ts
@@ -16,6 +16,7 @@ export * from './gupshup.handler';
export * from './imedia.handler';
export * from './infobip.handler';
export * from './isend-sms.handler';
+export * from './isendpro-sms.handler';
export * from './kannel.handler';
export * from './maqsam.handler';
export * from './messagebird.handler';
@@ -34,4 +35,3 @@ export * from './telnyx.handler';
export * from './termii.handler';
export * from './twilio.handler';
export * from './unifonic.handler';
-export * from './isendpro-sms.handler';
diff --git a/libs/application-generic/src/services/sqs/sqs-consumer.service.ts b/libs/application-generic/src/services/sqs/sqs-consumer.service.ts
index 659c2b66a7a..cc1eccd7230 100644
--- a/libs/application-generic/src/services/sqs/sqs-consumer.service.ts
+++ b/libs/application-generic/src/services/sqs/sqs-consumer.service.ts
@@ -3,8 +3,8 @@ import { Logger } from '@nestjs/common';
import { JobTopicNameEnum } from '@novu/shared';
import { Consumer } from 'sqs-consumer';
import { PinoLogger } from '../../logging';
-import { SqsPayloadOffloadService } from './sqs-payload-offload.service';
import { SqsService } from './sqs.service';
+import { SqsPayloadOffloadService } from './sqs-payload-offload.service';
import {
ISqsConsumerOptions,
ISqsMessageMeta,
@@ -234,9 +234,7 @@ export class SqsConsumerService {
private async processMessage(message: Message): Promise {
const rawBody = message.Body || '{}';
- const resolvedBody = this.payloadOffload
- ? await this.payloadOffload.maybeResolve(rawBody)
- : rawBody;
+ const resolvedBody = this.payloadOffload ? await this.payloadOffload.maybeResolve(rawBody) : rawBody;
const data = JSON.parse(resolvedBody);
const receiveCount = parseInt(message.Attributes?.ApproximateReceiveCount || '1', 10);
diff --git a/libs/application-generic/src/services/sqs/sqs-payload-offload.service.ts b/libs/application-generic/src/services/sqs/sqs-payload-offload.service.ts
index a6b69e131c7..1492be21c88 100644
--- a/libs/application-generic/src/services/sqs/sqs-payload-offload.service.ts
+++ b/libs/application-generic/src/services/sqs/sqs-payload-offload.service.ts
@@ -69,11 +69,7 @@ export class SqsPayloadOffloadService {
})
);
- Logger.log(
- { topic, messageId, groupId, sizeBytes, key },
- 'Large SQS payload offloaded to S3',
- LOG_CONTEXT
- );
+ Logger.log({ topic, messageId, groupId, sizeBytes, key }, 'Large SQS payload offloaded to S3', LOG_CONTEXT);
const reference: ISqsLargePayloadReference = {
[SQS_LARGE_PAYLOAD_MARKER]: { bucket: this.bucket, key },
@@ -100,9 +96,7 @@ export class SqsPayloadOffloadService {
const { bucket, key } = (parsed as ISqsLargePayloadReference)[SQS_LARGE_PAYLOAD_MARKER];
- const response = await this.s3Client.send(
- new GetObjectCommand({ Bucket: bucket, Key: key })
- );
+ const response = await this.s3Client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
const resolved = await this.streamToString(response.Body as Readable);
diff --git a/libs/notifications/src/workflows/usage-report/usage-report.workflow.ts b/libs/notifications/src/workflows/usage-report/usage-report.workflow.ts
index 08e8f02c78a..2fc661a9a80 100644
--- a/libs/notifications/src/workflows/usage-report/usage-report.workflow.ts
+++ b/libs/notifications/src/workflows/usage-report/usage-report.workflow.ts
@@ -16,13 +16,6 @@ export const usageReportWorkflow = workflow(
}
);
- await step.throttle('throttle', async () => ({
- type: 'fixed',
- amount: 7,
- unit: 'days',
- threshold: 1,
- }));
-
await step.email(
'email',
async (controls) => {
diff --git a/packages/framework/package.json b/packages/framework/package.json
index 60a9e4f8ebb..340e31ebf5e 100644
--- a/packages/framework/package.json
+++ b/packages/framework/package.json
@@ -259,7 +259,7 @@
"cross-fetch": "^4.0.0",
"json-schema-to-ts": "^3.0.0",
"jsonrepair": "^3.13.1",
- "liquidjs": "^10.25.0",
+ "liquidjs": "^10.25.5",
"pluralize": "^8.0.0",
"sanitize-html": "^2.13.0"
},
diff --git a/packages/js/src/event-emitter/types.ts b/packages/js/src/event-emitter/types.ts
index c00cf3fb6ba..7be3de74c64 100644
--- a/packages/js/src/event-emitter/types.ts
+++ b/packages/js/src/event-emitter/types.ts
@@ -19,7 +19,6 @@ import { Preference } from '../preferences/preference';
import { Schedule } from '../preferences/schedule';
import { ListPreferencesArgs, UpdatePreferenceArgs, UpdateScheduleArgs } from '../preferences/types';
import type { InitializeSessionArgs } from '../session';
-import type { TagsFilter } from '../types';
import type { TopicSubscription } from '../subscriptions/subscription';
import { SubscriptionPreference } from '../subscriptions/subscription-preference';
import type {
@@ -30,6 +29,7 @@ import type {
UpdateSubscriptionArgs,
UpdateSubscriptionPreferenceArgs,
} from '../subscriptions/types';
+import type { TagsFilter } from '../types';
import { Session, WebSocketEvent } from '../types';
type NovuPendingEvent = {
diff --git a/packages/js/src/utils/notification-utils.test.ts b/packages/js/src/utils/notification-utils.test.ts
index 4e8f0daf42a..cf0892a61f3 100644
--- a/packages/js/src/utils/notification-utils.test.ts
+++ b/packages/js/src/utils/notification-utils.test.ts
@@ -10,19 +10,11 @@ describe('normalizeTagGroups', () => {
normalizeTagGroups({
and: [{ or: ['a', 'b'] }, { or: ['c'] }],
})
- ).toEqual([
- ['a', 'b'],
- ['c'],
- ]);
+ ).toEqual([['a', 'b'], ['c']]);
});
it('rejects nested string[][]', () => {
- expect(() =>
- normalizeTagGroups([
- ['a', 'b'],
- ['c'],
- ] as never)
- ).toThrow();
+ expect(() => normalizeTagGroups([['a', 'b'], ['c']] as never)).toThrow();
});
it('rejects non-array values', () => {
diff --git a/packages/providers/package.json b/packages/providers/package.json
index e907c686a6e..49d0d14d32f 100644
--- a/packages/providers/package.json
+++ b/packages/providers/package.json
@@ -66,7 +66,7 @@
"nanoid": "^3.1.20",
"node-fetch": "^3.2.10",
"node-mailjet": "^6.0.8",
- "nodemailer": "^8.0.4",
+ "nodemailer": "^8.0.5",
"plivo": "^4.70.0",
"postmark": "^4.0.2",
"proxy-agent": "^6.5.0",
diff --git a/packages/providers/src/lib/sms/index.ts b/packages/providers/src/lib/sms/index.ts
index 98fa620cac0..7d004c8d1b5 100644
--- a/packages/providers/src/lib/sms/index.ts
+++ b/packages/providers/src/lib/sms/index.ts
@@ -16,6 +16,7 @@ export * from './gupshup/gupshup.provider';
export * from './imedia/imedia.provider';
export * from './infobip/infobip.provider';
export * from './isend-sms/isend-sms.provider';
+export * from './isendpro-sms/isendpro-sms.provider';
export * from './kannel/kannel.provider';
export * from './maqsam/maqsam.provider';
export * from './messagebird/messagebird.provider';
@@ -36,4 +37,3 @@ export * from './telnyx/telnyx.provider';
export * from './termii/termii.provider';
export * from './twilio/twilio.provider';
export * from './unifonic/unifonic.provider';
-export * from './isendpro-sms/isendpro-sms.provider';
diff --git a/packages/shared/src/consts/providers/channels/sms.ts b/packages/shared/src/consts/providers/channels/sms.ts
index 664a03060c9..57677b2be5a 100644
--- a/packages/shared/src/consts/providers/channels/sms.ts
+++ b/packages/shared/src/consts/providers/channels/sms.ts
@@ -16,9 +16,9 @@ import {
fortySixElksConfig,
genericSmsConfig,
gupshupConfig,
+ ISendProProviderConfig,
iMediaConfig,
infobipSMSConfig,
- ISendProProviderConfig,
iSendSmsConfig,
kannelConfig,
maqsamConfig,
diff --git a/packages/shared/src/types/ai.ts b/packages/shared/src/types/ai.ts
index 26fba983191..07a2006eddd 100644
--- a/packages/shared/src/types/ai.ts
+++ b/packages/shared/src/types/ai.ts
@@ -32,6 +32,7 @@ export enum AiWorkflowToolsEnum {
UPDATE_STEP_CONDITIONS = 'updateStepConditions',
REMOVE_STEP = 'removeStep',
MOVE_STEP = 'moveStep',
+ UPDATE_PAYLOAD_SCHEMA = 'updatePayloadSchema',
}
export enum AiWorkflowToolsNameEnum {
@@ -44,9 +45,19 @@ export enum AiWorkflowToolsNameEnum {
UPDATE_STEP_CONDITIONS = 'tool-updateStepConditions',
REMOVE_STEP = 'tool-removeStep',
MOVE_STEP = 'tool-moveStep',
+ UPDATE_PAYLOAD_SCHEMA = 'tool-updatePayloadSchema',
}
export enum AiResumeActionEnum {
TRY_AGAIN = 'tryAgain',
REVERT = 'revert',
}
+
+export enum AiWorkflowSuggestion {
+ AUTOCOMPLETE = 'Autocomplete this workflow',
+ APPLY_CONDITIONS = 'Apply step conditions',
+ IMPROVE_MESSAGING = 'Improve messaging',
+ FIX_WORKFLOW_ISSUES = 'Fix workflow issues',
+ FIX_STEP_ISSUES = 'Fix step issues',
+ GENERATE_STEP_CONTENT = 'Generate step content',
+}
diff --git a/packages/shared/src/utils/index.ts b/packages/shared/src/utils/index.ts
index e3ab6169f29..408ed5661ca 100644
--- a/packages/shared/src/utils/index.ts
+++ b/packages/shared/src/utils/index.ts
@@ -5,6 +5,6 @@ export * from './env';
export * from './issues';
export * from './locales';
export * from './normalizeEmail';
-export * from './tags-filter';
export { createMockObjectFromSchema } from './schema/create-mock-object-from-schema';
export { slugify } from './slugify';
+export * from './tags-filter';
diff --git a/packages/shared/src/utils/tags-filter.spec.ts b/packages/shared/src/utils/tags-filter.spec.ts
index 16e561a6e6c..cc95bba970d 100644
--- a/packages/shared/src/utils/tags-filter.spec.ts
+++ b/packages/shared/src/utils/tags-filter.spec.ts
@@ -25,10 +25,7 @@ describe('normalizeTagGroups', () => {
normalizeTagGroups({
and: [{ or: ['a', 'b'] }, { or: ['c'] }],
})
- ).toEqual([
- ['a', 'b'],
- ['c'],
- ]);
+ ).toEqual([['a', 'b'], ['c']]);
});
it('returns empty for { and: [] }', () => {
@@ -36,18 +33,11 @@ describe('normalizeTagGroups', () => {
});
it('rejects nested string[][]', () => {
- expect(() =>
- normalizeTagGroups([
- ['a', 'b'],
- ['c'],
- ] as never)
- ).toThrow(TagsFilterValidationError);
+ expect(() => normalizeTagGroups([['a', 'b'], ['c']] as never)).toThrow(TagsFilterValidationError);
});
it('rejects both or and and on the same object', () => {
- expect(() => normalizeTagGroups({ or: ['a'], and: [{ or: ['b'] }] } as never)).toThrow(
- TagsFilterValidationError
- );
+ expect(() => normalizeTagGroups({ or: ['a'], and: [{ or: ['b'] }] } as never)).toThrow(TagsFilterValidationError);
});
it('rejects empty inner group in and', () => {
@@ -73,12 +63,7 @@ describe('buildTagsQuery', () => {
});
it('uses $and of $in for multiple groups', () => {
- expect(
- buildTagsQuery([
- ['a', 'b'],
- ['c'],
- ])
- ).toEqual({
+ expect(buildTagsQuery([['a', 'b'], ['c']])).toEqual({
$and: [{ tags: { $in: ['a', 'b'] } }, { tags: { $in: ['c'] } }],
});
});
diff --git a/playground/nextjs/src/components/ai-elements/code-block.tsx b/playground/nextjs/src/components/ai-elements/code-block.tsx
index 76f79c9e58a..2553d50287f 100644
--- a/playground/nextjs/src/components/ai-elements/code-block.tsx
+++ b/playground/nextjs/src/components/ai-elements/code-block.tsx
@@ -1,34 +1,13 @@
-"use client";
-
-import type { ComponentProps, CSSProperties, HTMLAttributes } from "react";
-import type {
- BundledLanguage,
- BundledTheme,
- HighlighterGeneric,
- ThemedToken,
-} from "shiki";
-
-import { Button } from "@/components/ui/button";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
-import { cn } from "@/lib/utils";
-import { CheckIcon, CopyIcon } from "lucide-react";
-import {
- createContext,
- memo,
- useCallback,
- useContext,
- useEffect,
- useMemo,
- useRef,
- useState,
-} from "react";
-import { createHighlighter } from "shiki";
+'use client';
+
+import { CheckIcon, CopyIcon } from 'lucide-react';
+import type { ComponentProps, CSSProperties, HTMLAttributes } from 'react';
+import { createContext, memo, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import type { BundledLanguage, BundledTheme, HighlighterGeneric, ThemedToken } from 'shiki';
+import { createHighlighter } from 'shiki';
+import { Button } from '@/components/ui/button';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { cn } from '@/lib/utils';
// Shiki uses bitflags for font styles: 1=italic, 2=bold, 4=underline
// biome-ignore lint/suspicious/noBitwiseOperators: shiki bitflag check
@@ -70,9 +49,9 @@ const TokenSpan = ({ token }: { token: ThemedToken }) => (
{
backgroundColor: token.bgColor,
color: token.color,
- fontStyle: isItalic(token.fontStyle) ? "italic" : undefined,
- fontWeight: isBold(token.fontStyle) ? "bold" : undefined,
- textDecoration: isUnderline(token.fontStyle) ? "underline" : undefined,
+ fontStyle: isItalic(token.fontStyle) ? 'italic' : undefined,
+ fontWeight: isBold(token.fontStyle) ? 'bold' : undefined,
+ textDecoration: isUnderline(token.fontStyle) ? 'underline' : undefined,
...token.htmlStyle,
} as CSSProperties
}
@@ -82,19 +61,11 @@ const TokenSpan = ({ token }: { token: ThemedToken }) => (
);
// Line rendering component
-const LineSpan = ({
- keyedLine,
- showLineNumbers,
-}: {
- keyedLine: KeyedLine;
- showLineNumbers: boolean;
-}) => (
-
+const LineSpan = ({ keyedLine, showLineNumbers }: { keyedLine: KeyedLine; showLineNumbers: boolean }) => (
+
{keyedLine.tokens.length === 0
- ? "\n"
- : keyedLine.tokens.map(({ token, key }) => (
-
- ))}
+ ? '\n'
+ : keyedLine.tokens.map(({ token, key }) => )}
);
@@ -117,14 +88,11 @@ interface CodeBlockContextType {
// Context
const CodeBlockContext = createContext({
- code: "",
+ code: '',
});
// Highlighter cache (singleton per language)
-const highlighterCache = new Map<
- string,
- Promise>
->();
+const highlighterCache = new Map>>();
// Token cache
const tokensCache = new Map();
@@ -134,13 +102,11 @@ const subscribers = new Map void>>();
const getTokensCacheKey = (code: string, language: BundledLanguage) => {
const start = code.slice(0, 100);
- const end = code.length > 100 ? code.slice(-100) : "";
+ const end = code.length > 100 ? code.slice(-100) : '';
return `${language}:${code.length}:${start}:${end}`;
};
-const getHighlighter = (
- language: BundledLanguage
-): Promise> => {
+const getHighlighter = (language: BundledLanguage): Promise> => {
const cached = highlighterCache.get(language);
if (cached) {
return cached;
@@ -148,7 +114,7 @@ const getHighlighter = (
const highlighterPromise = createHighlighter({
langs: [language],
- themes: ["github-light", "github-dark"],
+ themes: ['github-light', 'github-dark'],
});
highlighterCache.set(language, highlighterPromise);
@@ -157,14 +123,14 @@ const getHighlighter = (
// Create raw tokens for immediate display while highlighting loads
const createRawTokens = (code: string): TokenizedCode => ({
- bg: "transparent",
- fg: "inherit",
- tokens: code.split("\n").map((line) =>
- line === ""
+ bg: 'transparent',
+ fg: 'inherit',
+ tokens: code.split('\n').map((line) =>
+ line === ''
? []
: [
{
- color: "inherit",
+ color: 'inherit',
content: line,
} as ThemedToken,
]
@@ -199,19 +165,19 @@ export const highlightCode = (
// oxlint-disable-next-line eslint-plugin-promise(prefer-await-to-then)
.then((highlighter) => {
const availableLangs = highlighter.getLoadedLanguages();
- const langToUse = availableLangs.includes(language) ? language : "text";
+ const langToUse = availableLangs.includes(language) ? language : 'text';
const result = highlighter.codeToTokens(code, {
lang: langToUse,
themes: {
- dark: "github-dark",
- light: "github-light",
+ dark: 'github-dark',
+ light: 'github-light',
},
});
const tokenized: TokenizedCode = {
- bg: result.bg ?? "transparent",
- fg: result.fg ?? "inherit",
+ bg: result.bg ?? 'transparent',
+ fg: result.fg ?? 'inherit',
tokens: result.tokens,
};
@@ -229,7 +195,7 @@ export const highlightCode = (
})
// oxlint-disable-next-line eslint-plugin-promise(prefer-await-to-then), eslint-plugin-promise(prefer-await-to-callbacks)
.catch((error) => {
- console.error("Failed to highlight code:", error);
+ console.error('Failed to highlight code:', error);
subscribers.delete(tokensCacheKey);
});
@@ -238,16 +204,16 @@ export const highlightCode = (
// Line number styles using CSS counters
const LINE_NUMBER_CLASSES = cn(
- "block",
- "before:content-[counter(line)]",
- "before:inline-block",
- "before:[counter-increment:line]",
- "before:w-8",
- "before:mr-4",
- "before:text-right",
- "before:text-muted-foreground/50",
- "before:font-mono",
- "before:select-none"
+ 'block',
+ 'before:content-[counter(line)]',
+ 'before:inline-block',
+ 'before:[counter-increment:line]',
+ 'before:w-8',
+ 'before:mr-4',
+ 'before:text-right',
+ 'before:text-muted-foreground/50',
+ 'before:font-mono',
+ 'before:select-none'
);
const CodeBlockBody = memo(
@@ -268,31 +234,16 @@ const CodeBlockBody = memo(
[tokenized.bg, tokenized.fg]
);
- const keyedLines = useMemo(
- () => addKeysToTokens(tokenized.tokens),
- [tokenized.tokens]
- );
+ const keyedLines = useMemo(() => addKeysToTokens(tokenized.tokens), [tokenized.tokens]);
return (
-
+
{keyedLines.map((keyedLine) => (
-
+
))}
@@ -304,7 +255,7 @@ const CodeBlockBody = memo(
prevProps.className === nextProps.className
);
-CodeBlockBody.displayName = "CodeBlockBody";
+CodeBlockBody.displayName = 'CodeBlockBody';
export const CodeBlockContainer = ({
className,
@@ -313,28 +264,21 @@ export const CodeBlockContainer = ({
...props
}: HTMLAttributes & { language: string }) => (
);
-export const CodeBlockHeader = ({
- children,
- className,
- ...props
-}: HTMLAttributes) => (
+export const CodeBlockHeader = ({ children, className, ...props }: HTMLAttributes) => (
);
-export const CodeBlockTitle = ({
- children,
- className,
- ...props
-}: HTMLAttributes
) => (
-
+export const CodeBlockTitle = ({ children, className, ...props }: HTMLAttributes
) => (
+
{children}
);
-export const CodeBlockFilename = ({
- children,
- className,
- ...props
-}: HTMLAttributes) => (
-
+export const CodeBlockFilename = ({ children, className, ...props }: HTMLAttributes) => (
+
{children}
);
-export const CodeBlockActions = ({
- children,
- className,
- ...props
-}: HTMLAttributes) => (
-
+export const CodeBlockActions = ({ children, className, ...props }: HTMLAttributes
) => (
+
{children}
);
@@ -389,9 +318,7 @@ export const CodeBlockContent = ({
const rawTokens = useMemo(() => createRawTokens(code), [code]);
// Try to get cached result synchronously, otherwise use raw tokens
- const [tokenized, setTokenized] = useState(
- () => highlightCode(code, language) ?? rawTokens
- );
+ const [tokenized, setTokenized] = useState(() => highlightCode(code, language) ?? rawTokens);
useEffect(() => {
let cancelled = false;
@@ -432,11 +359,7 @@ export const CodeBlock = ({
{children}
-
+
);
@@ -461,8 +384,8 @@ export const CodeBlockCopyButton = ({
const { code } = useContext(CodeBlockContext);
const copyToClipboard = useCallback(async () => {
- if (typeof window === "undefined" || !navigator?.clipboard?.writeText) {
- onError?.(new Error("Clipboard API not available"));
+ if (typeof window === 'undefined' || !navigator?.clipboard?.writeText) {
+ onError?.(new Error('Clipboard API not available'));
return;
}
@@ -471,10 +394,7 @@ export const CodeBlockCopyButton = ({
await navigator.clipboard.writeText(code);
setIsCopied(true);
onCopy?.();
- timeoutRef.current = window.setTimeout(
- () => setIsCopied(false),
- timeout
- );
+ timeoutRef.current = window.setTimeout(() => setIsCopied(false), timeout);
}
} catch (error) {
onError?.(error as Error);
@@ -491,13 +411,7 @@ export const CodeBlockCopyButton = ({
const Icon = isCopied ? CheckIcon : CopyIcon;
return (
- 
+ 
-
-