@haiiro/docuflow 0.0.16 → 0.0.18

package/src/logic-functions/bitrix-app.logic-function.mjs

@@ -119749,7 +119749,7 @@ var getCrmUrl = () => {
 // package.json
 var package_default = {
   name: "@haiiro/docuflow",
-  version: "0.0.16",
+  version: "0.0.18",
   description: "NorDiv \u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442: \u0437\u0430\u0434\u0430\u043D\u0438\u044F \u0441 \u043F\u043E\u043B\u044F\u043C\u0438, \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B \u0441 \u0437\u0430\u043F\u0443\u0441\u043A\u043E\u043C \u043F\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C, \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0441\u043E \u0432\u0441\u0435\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0411\u0438\u0442\u0440\u0438\u043A\u044124",
   license: "AGPL-3.0-only",
   publishConfig: {

package/src/logic-functions/complete-task.logic-function.mjs

@@ -119409,12 +119409,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",
@@ -119439,6 +119443,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 }
 }`;
@@ -119531,17 +119538,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(
@@ -119565,10 +119579,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" };
 };
 
@@ -119582,8 +119612,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/docflow-app.logic-function.mjs

@@ -59961,7 +59961,7 @@ var AL = class {
 // package.json
 var package_default = {
   name: "@haiiro/docuflow",
-  version: "0.0.16",
+  version: "0.0.18",
   description: "NorDiv \u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u043E\u043E\u0431\u043E\u0440\u043E\u0442: \u0437\u0430\u0434\u0430\u043D\u0438\u044F \u0441 \u043F\u043E\u043B\u044F\u043C\u0438, \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u044B \u0441 \u0437\u0430\u043F\u0443\u0441\u043A\u043E\u043C \u043F\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C, \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u044B \u0441\u043E \u0432\u0441\u0435\u0445 \u0437\u0430\u043F\u0438\u0441\u0435\u0439, \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435 \u0411\u0438\u0442\u0440\u0438\u043A\u044124",
   license: "AGPL-3.0-only",
   publishConfig: {