Merge branch 'release/v3.7.0' into feature/event-registration

Author: AlexeySafronov

ai-agent/chat/components/chat-container/ChatContainer.module.scss

@@ -37,7 +37,8 @@
 @use "../../../../styles/mixins";
 
 :global(.dark) {
-  .chatContainer {
+  .chatContainer,
+  .chatTokens {
     --accent-main: var(--chat-accent-color, var(--color-scheme-main-accent, #{$light-blue-main}));
     --background-color: var(--chat-background, #{$black});
     --text-color: var(--chat-text-color, #{$white});
@@ -86,7 +87,8 @@
 }
 
 :global(.rtl) {
-  .chatContainer {
+  .chatContainer,
+  .chatTokens {
     --input-text-align: right;
   }
 }
@@ -114,7 +116,8 @@
   padding: 0 var(--chat-content-padding) !important;
 }
 
-.chatContainer {
+.chatContainer,
+.chatTokens {
   // ─── Public API ───────────────────────────────────────────────────────
   // Set any --chat-* variable on a parent element to override the default.
   // If not set, the fallback (second argument) is used.

ai-agent/chat/components/chat-message-body/sub-components/message/ToolCallMessage/index.tsx

@@ -41,49 +41,20 @@ import { MessageToolCallProps } from "../../../../../Chat.types";
 import styles from "../../../ChatMessageBody.module.scss";
 
 import { ToolCallConfirmDialog } from "./tool-call-confirm-dialog";
-import { OpenFileConfirmDialog } from "./open-file-confirm-dialog";
 import { ToolCall } from "./tool-call";
 import { ToolCallPlacement, ToolCallStatus } from "./tool-call/ToolCall.enum";
-import { useMessageStore } from "../../../../../store/messageStore";
 
 const ToolCallMessage = observer(({
   content,
   openLink,
   openFile,
 }: MessageToolCallProps) => {
-  const {
-    openFileConfirmQueue,
-    removeFromOpenFileConfirmQueue,
-    generateDocxToolName,
-    generateFormToolName,
-    generatePresentationToolName,
-  } = useMessageStore();
-
   const [needConfirmation, setNeedConfirmation] = React.useState(
     () => !!content.managed,
   );
 
   const hideConfirmDialog = () => setNeedConfirmation(false);
 
-  const isGenerateTool =
-    content.name === generateDocxToolName ||
-    content.name === generateFormToolName ||
-    content.name === generatePresentationToolName;
-
-  const fileData = (
-    content.result as
-      | { data?: { id?: number; title?: string } }
-      | undefined
-  )?.data;
-
-  const needOpenFileConfirm =
-    isGenerateTool &&
-    typeof fileData?.id === "number" &&
-    typeof fileData?.title === "string" &&
-    openFileConfirmQueue.some(
-      (e) => e.fileId === fileData.id,
-    );
-
   const hasError = !!content.result?.error;
 
   const toolCallStatus: ToolCallStatus = needConfirmation
@@ -114,16 +85,6 @@ const ToolCallMessage = observer(({
       {needConfirmation ? (
         <ToolCallConfirmDialog content={content} onClose={hideConfirmDialog} />
       ) : null}
-
-      {needOpenFileConfirm && fileData?.id ? (
-        <OpenFileConfirmDialog
-          content={content}
-          fileId={fileData.id}
-          onClose={() =>
-            removeFromOpenFileConfirmQueue(fileData.id!)
-          }
-        />
-      ) : null}
     </div>
   );
 });

ai-agent/chat/components/chat-message-body/sub-components/message/ToolCallMessage/open-file-confirm-dialog/index.tsx

@@ -34,6 +34,7 @@
  */
 
 import React from "react";
+import classNames from "classnames";
 import { observer } from "mobx-react";
 
 import { ToolsPermission } from "../../../../../../../../enums";
@@ -48,6 +49,7 @@ import {
 } from "../../../../../../../../components/modal-dialog";
 
 import styles from "../../../../ChatMessageBody.module.scss";
+import chatStyles from "../../../../../chat-container/ChatContainer.module.scss";
 import { ToolCall } from "../tool-call";
 import { isMobile } from "../../../../../../../../utils";
 import { useCommonTranslation } from "../../../../../../../../utils/i18n";
@@ -67,26 +69,57 @@ export const ToolCallConfirmDialog = observer(
       toolsConfirmQueue,
       addToToolsConfirmQueue,
       removeFromToolsConfirmQueue,
+      generateDocxToolName,
+      generateFormToolName,
+      generatePresentationToolName,
     } = useMessageStore();
     const { aiApi } = useApi();
     const t = useCommonTranslation();
 
-    const onClickAction = (decision: ToolsPermission) => {
+    const isGenerateTool =
+      content.name === generateDocxToolName ||
+      content.name === generateFormToolName ||
+      content.name === generatePresentationToolName;
+
+    const onClickAction = async (decision: ToolsPermission) => {
       if (content.callId) {
-        aiApi.updateToolsPermission(
-          content.callId,
-          alwaysAllow && decision === ToolsPermission.Allow
-            ? ToolsPermission.AlwaysAllow
-            : decision,
-        );
+        if (isGenerateTool) {
+          const allow = decision === ToolsPermission.Allow;
+          const result = await aiApi.updateToolFileDecision(
+            content.callId,
+            allow,
+          );
+
+          if (allow && typeof result?.id === "number") {
+            const searchParams = new URLSearchParams();
+            searchParams.append("fileId", String(result.id));
+            searchParams.append("withTool", "true");
+
+            window.open(
+              `${window.location.origin}/doceditor?${searchParams.toString()}`,
+              "_blank",
+            );
+          }
+        } else {
+          aiApi.updateToolsPermission(
+            content.callId,
+            alwaysAllow && decision === ToolsPermission.Allow
+              ? ToolsPermission.AlwaysAllow
+              : decision,
+          );
+        }
       }
 
       onClose();
     };
 
     const onCloseAction = () => {
       if (content.callId) {
-        aiApi.updateToolsPermission(content.callId, ToolsPermission.Deny);
+        if (isGenerateTool) {
+          aiApi.updateToolFileDecision(content.callId, false);
+        } else {
+          aiApi.updateToolsPermission(content.callId, ToolsPermission.Deny);
+        }
       }
 
       onClose();
@@ -114,40 +147,52 @@ export const ToolCallConfirmDialog = observer(
         </ModalDialog.Header>
 
         <ModalDialog.Body>
-          <div className={styles.toolCallManage}>
+          <div
+            className={classNames(styles.toolCallManage, chatStyles.chatTokens)}
+          >
             <Text>{t("AIWouldLikeToUseThisTool")}</Text>
             <ToolCall
               content={content}
               status={ToolCallStatus.Confirmation}
               placement={ToolCallPlacement.ConfirmDialog}
             />
             <div>
-              <Text>{t("ReviewAction")}</Text>
-              <Text>{t("CannotGuaranteeSecurity")}</Text>
+              {isGenerateTool ? (
+                <Text>{t("AIGenerateDocumentDescription")}</Text>
+              ) : (
+                <>
+                  <Text>{t("ReviewAction")}</Text>
+                  <Text>{t("CannotGuaranteeSecurity")}</Text>
+                </>
+              )}
             </div>
           </div>
         </ModalDialog.Body>
 
         <ModalDialog.Footer>
-          <div className={styles.toolCallFooter}>
-            <Checkbox
-              isChecked={alwaysAllow}
-              onChange={(e) => setAlwaysAllow(e.target.checked)}
-              label={t("AlwaysAllowToolCall")}
-              data-testid="always-allow-checkbox"
-            />
+          <div
+            className={classNames(styles.toolCallFooter, chatStyles.chatTokens)}
+          >
+            {!isGenerateTool ? (
+              <Checkbox
+                isChecked={alwaysAllow}
+                onChange={(e) => setAlwaysAllow(e.target.checked)}
+                label={t("AlwaysAllowToolCall")}
+                data-testid="always-allow-checkbox"
+              />
+            ) : null}
             <div className={styles.buttonsBlockContainer}>
                <Button
                 primary
-                label={t("Allow")}
+                label={isGenerateTool ? t("Create") : t("Allow")}
                 onClick={() => onClickAction(ToolsPermission.Allow)}
                 scale={isMobile()}
                 size={ButtonSize.normal}
                 data-testid="allow-button"
               />
               <Button
                 className={styles.denyButton}
-                label={t("Deny")}
+                label={isGenerateTool ? t("CancelButton") : t("Deny")}
                 onClick={() => onClickAction(ToolsPermission.Deny)}
                 size={ButtonSize.normal}
                 scale={isMobile()}