Merge remote-tracking branch 'origin/staging' into improvement/enterprise-self-host

# Conflicts:
#	bun.lock

Author: icecrasher321

apps/sim/connectors/sharepoint/sharepoint.test.ts

@@ -264,6 +264,39 @@ describe('resolveFolderTarget', () => {
     )
   })
 
+  it('blames the matched library, not the default one, when its remainder is wrong', async () => {
+    mockGraph({
+      ...defaultDriveRoute,
+      ...sitesDrivesRoute,
+      ...rootChildren(DEFAULT_DRIVE_ID, [folder('d1', 'Archive')]),
+      ...rootChildren(POLICIES_DRIVE_ID, [folder('p1', 'Onboarding')]),
+    })
+
+    const error = await resolve('Policies/HR').catch((e: Error) => e)
+
+    expect(error).toBeInstanceOf(Error)
+    const message = (error as Error).message
+    expect(message).toContain('document library "Policies"')
+    expect(message).toContain('"HR"')
+    expect(message).toContain('"Onboarding"')
+    expect(message).not.toContain('document library "Documents"')
+    expect(message).not.toContain('Shared Documents" should be omitted')
+  })
+
+  it('still offers the prefix hint when the path names the default library itself', async () => {
+    mockGraph({
+      ...defaultDriveRoute,
+      ...sitesDrivesRoute,
+      ...rootChildren(DEFAULT_DRIVE_ID, [folder('d1', 'Archive')]),
+    })
+
+    const error = await resolve('Shared Documents/Reports').catch((e: Error) => e)
+
+    const message = (error as Error).message
+    expect(message).toContain('document library "Documents"')
+    expect(message).toContain('Shared Documents" should be omitted')
+  })
+
   it('surfaces a failure to open the default library rather than reporting not-found', async () => {
     mockGraph({
       [`${GRAPH}/sites/${SITE_ID}/drive?$select=id,name,webUrl`]: { status: 403 },

apps/sim/connectors/sharepoint/sharepoint.ts

@@ -527,14 +527,25 @@ export async function resolveFolderTarget(
     return { driveId: defaultDrive.id, driveName: defaultDriveName, folderId: walked.id }
   }
 
+  /**
+   * When the first segment named a real library, that library is the one the
+   * user meant — report against it and its remainder, not against the default
+   * library and the full path, which would blame the wrong library and advise
+   * stripping a prefix that was correct.
+   */
+  const reportDrive = libraryMatch
+    ? { id: libraryMatch.id, name: libraryMatch.name || segments[0] }
+    : { id: defaultDrive.id, name: defaultDriveName }
+
   throw new Error(
     await buildFolderNotFoundMessage(
       accessToken,
-      { id: defaultDrive.id, name: defaultDriveName },
+      reportDrive,
       siteName || siteUrl,
       trimmed,
-      segments,
+      libraryMatch ? segments.slice(1) : segments,
       drives,
+      reportDrive.id === defaultDrive.id,
       retryOptions
     )
   )
@@ -572,6 +583,11 @@ function matchesDriveName(drive: Drive, segment: string): boolean {
 /**
  * Builds a diagnostic failure message naming the site, the library searched,
  * the path attempted, and the folders that actually exist at that level.
+ *
+ * `searchedDefaultLibrary` gates the advice about stripping a leading library
+ * name: that hint only applies when the path was interpreted against the site's
+ * default library, and would be actively misleading when the caller supplied a
+ * library name that matched.
  */
 async function buildFolderNotFoundMessage(
   accessToken: string,
@@ -580,6 +596,7 @@ async function buildFolderNotFoundMessage(
   rawFolderPath: string,
   segments: string[],
   drives: Drive[],
+  searchedDefaultLibrary: boolean,
   retryOptions?: RetryOptions
 ): Promise<string> {
   const parts = [
@@ -614,9 +631,11 @@ async function buildFolderNotFoundMessage(
     }
   }
 
-  parts.push(
-    'The folder path is relative to the document library root, so a leading "Documents" or "Shared Documents" should be omitted unless a folder by that name really exists.'
-  )
+  if (searchedDefaultLibrary) {
+    parts.push(
+      'The folder path is relative to the document library root, so a leading "Documents" or "Shared Documents" should be omitted unless a folder by that name really exists.'
+    )
+  }
 
   return parts.join(' ')
 }

apps/sim/lib/execution/remote-sandbox/conformance.test.ts

@@ -62,7 +62,7 @@ const {
 }))
 
 vi.mock('@e2b/code-interpreter', () => ({ Sandbox: { create: mockE2BCreate } }))
-vi.mock('@daytonaio/sdk', () => ({
+vi.mock('@daytona/sdk', () => ({
   Daytona: class {
     create = mockDaytonaCreate
   },

apps/sim/lib/execution/remote-sandbox/daytona.ts

@@ -253,7 +253,7 @@ export const daytonaProvider: SandboxProvider = {
     const language = options?.language ?? CodeLanguage.Python
     logger.info('Creating Daytona sandbox', { kind, snapshot })
 
-    const { Daytona } = await import('@daytonaio/sdk')
+    const { Daytona } = await import('@daytona/sdk')
     const daytona = new Daytona({ apiKey })
     const sandbox = await daytona.create({ snapshot, language: toDaytonaLanguage(language) } as any)
 

apps/sim/next.config.ts

@@ -129,7 +129,7 @@ const nextConfig: NextConfig = {
     'isolated-vm',
     '@e2b/code-interpreter',
     'e2b',
-    '@daytonaio/sdk',
+    '@daytona/sdk',
     '@earendil-works/pi-ai',
     '@earendil-works/pi-coding-agent',
   ],

apps/sim/package.json

@@ -67,7 +67,7 @@
     "@browserbasehq/stagehand": "^3.2.1",
     "@calcom/embed-react": "1.5.3",
     "@cerebras/cerebras_cloud_sdk": "^1.23.0",
-    "@daytonaio/sdk": "0.197.0",
+    "@daytona/sdk": "0.200.0",
     "@e2b/code-interpreter": "^2.7.0",
     "@earendil-works/pi-ai": "0.80.10",
     "@earendil-works/pi-coding-agent": "0.80.10",
@@ -103,8 +103,8 @@
     "@radix-ui/react-slot": "1.2.2",
     "@radix-ui/react-switch": "^1.1.2",
     "@radix-ui/react-tabs": "^1.1.2",
-    "@react-email/components": "0.5.7",
-    "@react-email/render": "2.0.8",
+    "@react-email/components": "1.0.12",
+    "@react-email/render": "2.1.0",
     "@sim/audit": "workspace:*",
     "@sim/emcn": "workspace:*",
     "@sim/logger": "workspace:*",
@@ -253,7 +253,7 @@
     "autoprefixer": "10.4.21",
     "jsdom": "^26.0.0",
     "postcss": "^8",
-    "react-email": "4.3.2",
+    "react-email": "6.9.0",
     "tailwindcss": "^3.4.1",
     "typescript": "^7.0.2",
     "vite-tsconfig-paths": "^5.1.4",

apps/sim/scripts/build-pi-daytona-snapshot.ts

@@ -23,7 +23,7 @@
  *   DAYTONA_PI_SNAPSHOT_ID=<name:tag>
  */
 
-import { Daytona, Image } from '@daytonaio/sdk'
+import { Daytona, Image } from '@daytona/sdk'
 import { getErrorMessage } from '@sim/utils/errors'
 import {
   PI_APT,