@haiiro/docuflow 0.0.16 → 0.0.17

package/src/logic-functions/on-task-updated.logic-function.mjs

@@ -59485,12 +59485,16 @@ var readUserMessage = (value) => {
   }
   return void 0;
 };
+var isMissingGraphqlField = (error) => error instanceof CoreGraphqlError && /Cannot query field|Unknown type/i.test(error.message);
 var callCoreGraphql = async ({
   query,
-  variables
+  variables,
+  runAs = "person"
 }) => {
   const apiUrl = process.env.TWENTY_API_URL;
-  const token = process.env.TWENTY_APP_ACCESS_TOKEN;
+  const personToken = process.env.TWENTY_APP_ACCESS_TOKEN;
+  const applicationToken = process.env.TWENTY_APP_APPLICATION_ACCESS_TOKEN;
+  const token = runAs === "person" ? personToken ?? applicationToken : applicationToken ?? personToken;
   if (apiUrl === void 0 || token === void 0) {
     throw new CoreGraphqlError(
       "TWENTY_API_URL or TWENTY_APP_ACCESS_TOKEN is not set",
@@ -59515,6 +59519,9 @@ var callCoreGraphql = async ({
   }
   return body.data;
 };
+var SUBMIT_FORM_STEP_MUTATION = `mutation SubmitFormStep($input: SubmitFormStepInput!) {
+  submitFormStep(input: $input)
+}`;
 var ANSWER_TOOL_CALL_MUTATION = `mutation AnswerToolCall($input: AnswerToolCallInput!) {
   answerToolCall(input: $input) { streamId }
 }`;
@@ -59574,17 +59581,24 @@ var getFormStepAssignment = ({
     now
   )
 });
+var getStepWaitKey = ({
+  workflowRunId,
+  stepId,
+  stepInfo
+}) => typeof stepInfo?.threadId === "string" && stepInfo.threadId.length > 0 ? stepInfo.threadId : `${workflowRunId}.${stepId}`;
+var isStepWaitingForAnswer = (stepInfo) => stepInfo?.status === "PENDING" && (stepInfo.error === void 0 || stepInfo.error === null) && (typeof stepInfo.threadId === "string" && stepInfo.threadId.length > 0 || stepInfo.wait?.type === "CALLBACK");
 
 // src/server/workflow-engine.ts
 var answerFormStep = async ({
   state,
+  workflowRunId,
   stepId,
-  threadId,
+  waitKey,
   values
 }) => {
   const step = state?.flow?.steps?.find((candidate) => candidate.id === stepId);
   const stepInfo = state?.stepInfos?.[stepId];
-  if (step === void 0 || !isFormStep(step) || stepInfo?.status !== "PENDING" || stepInfo.threadId !== threadId) {
+  if (step === void 0 || !isFormStep(step) || !isStepWaitingForAnswer(stepInfo) || getStepWaitKey({ workflowRunId, stepId, stepInfo }) !== waitKey) {
     return { status: "NOT_WAITING" };
   }
   const fields = resolveFormStepFields(
@@ -59608,10 +59622,26 @@ var answerFormStep = async ({
     ),
     values
   });
-  await callCoreGraphql({
-    query: ANSWER_TOOL_CALL_MUTATION,
-    variables: { input: { threadId, toolCallId: stepId, response } }
+  const threadId = stepInfo?.threadId;
+  const submitFormStep = () => callCoreGraphql({
+    query: SUBMIT_FORM_STEP_MUTATION,
+    variables: { input: { stepId, workflowRunId, response } }
   });
+  if (typeof threadId === "string" && threadId.length > 0) {
+    try {
+      await callCoreGraphql({
+        query: ANSWER_TOOL_CALL_MUTATION,
+        variables: { input: { threadId, toolCallId: stepId, response } }
+      });
+    } catch (error) {
+      if (!isMissingGraphqlField(error)) {
+        throw error;
+      }
+      await submitFormStep();
+    }
+  } else {
+    await submitFormStep();
+  }
   return { status: "ANSWERED" };
 };
 
@@ -59625,8 +59655,9 @@ var answerStepOfTask = async (task, values) => {
   try {
     const result = await answerFormStep({
       state: run?.state,
+      workflowRunId: task.smbWorkflowRunId,
       stepId: task.smbWorkflowStepId,
-      threadId: task.smbWorkflowThreadId,
+      waitKey: task.smbWorkflowThreadId,
       values
     });
     return result.status === "MISSING_REQUIRED" ? { status: "MISSING_REQUIRED", labels: result.labels } : void 0;

package/src/logic-functions/on-workflow-run-updated.logic-function.mjs

@@ -119324,10 +119324,11 @@ var isAppEngine = (value) => getDocflowEngine(value) === "APP";
 // src/shared/docflow.constants.ts
 var DOCFLOW_LAUNCH_PARAMETERS_KEY = "smbDocflowParameters";
 var LAUNCH_PARAMETERS_STEP_INPUT = `{{trigger.${DOCFLOW_LAUNCH_PARAMETERS_KEY}}}`;
-var LAUNCH_TRIGGER_NAME = "\u0417\u0430\u043F\u0443\u0441\u043A \u0441 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C\u0438";
+var DOCFLOW_LAUNCHED_BY_KEY = "smbDocflowLaunchedBy";
 var TASK_DONE_STATUS = "DONE";
 var FORM_FIELD_ROLE_SETTING = "smbRole";
 var FORM_FIELD_DUE_IN_DAYS_SETTING = "smbDueInDays";
+var TRIGGER_STEP_ID = "trigger";
 
 // src/shared/form/form-fields.util.ts
 var getFormFieldRole = (field) => {
@@ -119340,8 +119341,7 @@ var parseFormFields = (value) => Array.isArray(value) ? value.filter(
 ) : [];
 
 // src/shared/workflow/launch-step.util.ts
-var isLaunchTrigger = (trigger) => trigger?.type === "WEBHOOK" && trigger.name === LAUNCH_TRIGGER_NAME;
-var isLaunchableTrigger = (trigger) => trigger?.type === "MANUAL" || isLaunchTrigger(trigger);
+var isLaunchableTrigger = (trigger) => trigger?.type === "MANUAL" || trigger?.type === "WEBHOOK";
 
 // src/shared/workflow/workflow-run.util.ts
 var DAY_IN_MS = 24 * 60 * 60 * 1e3;
@@ -119398,7 +119398,26 @@ var getFormStepAssignment = ({
     now
   )
 });
+var getStepWaitKey = ({
+  workflowRunId,
+  stepId,
+  stepInfo
+}) => typeof stepInfo?.threadId === "string" && stepInfo.threadId.length > 0 ? stepInfo.threadId : `${workflowRunId}.${stepId}`;
+var isStepWaitingForAnswer = (stepInfo) => stepInfo?.status === "PENDING" && (stepInfo.error === void 0 || stepInfo.error === null) && (typeof stepInfo.threadId === "string" && stepInfo.threadId.length > 0 || stepInfo.wait?.type === "CALLBACK");
+var getRunStarterWorkspaceMemberId = ({
+  createdByWorkspaceMemberId,
+  state
+}) => {
+  if (typeof createdByWorkspaceMemberId === "string" && createdByWorkspaceMemberId.length > 0) {
+    return createdByWorkspaceMemberId;
+  }
+  const triggerResult = state?.stepInfos?.[TRIGGER_STEP_ID]?.result;
+  return readWorkspaceMemberId(
+    isPlainRecord(triggerResult) ? triggerResult[DOCFLOW_LAUNCHED_BY_KEY] : void 0
+  );
+};
 var getFormStepTaskRequests = ({
+  workflowRunId,
   state,
   runStarterWorkspaceMemberId,
   now
@@ -119406,9 +119425,13 @@ var getFormStepTaskRequests = ({
   const steps = state?.flow?.steps ?? [];
   const stepInfos = state?.stepInfos ?? {};
   const isStartedByHand = isLaunchableTrigger(state?.flow?.trigger);
+  const runStarterId = getRunStarterWorkspaceMemberId({
+    createdByWorkspaceMemberId: runStarterWorkspaceMemberId,
+    state
+  });
   return steps.flatMap((step) => {
     const stepInfo = stepInfos[step.id];
-    if (!isFormStep(step) || stepInfo?.status !== "PENDING" || stepInfo.error !== void 0 && stepInfo.error !== null || typeof stepInfo.threadId !== "string" || stepInfo.threadId.length === 0) {
+    if (!isFormStep(step) || !isStepWaitingForAnswer(stepInfo)) {
       return [];
     }
     const fields = resolveFormStepFields(getFormStepFields(step), stepInfos);
@@ -119416,7 +119439,7 @@ var getFormStepTaskRequests = ({
       fields,
       now
     });
-    const fallbackAssigneeId = isStartedByHand ? runStarterWorkspaceMemberId ?? void 0 : void 0;
+    const fallbackAssigneeId = isStartedByHand ? runStarterId : void 0;
     const taskAssigneeId = assigneeWorkspaceMemberId ?? fallbackAssigneeId;
     if (taskAssigneeId === void 0) {
       return [];
@@ -119424,7 +119447,7 @@ var getFormStepTaskRequests = ({
     return [
       {
         stepId: step.id,
-        threadId: stepInfo.threadId,
+        waitKey: getStepWaitKey({ workflowRunId, stepId: step.id, stepInfo }),
         title: step.name,
         assigneeWorkspaceMemberId: taskAssigneeId,
         dueAt,
@@ -119497,7 +119520,7 @@ var closeTasksOfAnsweredSteps = async (run) => {
   let closedCount = 0;
   for (const task of tasks) {
     const stepInfo = typeof task.smbWorkflowStepId === "string" ? run.state?.stepInfos?.[task.smbWorkflowStepId] : void 0;
-    if (stepInfo?.status !== "SUCCESS" || stepInfo.threadId !== task.smbWorkflowThreadId) {
+    if (typeof task.smbWorkflowStepId !== "string" || stepInfo?.status !== "SUCCESS" || getStepWaitKey({ workflowRunId: run.id, stepId: task.smbWorkflowStepId, stepInfo }) !== task.smbWorkflowThreadId) {
       continue;
     }
     const answer = typeof stepInfo.result === "object" && stepInfo.result !== null ? stepInfo.result : {};
@@ -119527,6 +119550,7 @@ var handler = async (event) => {
     return { skipped: "NOT_RUNNING" };
   }
   const requests = getFormStepTaskRequests({
+    workflowRunId: run.id,
     state: run.state,
     runStarterWorkspaceMemberId: run.createdBy?.workspaceMemberId,
     now: /* @__PURE__ */ new Date()
@@ -119538,9 +119562,11 @@ var handler = async (event) => {
         payload: {
           workflowRunId: run.id,
           stepId: request.stepId,
-          threadId: request.threadId
+          // The wait key travels as threadId: jobs queued by 0.0.16 and
+          // earlier carry that name
+          threadId: request.waitKey
         },
-        jobId: `hand-out-${request.threadId}`
+        jobId: `hand-out-${request.waitKey}`
       })),
       retryLimit: 2
     });

package/src/logic-functions/on-workflow-run-updated.logic-function.ts

@@ -16,7 +16,7 @@ import {
 
 // Process tasks follow the run: a FORM step the run waits on becomes a CRM
 // task, and a step answered elsewhere closes its task. Handing out is queued
-// under the step's thread id, so repeated run updates create one task.
+// under the step's wait key, so repeated run updates create one task.
 const handler = async (
   event: DatabaseEventPayload<ObjectRecordUpdateEvent<WorkflowRunRecord>>,
 ) => {
@@ -31,6 +31,7 @@ const handler = async (
   }
 
   const requests = getFormStepTaskRequests({
+    workflowRunId: run.id,
     state: run.state,
     runStarterWorkspaceMemberId: run.createdBy?.workspaceMemberId,
     now: new Date(),
@@ -44,9 +45,11 @@ const handler = async (
         payload: {
           workflowRunId: run.id,
           stepId: request.stepId,
-          threadId: request.threadId,
+          // The wait key travels as threadId: jobs queued by 0.0.16 and
+          // earlier carry that name
+          threadId: request.waitKey,
         },
-        jobId: `hand-out-${request.threadId}`,
+        jobId: `hand-out-${request.waitKey}`,
       })),
       retryLimit: 2,
     });