diff --git a/client/src/components/Chat/Input/Files/AttachFileMenu.tsx b/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
index 952b337b3c..6a3f1e96cb 100644
--- a/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
+++ b/client/src/components/Chat/Input/Files/AttachFileMenu.tsx
@@ -114,6 +114,10 @@ const AttachFileMenu = ({
     ephemeralAgent,
   );
 
+  const isUnifiedMode =
+    endpointFileConfig?.defaultFileInteraction != null &&
+    endpointFileConfig.defaultFileInteraction !== 'legacy';
+
   const handleUploadClick = useCallback(
     (fileType?: FileUploadType) => {
       if (!inputRef.current) {
@@ -139,11 +143,16 @@ const AttachFileMenu = ({
         inputRef.current.accept = '';
       }
       inputRef.current.click();
-      inputRef.current.accept = '';
     },
     [endpointFileConfig?.supportedMimeTypes],
   );
 
+  /** Unified mode: single click triggers file upload with no tool_resource */
+  const handleUnifiedUpload = () => {
+    setToolResource(undefined);
+    handleUploadClick();
+  };
+
   const dropdownItems = useMemo(() => {
     const setToolResource = (value: EToolResources | undefined) => {
       toolResourceRef.current = value;
@@ -305,6 +314,47 @@ const AttachFileMenu = ({
     }
   };
 
+  if (isUnifiedMode) {
+    return (
+      <>
+        <FileUpload
+          ref={inputRef}
+          handleFileChange={(e) => {
+            handleFileChange(e, toolResource);
+          }}
+        >
+          <TooltipAnchor
+            render={
+              <button
+                type="button"
+                disabled={isUploadDisabled}
+                id="attach-file-button"
+                aria-label={localize('com_sidepanel_attach_files')}
+                onClick={handleUnifiedUpload}
+                className="flex size-9 items-center justify-center rounded-full p-1 hover:bg-surface-hover focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-opacity-50"
+              >
+                <div className="flex w-full items-center justify-center gap-2">
+                  <AttachmentIcon />
+                </div>
+              </button>
+            }
+            id="attach-file-button"
+            description={localize('com_sidepanel_attach_files')}
+            disabled={isUploadDisabled}
+          />
+        </FileUpload>
+        <SharePointPickerDialog
+          isOpen={isSharePointDialogOpen}
+          onOpenChange={setIsSharePointDialogOpen}
+          onFilesSelected={handleSharePointFilesSelected}
+          isDownloading={isProcessing}
+          downloadProgress={downloadProgress}
+          maxSelectionCount={endpointFileConfig?.fileLimit}
+        />
+      </>
+    );
+  }
+
   return (
     <>
       <FileUpload
diff --git a/client/src/utils/files.ts b/client/src/utils/files.ts
index 536b340bf3..cc90110d53 100644
--- a/client/src/utils/files.ts
+++ b/client/src/utils/files.ts
@@ -273,8 +273,13 @@ export const validateFiles = ({
     }
 
     let mimeTypesToCheck = supportedMimeTypes;
-    if (toolResource === EToolResources.context) {
+    const isUnifiedMode =
+      !toolResource &&
+      endpointFileConfig.defaultFileInteraction != null &&
+      endpointFileConfig.defaultFileInteraction !== 'legacy';
+    if (toolResource === EToolResources.context || isUnifiedMode) {
       mimeTypesToCheck = [
+        ...(supportedMimeTypes || []),
         ...(fileConfig?.text?.supportedMimeTypes || []),
         ...(fileConfig?.ocr?.supportedMimeTypes || []),
         ...(fileConfig?.stt?.supportedMimeTypes || []),