Sub components created

## Description
Removed old image editor package and related file
Extracted strings for image editor
## Tests

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,45 +1,22 @@
 name: Report a bug
-description: Let us know if something's not working the way you expected.
+description: Things that were working earlier but don't anymore
 labels: []
 body:
     - type: markdown
       attributes:
           value: |
-              Before opening a new bug report, please ensure
-              1. you are on the latest version (it might've already been fixed),
-              2. you've searched for existing issues (please add your observations as a comment there instead of creating a duplicate).
-
-              If you are self hosting, please create a community [Q&A](https://github.com/ente-io/ente/discussions/categories/q-a) instead.
+              **Checklist**
+              1. You've searched existing [issues](https://github.com/search?q=repo%3Aente-io%2Fente+&type=issues) and [discussions](https://github.com/search?q=repo%3Aente-io%2Fente+&type=discussions)
+              2. It was working earlier (otherwise use [enhancements](https://github.com/ente-io/ente/discussions/categories/enhancements))
+              3. It is not about self hosting (for those use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
     - type: textarea
       attributes:
           label: Description
-          description: >
-              Please describe the bug. If possible, also include the steps to
-              reproduce the behaviour, and the expected behaviour (sometimes
-              bugs are just expectation mismatches, in which case this would be
-              a good fit for [feature
-              requests](https://github.com/ente-io/ente/discussions/categories/feature-requests)).
-      validations:
-          required: true
     - type: input
       attributes:
           label: Version
           description: The version can be seen at the bottom of settings.
           placeholder: e.g. v1.2.3
-    - type: input
-      attributes:
-          label: Last working version
-          description: >
-              The version where the feature was last known to be working. It is
-              fine if you don't remember the exact version (mention roughly
-              then), but if there just isn't a last known working version, then
-              it is likely that what is being reported is not an issue but a
-              feature request. The difference between the two categories is not
-              just semantic - feature requests use GitHub discussions and so can
-              be [upvoted by the
-              community](https://github.com/ente-io/ente/discussions/categories/feature-requests)
-              (issues can't be).
-          placeholder: e.g. v1.2.3
     - type: dropdown
       attributes:
           label: What product are you using?

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Feature requests and questions
+    - name: Enhacements, feature requests, feedback and questions
       url: https://github.com/ente-io/ente/discussions
       about: Please use Discussions for everything apart from the above.

.github/workflows/auth-crowdin-push.yml

@@ -24,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "auth/"
-                  config: "auth/crowdin.yml"
+                  base_path: "mobile/apps/auth/"
+                  config: "mobile/apps/auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

.github/workflows/auth-crowdin-sync.yml

@@ -23,8 +23,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "auth/"
-                  config: "auth/crowdin.yml"
+                  base_path: "mobile/apps/auth/"
+                  config: "mobile/apps/auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true

.github/workflows/auth-internal-release.yml

@@ -15,7 +15,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -55,7 +55,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
             - name: Notify Discord

.github/workflows/auth-lint.yml

@@ -18,7 +18,7 @@ jobs:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4

.github/workflows/auth-release.yml

@@ -40,7 +40,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -98,7 +98,7 @@ jobs:
 
             - name: Install appimagetool
               run: |
-                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
+                  wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
                   chmod +x appimagetool
                   mv appimagetool /usr/local/bin/
 
@@ -124,7 +124,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -136,15 +136,16 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
     build-windows:
         runs-on: windows-latest
+        environment: "auth-win-build"
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -174,14 +175,22 @@ jobs:
             - name: Retain Windows EXE and DLLs
               run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows
 
-            - name: Code sign Windows installer and EXE
-              uses: dlemstra/code-sign-action@v1
+            - name: Sign files with Trusted Signing
+              uses: azure/trusted-signing-action@v0
               with:
-                  certificate: "${{ secrets.WINDOWS_CERTIFICATE }}"
-                  password: "${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}"
-                  files: |
-                      auth/artifacts/ente-${{ github.ref_name }}-installer.exe
-                      auth/ente-${{ github.ref_name }}-windows/auth.exe
+                azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+                azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+                azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+                endpoint: ${{ secrets.AZURE_ENDPOINT }}
+                trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+                certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+                files: |
+                      ${{ github.workspace }}/mobile/apps/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/mobile/apps/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                file-digest: SHA256
+                timestamp-rfc3161: http://timestamp.acs.microsoft.com
+                timestamp-digest: SHA256  
+
 
             - name: Zip Windows EXE and DLLs
               run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows
@@ -192,7 +201,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -202,7 +211,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -289,7 +298,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true

.github/workflows/docs-lint.yml

@@ -0,0 +1,32 @@
+name: "Lint (docs)"
+
+on:
+    # Run on every pull request (open or push to it) that changes docs/
+    pull_request:
+        paths:
+            - "docs/**"
+            - ".github/workflows/docs-lint.yml"
+
+permissions:
+    contents: read
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: docs
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - run: yarn install
+
+            - run: yarn pretty:check

.github/workflows/mobile-crowdin-push.yml

@@ -5,7 +5,7 @@ on:
         branches: [main]
         paths:
             # Run workflow when mobiles's intl_en.arb is changed
-            - "mobile/lib/l10n/intl_en.arb"
+            - "mobile/apps/photos/lib/l10n/intl_en.arb"
             # Or the workflow itself is changed
             - ".github/workflows/mobile-crowdin.yml"
 
@@ -24,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/"
-                  config: "mobile/crowdin.yml"
+                  base_path: "mobile/apps/photos/"
+                  config: "mobile/apps/photos/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

.github/workflows/mobile-crowdin-sync.yml

@@ -1,4 +1,4 @@
-name: "Sync Crowdin translations (mobile)"
+name: "Sync Crowdin translations (mobile/photos)"
 
 on:
     schedule:
@@ -23,14 +23,14 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/"
-                  config: "mobile/crowdin.yml"
+                  base_path: "mobile/apps/photos/"
+                  config: "mobile/apps/photos/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
                   localization_branch_name: translations/mobile
                   create_pull_request: true
-                  pull_request_title: "[mobile] New translations"
+                  pull_request_title: "[mobile/photos] New translations"
                   pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-app)"
                   pull_request_base_branch_name: "main"
                   project_id: 574741

.github/workflows/mobile-internal-release-rust.yml

@@ -16,7 +16,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
 
         steps:
             - name: Checkout code and submodules
@@ -64,7 +64,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.photos
-                  releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
             - name: Notify Discord

.github/workflows/mobile-internal-release.yml

@@ -15,7 +15,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
 
         steps:
             - name: Checkout code and submodules
@@ -55,7 +55,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.photos
-                  releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
             - name: Notify Discord

.github/workflows/mobile-lint.yml

@@ -4,7 +4,7 @@ on:
     # Run on every pull request (open or push to it) that changes mobile/
     pull_request:
         paths:
-            - "mobile/**"
+            - "mobile/apps/photos/**"
             - ".github/workflows/mobile-lint.yml"
 
 env:
@@ -18,7 +18,7 @@ jobs:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4

.github/workflows/mobile-release.yml

@@ -20,7 +20,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
 
         steps:
             - name: Checkout code and submodules
@@ -62,5 +62,5 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/build/app/outputs/flutter-apk/sha256sum"
+                  artifacts: "mobile/apps/photos/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/apps/photos/build/app/outputs/flutter-apk/sha256sum"
                   draft: true

.github/workflows/photos-internal-release.yml

@@ -0,0 +1,126 @@
+name: "Internal Release V2 (photos)"
+
+on:
+  workflow_dispatch: # Manual trigger only
+
+env:
+  FLUTTER_VERSION: "3.24.3"
+  ANDROID_KEYSTORE_PATH: "keystore/ente_photos_key.jks"
+
+jobs:
+  build:
+    runs-on: macos-latest # Required for iOS builds
+    environment: "ios-build"
+    permissions:
+      contents: write
+
+    defaults:
+      run:
+        working-directory: mobile/apps/photos
+
+    steps:
+      # Common Setup
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+
+      # Android Build 
+      - name: Setup Android signing key
+        uses: timheuer/base64-to-file@v1
+        with:
+          fileName: ${{ env.ANDROID_KEYSTORE_PATH }}
+          encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
+
+      # - name: Build Android AAB
+      #   run: |
+      #     flutter build appbundle \
+      #       --dart-define=cronetHttpNoPlay=true \
+      #       --release \
+      #       --flavor playstore
+      #   env:
+      #     SIGNING_KEY_PATH: ${{ env.ANDROID_KEYSTORE_PATH }}
+      #     SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
+      #     SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
+      #     SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
+
+      # iOS Build (new secure implementation)
+      - name: Install fastlane
+        run: gem install fastlane
+      
+      - name: Create ExportOptions.plist
+        run: |
+          cat <<EOF > ios/ExportOptions.plist
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+              <key>method</key>
+              <string>app-store</string>
+              <key>teamID</key>
+              <string>${{ secrets.IOS_TEAM_ID }}</string>
+          </dict>
+          </plist>
+          EOF
+
+      - name: Setup App Store Connect API Key
+        run: |
+          echo '${{ secrets.IOS_API_KEY }}' > api_key.json
+          chmod 600 api_key.json
+
+      - name: Build iOS IPA
+        run: |
+          flutter build ipa \
+            --release \
+            --export-options-plist=ExportOptions.plist \
+            --dart-define=cronetHttpNoPlay=true
+        env:
+          SIGNING_TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+
+      # Uploads
+      # - name: Upload to Play Store
+      #   uses: r0adkll/upload-google-play@v1
+      #   with:
+      #     serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+      #     packageName: io.ente.photos
+      #     releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+      #     track: internal
+
+      - name: Upload to TestFlight
+        run: |
+          fastlane pilot upload \
+            --api_key_path api_key.json \
+            --ipa "build/ios/ipa/Ente Photos.ipa" \
+            --skip_waiting_for_build_processing \
+            --apple_id ${{ secrets.IOS_APPLE_ID }} \
+            --app_identifier "io.ente.photos"
+        env:
+          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.IOS_API_KEY_ID }}
+          APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.IOS_ISSUER_ID }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.IOS_APP_SPECIFIC_PASSWORD }}
+
+      - name: Clean sensitive files
+        run: |
+          rm -f api_key.json
+          rm -f ${{ env.ANDROID_KEYSTORE_PATH }}
+
+      - name: Notify Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+          title: "🚀 Dual Platform Release Uploaded"
+          description: |
+            **Android**: [Play Store Internal](https://play.google.com/store/apps/details?id=io.ente.photos)
+            **iOS**: TestFlight build processing
+          color: 0x00ff00

.github/workflows/rust-lint.yml

@@ -0,0 +1,41 @@
+name: "Lint (rust)"
+
+on:
+    # Run on every pull request (open or push to it) that changes rust/
+    pull_request:
+        paths:
+            - "rust/**"
+            - ".github/workflows/rust-lint.yml"
+
+permissions:
+    contents: read
+
+# Cancel in-progress lint runs when a new commit is pushed.
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: rust
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Cache
+              uses: actions/cache@v4
+              with:
+                  path: |
+                      ~/.cargo/registry
+                      ~/.cargo/git
+                      target
+                  key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+                            
+            - run: cargo fmt --check
+
+            - run: cargo clippy
+
+            - run: cargo build

.github/workflows/web-deploy.yml

@@ -93,3 +93,13 @@ jobs:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/payments web/apps/payments/dist
+
+            - name: Build locker
+              run: yarn build:locker
+
+            - name: Publish locker
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/locker web/apps/locker/out

.gitmodules

@@ -3,9 +3,9 @@
 	url = https://github.com/ente-io/sentry-dart.git
 	branch = sentry_flutter_ente
 [submodule "auth/flutter"]
-	path = auth/flutter
+	path = mobile/apps/auth/flutter
 	url = https://github.com/flutter/flutter.git
 	branch = stable
 [submodule "auth/assets/simple-icons"]
-	path = auth/assets/simple-icons
+	path = mobile/apps/auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git

CONTRIBUTING.md

@@ -1,54 +1,42 @@
 # Contributing
 
-First and foremost, thank you for your interest in contributing to Ente 🙏
-
-There are many ways to contribute, and most of them don't require writing code.
-
-* [Spread the word](#spread-the-word)
-* [Engage with the community](#engage-with-the-community)
-* [Translate](#translate)
-* [Document](#document)
-
+- [Spread the word](#spread-the-word)
+- [Engage with the community](#engage-with-the-community)
+- [Translate](#translate)
+- [Document](#document)
 
 ## Spread the word
 
-This is perhaps the most impactful contribution you can make. [Spread the
-word](https://help.ente.io/photos/features/referral-program/). Online on your
-favorite social media channels. Offline to your friends and family who are
-looking for a privacy-friendly alternative to big tech.
+**This is the most impactful contribution you can make**.
+
+[Spread the word](https://help.ente.io/photos/features/referral-program/). Online on your favorite social media channels. Offline to your friends and family who are looking for a privacy-friendly alternative to big tech.
 
 ## Engage with the community
 
-Just hang around, enjoy the vibe. Answer someone's query on our
-[Discord](https://discord.gg/z2YVKkycX3), or pile on in the sporadic #off-topic
-rants there. Chuckle (or wince!) at our [Twitter](https://twitter.com/enteio)
-memes. Suggest a new feature in our [Github
-Discussions](https://github.com/ente-io/ente/discussions/new?category=feature-requests),
-or upvote the existing ones that you feel we should focus on first. Provide your
-opinion on existing threads.
+Just hang around, enjoy the vibe. The Ente community — the people who are building Ente, and the people who are using Ente — hang out at various places depending on their proclivity:
 
-These might seem like small things, but it provides us energy. Knowing that
-there is a community of people who care for what we are building.
+- [Discord](https://discord.ente.io)
+- [Mastodon](https://fosstodon.org/@ente)
+- [X / Twitter](https://twitter.com/enteio)
+- [Github Discussions](https://github.com/ente-io/ente/discussions)
+
+Just being around might seem a small thing, but it provides us energy. Knowing that there is a community of people who care for what we are building, **who want us to do better**.
 
 ## Translate
 
-If you're interested in helping out with translation, please visit our Crowdin
-projects to get started:
-
-| Project  |  |
-| ------------- | ------------- |
-| [Auth](https://crowdin.com/project/ente-authenticator-app)  | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)  |
-| [Photos](https://crowdin.com/project/ente-photos-app)  | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)  |
-| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web)  | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)  |
+Visit our Crowdin projects to help with translations:
 
+| Project                                                             |                                                                                                                                   |
+| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| [Auth](https://crowdin.com/project/ente-authenticator-app)          | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) |
+| [Photos](https://crowdin.com/project/ente-photos-app)               | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)               |
+| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web) | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)               |
 
 If your language is not listed for translation, please [create a GitHub
 issue](https://github.com/ente-io/ente/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A+%0AProject%3A+auth%2Fphotos%2Fboth)
 to have it added. It is okay to have partial translations. Once ~90% of the
 strings in a language get translated, we will start surfacing it in the apps.
 
-Thank you for your support.
-
 ## Document
 
 The help guides and FAQs for users of Ente products are also open source, and
@@ -60,25 +48,9 @@ See [docs/](docs/README.md) for how to edit these documents.
 
 ## Code contributions
 
-Code is a small aspect of community, and the ways mentioned above are more
-important in helping us. But if you'd _really_ like to contribute code, it is
-best to start small. Consider some well-scoped changes, say like adding more
-[custom icons to auth](auth/docs/adding-icons.md).
+If you'd like to contribute code, it is best to start small. Consider some well-scoped changes, say like adding more [custom icons to auth](auth/docs/adding-icons.md), or fixing a specific bug.
 
-Each of the individual product/platform specific directories in this repository
-have instructions on setting up a dev environment.
-
-For anything beyond trivial bug fixes, please use [features requests and
-discussions](https://github.com/ente-io/ente/discussions) instead of performing
-code changes directly.
-
-> [!TIP]
->
-> Please remember that code is a important, but small, part of the overall big
-> picture that makes a product a joy to use. Something that's easy in code is
-> not necessarily the right choice for the product as a whole. So we'll repeat -
-> there are other ways to contribute than code that we'd request you to
-> consider.
+Code that changes the behaviour of the product might not get merged, at least not initially. The PR can serve as a discussion bed, but you might find it easier to just start a discussion instead, or post your perspective in the (likely) existing thread about the behaviour change or new feature you wish for.
 
 ## Leave a review or star
 

auth/lib/l10n/arb/app_be.arb

@@ -1,97 +0,0 @@
-{
-  "account": "Уліковы запіс",
-  "unlock": "Разблакіраваць",
-  "recoveryKey": "Ключ аднаўлення",
-  "counterAppBarTitle": "Лічыльнік",
-  "@counterAppBarTitle": {
-    "description": "Text shown in the AppBar of the Counter Page"
-  },
-  "onBoardingBody": "Бяспечна зрабіць рэзервовую копію кодаў 2ФА",
-  "onBoardingGetStarted": "Пачаць",
-  "setupFirstAccount": "Наладзіць ваш першы ўліковы запіс",
-  "importScanQrCode": "Сканіраваць код QR-код",
-  "qrCode": "QR-код",
-  "importEnterSetupKey": "Увесці ключ наладжвання",
-  "importAccountPageTitle": "Увесці падрабязнасці ўліковага запісу",
-  "secretCanNotBeEmpty": "Сакрэт не можа быць пустым",
-  "bothIssuerAndAccountCanNotBeEmpty": "І выдавец, і ўліковы запіс не могуць быць пустымі",
-  "incorrectDetails": "Няправільныя падрабязнасці",
-  "pleaseVerifyDetails": "Праверце падрабязнасці і паспрабуйце яшчэ раз",
-  "codeIssuerHint": "Выдавец",
-  "codeSecretKeyHint": "Сакрэтны ключ",
-  "secret": "Сакрэт",
-  "all": "Усе",
-  "notes": "Нататкі",
-  "notesLengthLimit": "Максімальная колькасць сімвалаў у нататках не больш за {count}",
-  "@notesLengthLimit": {
-    "description": "Text to indicate the maximum number of characters allowed for notes",
-    "placeholders": {
-      "count": {
-        "description": "The maximum number of characters allowed for notes",
-        "type": "int",
-        "example": "100"
-      }
-    }
-  },
-  "codeAccountHint": "Уліковы запіс (vy@damen.com)",
-  "codeTagHint": "Тэг",
-  "accountKeyType": "Тып ключа",
-  "sessionExpired": "Сеанс завяршыўся",
-  "@sessionExpired": {
-    "description": "Title of the dialog when the users current session is invalid/expired"
-  },
-  "pleaseLoginAgain": "Аўтарызуйцеся яшчэ раз",
-  "loggingOut": "Выхад...",
-  "timeBasedKeyType": "Заснаваныя на часе (TOTP)",
-  "counterBasedKeyType": "Заснаваныя на лічыльніку (HOTP)",
-  "saveAction": "Захаваць",
-  "nextTotpTitle": "наступны",
-  "deleteCodeTitle": "Выдаліць код?",
-  "deleteCodeMessage": "Вы сапраўды хочаце выдаліць гэты код? Гэта дзеянне з'яўляецца незваротным.",
-  "trashCode": "Выдаліць код?",
-  "trashCodeMessage": "Вы сапраўды хочаце выдаліць код для {account}?",
-  "trash": "Сметніца",
-  "viewLogsAction": "Паглядзець журнал",
-  "preparingLogsTitle": "Падрыхтоўка журнала...",
-  "emailLogsTitle": "Адправіць журнал па электроннай пошце",
-  "exportLogsAction": "Экспартаваць журнал",
-  "reportABug": "Паведаміць пра памылку",
-  "reportBug": "Паведаміць пра памылку",
-  "contactSupport": "Звярнуцца ў службу падтрымкі",
-  "blog": "Блог",
-  "verifyPassword": "Праверыць пароль",
-  "pleaseWait": "Пачакайце...",
-  "generatingEncryptionKeysTitle": "Генерацыя ключоў шыфравання...",
-  "recreatePassword": "Стварыць пароль паўторна",
-  "useRecoveryKey": "Выкарыстоўваць ключ аднаўлення",
-  "incorrectPasswordTitle": "Няправільны пароль",
-  "welcomeBack": "З вяртаннем!",
-  "changePassword": "Змяніць пароль",
-  "data": "Даныя",
-  "importCodes": "Імпартаваць коды",
-  "passwordEmptyError": "Пароль не можа быць пустым",
-  "importFromApp": "Імпартаваць коды з {appName}",
-  "exportCodes": "Экспартаваць коды",
-  "importLabel": "Імпарт",
-  "selectFile": "Выбраць файл",
-  "yes": "Так",
-  "no": "Не",
-  "email": "Электронная пошта",
-  "support": "Падтрымка",
-  "settings": "Налады",
-  "pleaseTryAgain": "Калі ласка, паспрабуйце яшчэ раз",
-  "delete": "Выдаліць",
-  "enterYourPasswordHint": "Увядзіце ваш пароль",
-  "faq": "Частыя пытанні",
-  "deleteAccount": "Выдаліць уліковы запіс",
-  "noDeleteAccountAction": "Не, выдаліць уліковы запіс",
-  "sendEmail": "Адправіць ліст",
-  "createNewAccount": "Стварыць новы ўліковы запіс",
-  "confirmPassword": "Пацвердзіць пароль",
-  "close": "Закрыць",
-  "oopsSomethingWentWrong": "Штосьці пайшло не так.",
-  "language": "Мова",
-  "security": "Бяспека",
-  "searchHint": "Пошук...",
-  "search": "Пошук"
-}

auth/lib/l10n/arb/app_et.arb

@@ -1,4 +0,0 @@
-{
-  "loggingOut": "Väljalogimine...",
-  "useRecoveryKey": "Kasuta taastevõtit"
-}

auth/lib/services/user_remote_flag_service.dart

@@ -1,141 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:dio/dio.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/core/event_bus.dart';
-import 'package:ente_auth/core/network.dart';
-import 'package:ente_auth/events/notification_event.dart';
-import 'package:ente_auth/services/user_service.dart';
-import 'package:logging/logging.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserRemoteFlagService {
-  final _dio = Network.instance.getDio();
-  final _logger = Logger((UserRemoteFlagService).toString());
-  final _config = Configuration.instance;
-  late SharedPreferences _prefs;
-
-  UserRemoteFlagService._privateConstructor();
-
-  static final UserRemoteFlagService instance =
-      UserRemoteFlagService._privateConstructor();
-
-  static const String recoveryVerificationFlag = "recoveryKeyVerified";
-  static const String needRecoveryKeyVerification =
-      "needRecoveryKeyVerification";
-
-  Future<void> init() async {
-    _prefs = await SharedPreferences.getInstance();
-  }
-
-  bool shouldShowRecoveryVerification() {
-    if (!_prefs.containsKey(needRecoveryKeyVerification)) {
-      // fetch the status from remote
-      unawaited(_refreshRecoveryVerificationFlag());
-      return false;
-    } else {
-      final bool shouldShow = _prefs.getBool(needRecoveryKeyVerification)!;
-      if (shouldShow) {
-        // refresh the status to check if user marked it as done on another device
-        unawaited(_refreshRecoveryVerificationFlag());
-      }
-      return shouldShow;
-    }
-  }
-
-  // markRecoveryVerificationAsDone is used to track if user has verified their
-  // recovery key in the past or not. This helps in avoid showing the same
-  // prompt to the user on re-install or signing into a different device
-  Future<void> markRecoveryVerificationAsDone() async {
-    await _updateKeyValue(recoveryVerificationFlag, true.toString());
-    await _prefs.setBool(needRecoveryKeyVerification, false);
-  }
-
-  Future<void> _refreshRecoveryVerificationFlag() async {
-    _logger.finest('refresh recovery key verification flag');
-    final remoteStatusValue =
-        await _getValue(recoveryVerificationFlag, "false");
-    final bool isNeedVerificationFlagSet =
-        _prefs.containsKey(needRecoveryKeyVerification);
-    if (remoteStatusValue.toLowerCase() == "true") {
-      await _prefs.setBool(needRecoveryKeyVerification, false);
-      // If the user verified on different device, then we should refresh
-      // the UI to dismiss the Notification.
-      if (isNeedVerificationFlagSet) {
-        Bus.instance.fire(NotificationEvent());
-      }
-    } else if (!isNeedVerificationFlagSet) {
-      // Verification is not done yet as remoteStatus is false and local flag to
-      // show notification isn't set. Set the flag to true if any active
-      // session is older than 1 day.
-      final activeSessions = await UserService.instance.getActiveSessions();
-      final int microSecondsInADay = const Duration(days: 1).inMicroseconds;
-      final bool anyActiveSessionOlderThanADay =
-          activeSessions.sessions.firstWhereOrNull(
-                (e) =>
-                    (e.creationTime + microSecondsInADay) <
-                    DateTime.now().microsecondsSinceEpoch,
-              ) !=
-              null;
-      if (anyActiveSessionOlderThanADay) {
-        await _prefs.setBool(needRecoveryKeyVerification, true);
-        Bus.instance.fire(NotificationEvent());
-      } else {
-        // continue defaulting to no verification prompt
-        _logger.finest('No active session older than 1 day');
-      }
-    }
-  }
-
-  Future<String> _getValue(String key, String? defaultValue) async {
-    try {
-      final Map<String, dynamic> queryParams = {"key": key};
-      if (defaultValue != null) {
-        queryParams["defaultValue"] = defaultValue;
-      }
-      final response = await _dio.get(
-        "${_config.getHttpEndpoint()}/remote-store",
-        queryParameters: queryParams,
-        options: Options(
-          headers: {
-            "X-Auth-Token": _config.getToken(),
-          },
-        ),
-      );
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected status code ${response.statusCode}");
-      }
-      return response.data["value"];
-    } catch (e) {
-      _logger.info("Error while fetching bool status for $key", e);
-      rethrow;
-    }
-  }
-
-  // _setBooleanFlag sets the corresponding flag on remote
-  // to mark recovery as completed
-  Future<void> _updateKeyValue(String key, String value) async {
-    try {
-      final response = await _dio.post(
-        "${_config.getHttpEndpoint()}/remote-store/update",
-        data: {
-          "key": key,
-          "value": value,
-        },
-        options: Options(
-          headers: {
-            "X-Auth-Token": _config.getToken(),
-          },
-        ),
-      );
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected state");
-      }
-    } catch (e) {
-      _logger.warning("Failed to set flag for $key", e);
-      rethrow;
-    }
-  }
-}

auth/lib/ui/account/verify_recovery_page.dart

@@ -1,219 +0,0 @@
-import 'package:bip39/bip39.dart' as bip39;
-import 'package:dio/dio.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/ente_theme_data.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/services/local_authentication_service.dart';
-import 'package:ente_auth/services/user_remote_flag_service.dart';
-import 'package:ente_auth/ui/account/recovery_key_page.dart';
-import 'package:ente_auth/ui/common/gradient_button.dart';
-import 'package:ente_auth/ui/components/buttons/button_widget.dart';
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_auth/utils/navigation_util.dart';
-import 'package:ente_auth/utils/platform_util.dart';
-import 'package:ente_crypto_dart/ente_crypto_dart.dart';
-import 'package:flutter/material.dart';
-import 'package:logging/logging.dart';
-
-class VerifyRecoveryPage extends StatefulWidget {
-  const VerifyRecoveryPage({super.key});
-
-  @override
-  State<VerifyRecoveryPage> createState() => _VerifyRecoveryPageState();
-}
-
-class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
-  final _recoveryKey = TextEditingController();
-  final Logger _logger = Logger((_VerifyRecoveryPageState).toString());
-
-  void _verifyRecoveryKey() async {
-    final dialog =
-        createProgressDialog(context, context.l10n.verifyingRecoveryKey);
-    await dialog.show();
-    try {
-      final String inputKey = _recoveryKey.text.trim();
-      final String recoveryKey =
-          CryptoUtil.bin2hex(Configuration.instance.getRecoveryKey());
-      final String recoveryKeyWords = bip39.entropyToMnemonic(recoveryKey);
-      if (inputKey == recoveryKey || inputKey == recoveryKeyWords) {
-        try {
-          await UserRemoteFlagService.instance.markRecoveryVerificationAsDone();
-        } catch (e) {
-          await dialog.hide();
-          if (e is DioException && e.type == DioExceptionType.unknown) {
-            await showErrorDialog(
-              context,
-              "No internet connection",
-              "Please check your internet connection and try again.",
-            );
-          } else {
-            await showGenericErrorDialog(
-              context: context,
-              error: e,
-            );
-          }
-          return;
-        }
-
-        await dialog.hide();
-        // todo: change this as per figma once the component is ready
-        await showErrorDialog(
-          context,
-          context.l10n.recoveryKeyVerified,
-          context.l10n.recoveryKeySuccessBody,
-        );
-        Navigator.of(context).pop();
-      } else {
-        throw Exception("recovery key didn't match");
-      }
-    } catch (e, s) {
-      _logger.severe("failed to verify recovery key", e, s);
-      await dialog.hide();
-      final String errMessage = context.l10n.invalidRecoveryKey;
-      final result = await showChoiceDialog(
-        context,
-        title: context.l10n.invalidKey,
-        body: errMessage,
-        firstButtonLabel: context.l10n.tryAgain,
-        secondButtonLabel: context.l10n.viewRecoveryKey,
-        secondButtonAction: ButtonAction.second,
-      );
-      if (result!.action == ButtonAction.second) {
-        await _onViewRecoveryKeyClick();
-      }
-    }
-  }
-
-  Future<void> _onViewRecoveryKeyClick() async {
-    final hasAuthenticated =
-        await LocalAuthenticationService.instance.requestLocalAuthentication(
-      context,
-      "Please authenticate to view your recovery key",
-    );
-    await PlatformUtil.refocusWindows();
-
-    if (hasAuthenticated) {
-      String recoveryKey;
-      try {
-        recoveryKey =
-            CryptoUtil.bin2hex(Configuration.instance.getRecoveryKey());
-        await routeToPage(
-          context,
-          RecoveryKeyPage(
-            recoveryKey,
-            context.l10n.ok,
-            showAppBar: true,
-            onDone: () {
-              Navigator.of(context).pop();
-            },
-          ),
-        );
-      } catch (e) {
-        // ignore: unawaited_futures
-        showGenericErrorDialog(
-          context: context,
-          error: e,
-        );
-        return;
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final enteTheme = Theme.of(context).colorScheme.enteTheme;
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back),
-          color: Theme.of(context).iconTheme.color,
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-        ),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16.0),
-        child: LayoutBuilder(
-          builder: (context, constraints) {
-            return SingleChildScrollView(
-              child: ConstrainedBox(
-                constraints: BoxConstraints(
-                  minWidth: constraints.maxWidth,
-                  minHeight: constraints.maxHeight,
-                ),
-                child: IntrinsicHeight(
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 12),
-                      SizedBox(
-                        width: double.infinity,
-                        child: Text(
-                          context.l10n.confirmRecoveryKey,
-                          style: enteTheme.textTheme.h3Bold,
-                          textAlign: TextAlign.left,
-                        ),
-                      ),
-                      const SizedBox(height: 18),
-                      Text(
-                        context.l10n.recoveryKeyVerifyReason,
-                        style: enteTheme.textTheme.small
-                            .copyWith(color: enteTheme.colorScheme.textMuted),
-                      ),
-                      const SizedBox(height: 12),
-                      TextFormField(
-                        decoration: InputDecoration(
-                          filled: true,
-                          hintText: context.l10n.enterYourRecoveryKey,
-                          contentPadding: const EdgeInsets.all(20),
-                          border: UnderlineInputBorder(
-                            borderSide: BorderSide.none,
-                            borderRadius: BorderRadius.circular(6),
-                          ),
-                        ),
-                        style: const TextStyle(
-                          fontSize: 14,
-                          fontFeatures: [FontFeature.tabularFigures()],
-                        ),
-                        controller: _recoveryKey,
-                        autofocus: false,
-                        autocorrect: false,
-                        keyboardType: TextInputType.multiline,
-                        minLines: 4,
-                        maxLines: null,
-                        onChanged: (_) {
-                          setState(() {});
-                        },
-                      ),
-                      const SizedBox(height: 12),
-                      Expanded(
-                        child: Container(
-                          alignment: Alignment.bottomCenter,
-                          width: double.infinity,
-                          padding: const EdgeInsets.fromLTRB(0, 12, 0, 40),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            crossAxisAlignment: CrossAxisAlignment.stretch,
-                            children: [
-                              GradientButton(
-                                onTap: _verifyRecoveryKey,
-                                text: context.l10n.confirm,
-                              ),
-                              const SizedBox(height: 8),
-                            ],
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                    ],
-                  ),
-                ),
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

cli/config.yaml.example

@@ -5,8 +5,6 @@
 
 endpoint:
   api: "http://localhost:8080"
-  # Endpoint for the account service for passkey
-  accounts: "http://localhost:3001"
 
 log:
  http: false # log status code & time taken by requests

cli/internal/api/login_type.go

@@ -35,6 +35,7 @@ type AuthorizationResponse struct {
 	ID                 int64          `json:"id"`
 	KeyAttributes      *KeyAttributes `json:"keyAttributes,omitempty"`
 	EncryptedToken     string         `json:"encryptedToken,omitempty"`
+	AccountsUrl        string         `json:"accountsUrl"`
 	Token              string         `json:"token,omitempty"`
 	TwoFactorSessionID string         `json:"twoFactorSessionID"`
 	PassKeySessionID   string         `json:"passkeySessionID"`

cli/main.go

@@ -110,7 +110,6 @@ func initConfig(cliConfigDir string) {
 	viper.AddConfigPath(".")                // optionally look for config in the working directory
 
 	viper.SetDefault("endpoint.api", constants.EnteApiUrl)
-	viper.SetDefault("endpoint.accounts", constants.EnteAccountUrl)
 	viper.SetDefault("log.http", false)
 	if err := viper.ReadInConfig(); err != nil {
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {

cli/pkg/sign_in.go

@@ -8,8 +8,8 @@ import (
 	eCrypto "github.com/ente-io/cli/internal/crypto"
 	"github.com/ente-io/cli/pkg/model"
 	"github.com/ente-io/cli/utils/browser"
+	"github.com/ente-io/cli/utils/constants"
 	"github.com/ente-io/cli/utils/encoding"
-	"github.com/spf13/viper"
 	"log"
 
 	"github.com/kong/go-srp"
@@ -145,7 +145,10 @@ func (c *ClICtrl) verifyPassKey(ctx context.Context, authResp *api.Authorization
 	if !authResp.IsPasskeyRequired() {
 		return authResp, nil
 	}
-	baseAccountUrl := viper.GetString("endpoint.accounts")
+	baseAccountUrl := constants.EnteAccountUrl
+	if authResp.AccountsUrl != "" {
+		baseAccountUrl = authResp.AccountsUrl
+	}
 	passkeyAuthUrl := fmt.Sprintf("%s/passkeys/verify?passkeySessionID=%s&redirect=ente-cli://passkey&clientPackage=%s", baseAccountUrl, authResp.PassKeySessionID, app.ClientPkg())
 	fmt.Printf("Open this url in browser to verify passkey: %s\n", passkeyAuthUrl)
 	err := browser.OpenURL(passkeyAuthUrl)

desktop/.github/workflows/desktop-release.yml

@@ -44,8 +44,7 @@ jobs:
                   # If triggered by a tag, checkout photosd-$tag from the source
                   # repository. Otherwise checkout $source (default: "main").
                   repository: ente-io/ente
-                  ref:
-                      "${{ startsWith(github.ref, 'refs/tags/v') &&
+                  ref: "${{ startsWith(github.ref, 'refs/tags/v') &&
                       format('photosd-{0}', github.ref_name) || ( inputs.source
                       || 'main' ) }}"
 
@@ -110,9 +109,13 @@ jobs:
               env:
                   # macOS notarization credentials key details
                   APPLE_ID: ${{ secrets.APPLE_ID }}
-                  APPLE_APP_SPECIFIC_PASSWORD:
-                      ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+                  APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
                   APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+                  # Windows Azure Trusted Signing related values
+                  # https://www.electron.build/code-signing-win#using-azure-trusted-signing-beta
+                  AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+                  AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+                  AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
                   # Default is "draft", but since our nightly builds update
                   # existing pre-releases, set this to "prerelease".
                   EP_PRE_RELEASE: true

desktop/.prettierrc.json

@@ -1,6 +1,5 @@
 {
     "tabWidth": 4,
-    "proseWrap": "always",
     "objectWrap": "collapse",
     "plugins": [
         "prettier-plugin-organize-imports",

desktop/CHANGELOG.md

@@ -1,6 +1,14 @@
 # CHANGELOG
 
-## v1.7.13 (Unreleased)
+## v1.7.15 (Unreleased)
+
+- .
+
+## v1.7.14
+
+- Increase file size limit to 10 GB.
+
+## v1.7.13
 
 - Generate streams for videos (beta)
 
@@ -8,7 +16,6 @@
     > [video streaming FAQ](https://help.ente.io/photos/faq/video-streaming).
 
 - Support Turkish translations.
-- .
 
 ## v1.7.12
 

desktop/docs/dependencies.md

@@ -3,6 +3,7 @@
 - [Electron](#electron)
 - [Dev dependencies](#dev)
 - [Functionality](#functionality)
+- [Pinned](#pinned)
 
 ## Electron
 
@@ -140,3 +141,13 @@ handles to avoid reopening them for every operation.
 
 [chokidar](https://github.com/paulmillr/chokidar) is used as a file system
 watcher for the watch folders functionality.
+
+## Pinned
+
+- `electron-builder` is pinned to 26.0.14 because of
+  https://github.com/electron-userland/electron-builder/issues/9161
+
+    To reproduce this locally, add `x64ArchFiles: "ffmpeg"` to
+    `electron-builder.yml`, then run `node_modules/.bin/electron-builder --mac`.
+
+- `electron-store` is pinned to 8.2.0 because subsequent versions are ESM only.

desktop/electron-builder.yml

@@ -14,6 +14,11 @@ win:
     target:
         - target: nsis
           arch: [x64, arm64]
+    azureSignOptions:
+        publisherName: ENTE TECHNOLOGIES, INC.
+        endpoint: https://eus.codesigning.azure.net/
+        certificateProfileName: EnteTrustCertProfile
+        codeSigningAccountName: EnteTechnologiesInc
 nsis:
     deleteAppDataOnUninstall: true
 linux:

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.13-beta",
+    "version": "1.7.15-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -21,9 +21,6 @@
         "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint && yarn tsc",
         "prepare": "node scripts/vips.js"
     },
-    "resolutions": {
-        "jackspeak": "2.1.1"
-    },
     "dependencies": {
         "any-shell-escape": "^0.1.1",
         "auto-launch": "^5.0.6",
@@ -31,33 +28,32 @@
         "clip-bpe-js": "^0.0.6",
         "comlink": "^4.4.2",
         "compare-versions": "^6.1.1",
-        "electron-log": "^5.4.0",
+        "electron-log": "^5.4.1",
         "electron-store": "^8.2.0",
-        "electron-updater": "^6.6.3",
+        "electron-updater": "^6.6.5",
         "ffmpeg-static": "^5.2.0",
         "lru-cache": "^11.1.0",
         "next-electron-server": "^1.0.0",
         "node-stream-zip": "^1.15.0",
-        "onnxruntime-node": "^1.20.1",
-        "zod": "^3.25.23"
+        "onnxruntime-node": "1.22.0-rev",
+        "zod": "^3.25.67"
     },
     "devDependencies": {
-        "@eslint/js": "^9.27.0",
+        "@eslint/js": "^9.30.1",
         "@tsconfig/node22": "^22.0.2",
         "@types/auto-launch": "^5.0.5",
-        "@types/ffmpeg-static": "^3.0.3",
         "ajv": "^8.17.1",
-        "concurrently": "^9.1.2",
+        "concurrently": "^9.2.0",
         "cross-env": "^7.0.3",
-        "electron": "^36.3.1",
-        "electron-builder": "^26.0.14",
+        "electron": "^37.1.0",
+        "electron-builder": "26.0.14",
         "eslint": "^9",
-        "prettier": "3.5.3",
+        "prettier": "3.6.2",
         "prettier-plugin-organize-imports": "^4.1.0",
-        "prettier-plugin-packagejson": "^2.5.14",
+        "prettier-plugin-packagejson": "^2.5.17",
         "shx": "^0.4.0",
         "typescript": "^5.8.3",
-        "typescript-eslint": "^8.32.1"
+        "typescript-eslint": "^8.35.1"
     },
     "packageManager": "yarn@1.22.22",
     "productName": "ente"

desktop/src/main.ts

@@ -78,14 +78,6 @@ export const allowWindowClose = (): void => {
  * We call this at the end of this file.
  */
 const main = () => {
-    // Workaround for Electron 36 not launching on some Linux distros. Remove
-    // once fixed or otherwise mitigated upstream.
-    //
-    // https://github.com/electron/electron/issues/46538#issuecomment-2808806722
-    if (process.platform == "linux") {
-        app.commandLine.appendSwitch("gtk-version", "3");
-    }
-
     const gotTheLock = app.requestSingleInstanceLock();
     if (!gotTheLock) {
         app.quit();

desktop/src/main/ipc.ts

@@ -50,8 +50,8 @@ import { convertToJPEG, generateImageThumbnail } from "./services/image";
 import { logout } from "./services/logout";
 import {
     lastShownChangelogVersion,
-    masterKeyB64,
-    saveMasterKeyB64,
+    masterKeyFromSafeStorage,
+    saveMasterKeyInSafeStorage,
     setLastShownChangelogVersion,
 } from "./services/store";
 import {
@@ -108,10 +108,12 @@ export const attachIPCHandlers = () => {
 
     ipcMain.handle("selectDirectory", () => selectDirectory());
 
-    ipcMain.handle("masterKeyB64", () => masterKeyB64());
+    ipcMain.handle("masterKeyFromSafeStorage", () =>
+        masterKeyFromSafeStorage(),
+    );
 
-    ipcMain.handle("saveMasterKeyB64", (_, masterKeyB64: string) =>
-        saveMasterKeyB64(masterKeyB64),
+    ipcMain.handle("saveMasterKeyInSafeStorage", (_, masterKey: string) =>
+        saveMasterKeyInSafeStorage(masterKey),
     );
 
     ipcMain.handle("lastShownChangelogVersion", () =>

desktop/src/main/services/ffmpeg-worker.ts

@@ -12,7 +12,7 @@ import fs_ from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { Readable } from "node:stream";
-import { z } from "zod";
+import { z } from "zod/v4";
 import type { FFmpegCommand } from "../../types/ipc";
 import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
@@ -832,7 +832,8 @@ const pseudoFFProbeVideo = async (inputFilePath: string) => {
  * Upload the file at the given {@link videoFilePath} to the provided pre-signed
  * URL(s) using a HTTP PUT request.
  *
- * All HTTP requests are retried up to 3 times with exponential backoff.
+ * All HTTP requests are retried up to 4 times (1 original + 3 retries) with
+ * exponential backoff.
  *
  * See: [Note: Upload HLS video segment from node side].
  *
@@ -977,19 +978,19 @@ const uploadVideoSegmentsSingle = (
     );
 
 /**
- * Retry a async operation on failure up to 3 times (1 original + 2 retries)
+ * Retry a async operation on failure up to 4 times (1 original + 3 retries)
  * with exponential backoff.
  *
- * This is an inlined but bespoke reimplementation of `retryEnsuringHTTPOk`
- * from `web/packages/base/http.ts`
+ * This is an inlined but bespoke reimplementation of `retryEnsuringHTTPOk` from
+ * `web/packages/base/http.ts`
  *
  * - We don't have the rest of the scaffolding used by that function, which is
  *   why it is intially inlined bespoked.
  *
  * - It handles the specific use case of uploading videos since generating the
  *   HLS stream is a fairly expensive operation, so a retry to discount
- *   transient network issues is called for. There are only 2 retries for a
- *   total of 3 attempts, and the retry gaps are more spaced out.
+ *   transient network issues is called for. The number of retries and their
+ *   gaps are same as the "background" `retryProfile` of the web implementation.
  *
  * - Later it was discovered that net.fetch is much slower than node's native
  *   fetch, so this implementation has further diverged.
@@ -998,7 +999,7 @@ const uploadVideoSegmentsSingle = (
  *   ability to import electron API.
  */
 const retryEnsuringHTTPOk = async (request: () => Promise<Response>) => {
-    const waitTimeBeforeNextTry = [10000, 30000];
+    const waitTimeBeforeNextTry = [10000, 30000, 120000];
 
     while (true) {
         try {

desktop/src/main/services/ml-worker.ts

@@ -15,7 +15,7 @@ import { existsSync } from "fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import * as ort from "onnxruntime-node";
-import { z } from "zod";
+import { z } from "zod/v4";
 import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
 import { wait } from "../utils/common";
@@ -184,14 +184,13 @@ const downloadModel = async (saveLocation: string, name: string) => {
 /**
  * Create an ONNX {@link InferenceSession} with some defaults.
  */
-const createInferenceSession = async (modelPath: string) => {
-    return await ort.InferenceSession.create(modelPath, {
+const createInferenceSession = (modelPath: string) =>
+    ort.InferenceSession.create(modelPath, {
         // Restrict the number of threads to 1.
         intraOpNumThreads: 1,
         // Be more conservative with RAM usage.
         enableCpuMemArena: false,
     });
-};
 
 const cachedCLIPImageSession = makeCachedInferenceSession(
     "mobileclip_s2_image_opset18_rgba_opt.onnx",
@@ -233,9 +232,11 @@ const getTokenizer = () => (_tokenizer ??= new Tokenizer());
 export const computeCLIPTextEmbeddingIfAvailable = async (text: string) => {
     const sessionOrSkip = await Promise.race([
         cachedCLIPTextSession(),
-        // Wait for a tick to get the session promise to resolved the first time
-        // this code runs on each app start (and the model has been downloaded).
-        wait(0).then(() => 1),
+        // Wait a bit to get the session promise to resolved the first time this
+        // code runs on each app start (in these cases the model will already be
+        // downloaded, so session creation should take only a 1 or 2 ticks: file
+        // system stat, and ort.InferenceSession.create).
+        wait(50).then(() => 1),
     ]);
 
     // Don't wait for the download to complete.

desktop/src/main/services/store.ts

@@ -24,17 +24,17 @@ export const clearStores = () => {
  * On macOS, `safeStorage` stores our data under a Keychain entry named
  * "<app-name> Safe Storage". In our case, "ente Safe Storage".
  */
-export const saveMasterKeyB64 = (masterKeyB64: string) => {
-    const encryptedKey = safeStorage.encryptString(masterKeyB64);
-    const b64EncryptedKey = Buffer.from(encryptedKey).toString("base64");
-    safeStorageStore.set("encryptionKey", b64EncryptedKey);
+export const saveMasterKeyInSafeStorage = (masterKey: string) => {
+    const encryptedKeyBuffer = safeStorage.encryptString(masterKey);
+    const encryptedKey = Buffer.from(encryptedKeyBuffer).toString("base64");
+    safeStorageStore.set("encryptionKey", encryptedKey);
 };
 
-export const masterKeyB64 = (): string | undefined => {
-    const b64EncryptedKey = safeStorageStore.get("encryptionKey");
-    if (!b64EncryptedKey) return undefined;
-    const keyBuffer = Buffer.from(b64EncryptedKey, "base64");
-    return safeStorage.decryptString(keyBuffer);
+export const masterKeyFromSafeStorage = (): string | undefined => {
+    const encryptedKey = safeStorageStore.get("encryptionKey");
+    if (!encryptedKey) return undefined;
+    const encryptedKeyBuffer = Buffer.from(encryptedKey, "base64");
+    return safeStorage.decryptString(encryptedKeyBuffer);
 };
 
 export const lastShownChangelogVersion = (): number | undefined =>

desktop/src/main/services/watch.ts

@@ -28,6 +28,13 @@ export const createWatcher = (mainWindow: BrowserWindow) => {
         // Ask the watcher to wait for a the file size to stabilize before
         // telling us about a new file. By default, it waits for 2 seconds.
         awaitWriteFinish: true,
+        // On macOS we start getting "EMFILE: too many open files" when watching
+        // large folders. This is a known regression in Chokidar v4:
+        // https://github.com/paulmillr/chokidar/issues/1385
+        //
+        // The recommended workaround for now is to enable usePolling. Since it
+        // comes at a performance cost, we only do it where needed (macOS).
+        ...(process.platform == "darwin" ? { usePolling: true } : {}),
     });
 
     watcher

desktop/src/preload.ts

@@ -113,10 +113,11 @@ const logout = () => {
     return ipcRenderer.invoke("logout");
 };
 
-const masterKeyB64 = () => ipcRenderer.invoke("masterKeyB64");
+const masterKeyFromSafeStorage = () =>
+    ipcRenderer.invoke("masterKeyFromSafeStorage");
 
-const saveMasterKeyB64 = (masterKeyB64: string) =>
-    ipcRenderer.invoke("saveMasterKeyB64", masterKeyB64);
+const saveMasterKeyInSafeStorage = (masterKey: string) =>
+    ipcRenderer.invoke("saveMasterKeyInSafeStorage", masterKey);
 
 const lastShownChangelogVersion = () =>
     ipcRenderer.invoke("lastShownChangelogVersion");
@@ -358,8 +359,8 @@ contextBridge.exposeInMainWorld("electron", {
     selectDirectory,
     pathForFile,
     logout,
-    masterKeyB64,
-    saveMasterKeyB64,
+    masterKeyFromSafeStorage,
+    saveMasterKeyInSafeStorage,
     lastShownChangelogVersion,
     setLastShownChangelogVersion,
     isAutoLaunchEnabled,

desktop/yarn.lock

@@ -25,7 +25,7 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/asar@3.4.1":
+"@electron/asar@3.4.1", "@electron/asar@^3.2.7":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.4.1.tgz#4e9196a4b54fba18c56cd8d5cac67c5bdc588065"
   integrity sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA==
@@ -34,15 +34,6 @@
     glob "^7.1.6"
     minimatch "^3.0.4"
 
-"@electron/asar@^3.2.7":
-  version "3.2.18"
-  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.18.tgz#fa607f829209bab8b9e0ce6658d3fe81b2cba517"
-  integrity sha512-2XyvMe3N3Nrs8cV39IKELRHTYUWFKrmqqSY1U+GMlc0jvqjIVnoxhNd2H4JolWQncbJi1DCvb5TNxZuI2fEjWg==
-  dependencies:
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-
 "@electron/fuses@^1.8.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@electron/fuses/-/fuses-1.8.0.tgz#ad34d3cc4703b1258b83f6989917052cfc1490a0"
@@ -184,10 +175,10 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
   integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==
 
-"@eslint/js@^9.27.0":
-  version "9.27.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.27.0.tgz#181a23460877c484f6dd03890f4e3fa2fdeb8ff0"
-  integrity sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==
+"@eslint/js@^9.30.1":
+  version "9.30.1"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.30.1.tgz#ebe9dd52a38345784c486300175a28c6013c088d"
+  integrity sha512-zXhuECFlyep42KZUhWjfvsmXGX39W8K8LFb8AWXM9gSV9dQB+MrJGLKvW6Zw0Ggnbpw0VHTtrhFXYe3Gym18jg==
 
 "@eslint/object-schema@^2.1.4":
   version "2.1.4"
@@ -209,12 +200,29 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
   integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
 
-"@isaacs/fs-minipass@^4.0.0":
+"@isaacs/balanced-match@^4.0.1":
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz#2d59ae3ab4b38fb4270bfa23d30f8e2e86c7fe32"
-  integrity sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
   dependencies:
-    minipass "^7.0.4"
+    "@isaacs/balanced-match" "^4.0.1"
+
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
 "@malept/cross-spawn-promise@^2.0.0":
   version "2.0.0"
@@ -324,11 +332,6 @@
   dependencies:
     "@types/ms" "*"
 
-"@types/ffmpeg-static@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/ffmpeg-static/-/ffmpeg-static-3.0.3.tgz#605358ac6304507a75c2fd5fd861534837b19e2f"
-  integrity sha512-wmjANN0CiYs5clQESK+xE6plet0y9ndqaNBdQx4IIw7ZbPBMQw+14Lq4ky2WqMqGlpFJ9ZUxU0O43TvVZziyyA==
-
 "@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11":
   version "9.0.13"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45"
@@ -392,62 +395,78 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz#9185b3eaa3b083d8318910e12d56c68b3c4f45b4"
-  integrity sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==
+"@typescript-eslint/eslint-plugin@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz#06b1129fe26d6532abd58fb2b3fe9810bd016935"
+  integrity sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.32.1"
-    "@typescript-eslint/type-utils" "8.32.1"
-    "@typescript-eslint/utils" "8.32.1"
-    "@typescript-eslint/visitor-keys" "8.32.1"
+    "@typescript-eslint/scope-manager" "8.35.1"
+    "@typescript-eslint/type-utils" "8.35.1"
+    "@typescript-eslint/utils" "8.35.1"
+    "@typescript-eslint/visitor-keys" "8.35.1"
     graphemer "^1.4.0"
     ignore "^7.0.0"
     natural-compare "^1.4.0"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/parser@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.32.1.tgz#18b0e53315e0bc22b2619d398ae49a968370935e"
-  integrity sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==
+"@typescript-eslint/parser@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.35.1.tgz#787312e80f0f337d85f4c2a569411c469e852d44"
+  integrity sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==
   dependencies:
-    "@typescript-eslint/scope-manager" "8.32.1"
-    "@typescript-eslint/types" "8.32.1"
-    "@typescript-eslint/typescript-estree" "8.32.1"
-    "@typescript-eslint/visitor-keys" "8.32.1"
+    "@typescript-eslint/scope-manager" "8.35.1"
+    "@typescript-eslint/types" "8.35.1"
+    "@typescript-eslint/typescript-estree" "8.35.1"
+    "@typescript-eslint/visitor-keys" "8.35.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz#9a6bf5fb2c5380e14fe9d38ccac6e4bbe17e8afc"
-  integrity sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==
+"@typescript-eslint/project-service@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.35.1.tgz#815bb771f2f6c97780e44299434ece3c2e526127"
+  integrity sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==
   dependencies:
-    "@typescript-eslint/types" "8.32.1"
-    "@typescript-eslint/visitor-keys" "8.32.1"
+    "@typescript-eslint/tsconfig-utils" "^8.35.1"
+    "@typescript-eslint/types" "^8.35.1"
+    debug "^4.3.4"
 
-"@typescript-eslint/type-utils@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz#b9292a45f69ecdb7db74d1696e57d1a89514d21e"
-  integrity sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==
+"@typescript-eslint/scope-manager@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz#b19f9be65c8d1059e88a323a1a6567dbfe0a1a4e"
+  integrity sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "8.32.1"
-    "@typescript-eslint/utils" "8.32.1"
+    "@typescript-eslint/types" "8.35.1"
+    "@typescript-eslint/visitor-keys" "8.35.1"
+
+"@typescript-eslint/tsconfig-utils@8.35.1", "@typescript-eslint/tsconfig-utils@^8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz#c2db8714c181cc0700216c1a2e3cf55719c58006"
+  integrity sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==
+
+"@typescript-eslint/type-utils@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz#4f9a07d6efa0e617a67e1890d28117e68ce154bd"
+  integrity sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "8.35.1"
+    "@typescript-eslint/utils" "8.35.1"
     debug "^4.3.4"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/types@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.32.1.tgz#b19fe4ac0dc08317bae0ce9ec1168123576c1d4b"
-  integrity sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==
+"@typescript-eslint/types@8.35.1", "@typescript-eslint/types@^8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.35.1.tgz#4344dcf934495bbf25a9f83a06dd9fe2acf15780"
+  integrity sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==
 
-"@typescript-eslint/typescript-estree@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz#9023720ca4ecf4f59c275a05b5fed69b1276face"
-  integrity sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==
+"@typescript-eslint/typescript-estree@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz#b80e85fcb6bfbcbacb3224b1367f6ca3f03e6183"
+  integrity sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==
   dependencies:
-    "@typescript-eslint/types" "8.32.1"
-    "@typescript-eslint/visitor-keys" "8.32.1"
+    "@typescript-eslint/project-service" "8.35.1"
+    "@typescript-eslint/tsconfig-utils" "8.35.1"
+    "@typescript-eslint/types" "8.35.1"
+    "@typescript-eslint/visitor-keys" "8.35.1"
     debug "^4.3.4"
     fast-glob "^3.3.2"
     is-glob "^4.0.3"
@@ -455,23 +474,23 @@
     semver "^7.6.0"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/utils@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.32.1.tgz#4d6d5d29b9e519e9a85e9a74e9f7bdb58abe9704"
-  integrity sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==
+"@typescript-eslint/utils@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.35.1.tgz#a9a0ceeb81c9d132f3f75537ad2ca7f6ca266523"
+  integrity sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.7.0"
-    "@typescript-eslint/scope-manager" "8.32.1"
-    "@typescript-eslint/types" "8.32.1"
-    "@typescript-eslint/typescript-estree" "8.32.1"
+    "@typescript-eslint/scope-manager" "8.35.1"
+    "@typescript-eslint/types" "8.35.1"
+    "@typescript-eslint/typescript-estree" "8.35.1"
 
-"@typescript-eslint/visitor-keys@8.32.1":
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz#4321395cc55c2eb46036cbbb03e101994d11ddca"
-  integrity sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==
+"@typescript-eslint/visitor-keys@8.35.1":
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz#aac78ab2265dd11927bc6af3f9c5a021bbc1670a"
+  integrity sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==
   dependencies:
-    "@typescript-eslint/types" "8.32.1"
-    eslint-visitor-keys "^4.2.0"
+    "@typescript-eslint/types" "8.35.1"
+    eslint-visitor-keys "^4.2.1"
 
 "@xmldom/xmldom@^0.8.8":
   version "0.8.10"
@@ -493,6 +512,11 @@ acorn@^8.12.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
+adm-zip@^0.5.16:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.5.16.tgz#0b5e4c779f07dedea5805cdccb1147071d94a909"
+  integrity sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==
+
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -559,6 +583,11 @@ ansi-regex@^5.0.1:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.1.0.tgz#95ec409c69619d6cb1b8b34f14b660ef28ebd654"
+  integrity sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==
+
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
@@ -566,6 +595,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 any-shell-escape@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/any-shell-escape/-/any-shell-escape-0.1.1.tgz#d55ab972244c71a9a5e1ab0879f30bf110806959"
@@ -838,11 +872,6 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
-chownr@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4"
-  integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==
-
 chromium-pickle-js@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205"
@@ -958,10 +987,10 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-concurrently@^9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.1.2.tgz#22d9109296961eaee773e12bfb1ce9a66bc9836c"
-  integrity sha512-H9MWcoPsYddwbOGM6difjVwVZHl63nwMEwDJG/L7VGtuaJhb12h2caPG2tVPWs7emuYix252iGfqOyrz1GczTQ==
+concurrently@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-9.2.0.tgz#233e3892ceb0b5db9fd49e9c8c739737a7b638b5"
+  integrity sha512-IsB/fiXTupmagMW4MNp2lx2cdSN2FfZq78vF90LBB+zZHArbIQZjQtzXCiXnvTxCZSvXanTqFLWBjw2UkLx1SQ==
   dependencies:
     chalk "^4.1.2"
     lodash "^4.17.21"
@@ -1170,6 +1199,11 @@ dotenv@^16.4.4, dotenv@^16.4.5:
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.5.tgz#cdd3b3b604cb327e286b4762e13502f717cb099f"
   integrity sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 ejs@^3.1.8:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
@@ -1177,7 +1211,7 @@ ejs@^3.1.8:
   dependencies:
     jake "^10.8.5"
 
-electron-builder@^26.0.14:
+electron-builder@26.0.14:
   version "26.0.14"
   resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.0.14.tgz#8927c6da42a69425d15e08f351e944ea0e7866da"
   integrity sha512-YBxpWLMGj0oS7fbS3LVingeZqFunU0F8s+uB9QTd5+wN4qgrf/rSGRkqoImbWg2+F2yHq11wmaA/Xr9xzvgQ0w==
@@ -1193,10 +1227,10 @@ electron-builder@^26.0.14:
     simple-update-notifier "2.0.0"
     yargs "^17.6.2"
 
-electron-log@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.4.0.tgz#3180bf5194b2e2efacb62ec1392f8150faf4de6b"
-  integrity sha512-AXI5OVppskrWxEAmCxuv8ovX+s2Br39CpCAgkGMNHQtjYT3IiVbSQTncEjFVGPgoH35ZygRm/mvUMBDWwhRxgg==
+electron-log@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.4.1.tgz#700ddc6ef4b06c13a983468580ba7a7e579129d4"
+  integrity sha512-QvisA18Z++8E3Th0zmhUelys9dEv7aIeXJlbFw3UrxCc8H9qSRW0j8/ooTef/EtHui8tVmbKSL+EIQzP9GoRLg==
 
 electron-publish@26.0.13:
   version "26.0.13"
@@ -1220,10 +1254,10 @@ electron-store@^8.2.0:
     conf "^10.2.0"
     type-fest "^2.17.0"
 
-electron-updater@^6.6.3:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.6.3.tgz#a1f53671ffbb08a475d495d48f0c0d971e665d5d"
-  integrity sha512-i448/SwMtqxy5wqAcXScnWjiFxZp+hmWA2jZCmojcdfodEGhi/DWTdRP01mE3lCILb8hmdE28SBaHf1oQW3+kw==
+electron-updater@^6.6.5:
+  version "6.6.5"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-6.6.5.tgz#6614daa2f737c294471eee7ce7b61deda0d5543a"
+  integrity sha512-jnk38WfByl2Pb0cje02xls/pJkvkq3AQZI7usDCLriU23adkerLTkRrugbCPuUxUOa79nY1g/rokHPWHZFBKyA==
   dependencies:
     builder-util-runtime "9.3.2"
     fs-extra "^10.1.0"
@@ -1234,10 +1268,10 @@ electron-updater@^6.6.3:
     semver "^7.6.3"
     tiny-typed-emitter "^2.1.0"
 
-electron@^36.3.1:
-  version "36.3.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-36.3.1.tgz#12a8c1b1cd9163a4bd0cb60f89816243b26ab788"
-  integrity sha512-LeOZ+tVahmctHaAssLCGRRUa2SAO09GXua3pKdG+WzkbSDMh+3iOPONNVPTqGp8HlWnzGj4r6mhsIbM2RgH+eQ==
+electron@^37.1.0:
+  version "37.1.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-37.1.0.tgz#6d6d1891f8add5d2d44007e2ee5d4542140fc4b4"
+  integrity sha512-Fcr3yfAw4oU392waVZSlrFUQx4P+h/k31+PRgkBY9tFx9E/zxzdPQQj0achZlG1HRDusw3ooQB+OXb9PvufdzA==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^22.7.7"
@@ -1248,6 +1282,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
@@ -1312,11 +1351,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint-visitor-keys@^4.0.0, eslint-visitor-keys@^4.2.0:
+eslint-visitor-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
   integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
+eslint-visitor-keys@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
+  integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
+
 eslint@^9:
   version "9.9.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec"
@@ -1653,7 +1697,7 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@^10.3.12, glob@^10.3.7:
+glob@^10.3.12:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -2008,12 +2052,12 @@ isexe@^2.0.0:
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-jackspeak@2.1.1, jackspeak@^3.1.2:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
-  integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
+jackspeak@^3.1.2:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.4.3.tgz#8833a9d89ab4acde6188942bd1c53b6390ed5a8a"
+  integrity sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==
   dependencies:
-    cliui "^8.0.1"
+    "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
@@ -2260,11 +2304,11 @@ mimic-response@^3.1.0:
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
 minimatch@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
-  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
+  version "10.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa"
+  integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==
   dependencies:
-    brace-expansion "^2.0.1"
+    "@isaacs/brace-expansion" "^5.0.0"
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
@@ -2343,7 +2387,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
   integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.4, minipass@^7.1.2:
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
@@ -2356,14 +2400,6 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-minizlib@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.0.1.tgz#46d5329d1eb3c83924eff1d3b858ca0a31581012"
-  integrity sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==
-  dependencies:
-    minipass "^7.0.4"
-    rimraf "^5.0.5"
-
 mkdirp@^0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -2376,11 +2412,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-mkdirp@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
-  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -2473,18 +2504,19 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-onnxruntime-common@1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.20.1.tgz#b42e317d4d6728745b9e8089617c8cd938d312dc"
-  integrity sha512-YiU0s0IzYYC+gWvqD1HzLc46Du1sXpSiwzKb63PACIJr6LfL27VsXSXQvt68EzD3V0D5Bc0vyJTjmMxp0ylQiw==
+onnxruntime-common@1.22.0:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.22.0.tgz#27d7d06ebb6c7d3dd773dfa21b6fa2ae86f64983"
+  integrity sha512-vcuaNWgtF2dGQu/EP5P8UI5rEPEYqXG2sPPe5j9lg2TY/biJF8eWklTMwlDO08iuXq48xJo0awqIpK5mPG+IxA==
 
-onnxruntime-node@^1.20.1:
-  version "1.20.1"
-  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.20.1.tgz#a5ba0bd160aeccdb4b7d36fbc2f6a97bde1f7843"
-  integrity sha512-di/I4HDXRw+FLgq+TyHmQEDd3cEp9iFFZm0r4uJ1Wd7b/WE1VXtKWo8yemex347c6GNF/3Pv86ZfPhIWxORr0w==
+onnxruntime-node@1.22.0-rev:
+  version "1.22.0-rev"
+  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.22.0-rev.tgz#068c85adb6b938cbaaef2ffba4b35fcac3e683f4"
+  integrity sha512-9vh50/mnwauFUex0NYyyLf9pmRp8q6DVMG8K+xtoXv68SSB9bESa1bEbWLqfUncgB3XucQaOV+wfMPcqANMYhQ==
   dependencies:
-    onnxruntime-common "1.20.1"
-    tar "^7.0.1"
+    adm-zip "^0.5.16"
+    global-agent "^3.0.0"
+    onnxruntime-common "1.22.0"
 
 optionator@^0.9.3:
   version "0.9.4"
@@ -2664,18 +2696,18 @@ prettier-plugin-organize-imports@^4.1.0:
   resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.1.0.tgz#f3d3764046a8e7ba6491431158b9be6ffd83b90f"
   integrity sha512-5aWRdCgv645xaa58X8lOxzZoiHAldAPChljr/MT0crXVOWTZ+Svl4hIWlz+niYSlO6ikE5UXkN1JrRvIP2ut0A==
 
-prettier-plugin-packagejson@^2.5.14:
-  version "2.5.14"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.14.tgz#8ada09114ff60c7f42c3f8755ffb2f8152f3624f"
-  integrity sha512-h+3tSpr2nVpp+YOK1MDIYtYhHVXr8/0V59UUbJpIJFaqi3w4fvUokJo6eV8W+vELrUXIZzJ+DKm5G7lYzrMcKQ==
+prettier-plugin-packagejson@^2.5.17:
+  version "2.5.17"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.17.tgz#98df28819bb5071c9330eec31ff029acf538f96e"
+  integrity sha512-1WYvhTix+4EMYZQYSjAxb6+KTCULINuHUTBcxYa2ipoUS9Y2zJVjE3kuZ5I7ZWIFqyK8xpwYIunXqN5eiT7Hew==
   dependencies:
-    sort-package-json "3.2.1"
-    synckit "0.11.6"
+    sort-package-json "3.3.1"
+    synckit "0.11.8"
 
-prettier@3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5"
-  integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==
+prettier@3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.6.2.tgz#ccda02a1003ebbb2bfda6f83a074978f608b9393"
+  integrity sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==
 
 proc-log@^2.0.1:
   version "2.0.1"
@@ -2819,13 +2851,6 @@ rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^5.0.5:
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c"
-  integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==
-  dependencies:
-    glob "^10.3.7"
-
 roarr@^2.15.3:
   version "2.15.4"
   resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
@@ -3006,10 +3031,10 @@ sort-object-keys@^1.1.3:
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-3.2.1.tgz#889f3bdf43ceeff5fa4278a7c53ae5b1520d287e"
-  integrity sha512-rTfRdb20vuoAn7LDlEtCqOkYfl2X+Qze6cLbNOzcDpbmKEhJI30tTN44d5shbKJnXsvz24QQhlCm81Bag7EOKg==
+sort-package-json@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-3.3.1.tgz#c31c0b4cd970b7fde6b1d0197f8b768584e2e65c"
+  integrity sha512-awjhQR2Iy5UN3NuguAK5+RezcEuUg9Ra4O8y2Aj+DlJa7MywyHaipAPf9bu4qqFj0hsYHHoT9sS3aV7Ucu728g==
   dependencies:
     detect-indent "^7.0.1"
     detect-newline "^4.0.1"
@@ -3049,6 +3074,15 @@ stat-mode@^1.0.0:
   resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465"
   integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==
 
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -3058,6 +3092,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -3065,6 +3108,13 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
@@ -3072,6 +3122,13 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -3108,10 +3165,10 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-synckit@0.11.6:
-  version "0.11.6"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.6.tgz#e742a0c27bbc1fbc96f2010770521015cca7ed5c"
-  integrity sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==
+synckit@0.11.8:
+  version "0.11.8"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.8.tgz#b2aaae998a4ef47ded60773ad06e7cb821f55457"
+  integrity sha512-+XZ+r1XGIJGeQk3VvXhT6xx/VpbHsRzsTkGgF6E5RX9TTXD0118l87puaEBZ566FhqblC6U0d4XnubznJDm30A==
   dependencies:
     "@pkgr/core" "^0.2.4"
 
@@ -3127,18 +3184,6 @@ tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-tar@^7.0.1:
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-7.4.3.tgz#88bbe9286a3fcd900e94592cda7a22b192e80571"
-  integrity sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==
-  dependencies:
-    "@isaacs/fs-minipass" "^4.0.0"
-    chownr "^3.0.0"
-    minipass "^7.1.2"
-    minizlib "^3.0.1"
-    mkdirp "^3.0.1"
-    yallist "^5.0.0"
-
 temp-file@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7"
@@ -3235,14 +3280,14 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript-eslint@^8.32.1:
-  version "8.32.1"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.32.1.tgz#1784335c781491be528ff84ab666e2f0f7591fd1"
-  integrity sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==
+typescript-eslint@^8.35.1:
+  version "8.35.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.35.1.tgz#4ddeda5c5777a7bd86516280d8099ada06055f2f"
+  integrity sha512-xslJjFzhOmHYQzSB/QTeASAHbjmxOGEP6Coh93TXmUBFQoJ1VU35UHIDmG06Jd6taf3wqqC1ntBnCMeymy5Ovw==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "8.32.1"
-    "@typescript-eslint/parser" "8.32.1"
-    "@typescript-eslint/utils" "8.32.1"
+    "@typescript-eslint/eslint-plugin" "8.35.1"
+    "@typescript-eslint/parser" "8.35.1"
+    "@typescript-eslint/utils" "8.35.1"
 
 typescript@^5.4.3, typescript@^5.8.3:
   version "5.8.3"
@@ -3340,6 +3385,15 @@ word-wrap@^1.2.5:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -3349,6 +3403,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -3369,11 +3432,6 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yallist@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-5.0.0.tgz#00e2de443639ed0d78fd87de0d27469fbcffb533"
-  integrity sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==
-
 yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
@@ -3405,7 +3463,7 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zod@^3.25.23:
-  version "3.25.23"
-  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.23.tgz#128fb02f3619a8bca6bbbf6b07b457236cf33391"
-  integrity sha512-Od2bdMosahjSrSgJtakrwjMDb1zM1A3VIHCPGveZt/3/wlrTWBya2lmEh2OYe4OIu8mPTmmr0gnLHIWQXdtWBg==
+zod@^3.25.67:
+  version "3.25.67"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.67.tgz#62987e4078e2ab0f63b491ef0c4f33df24236da8"
+  integrity sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==

docs/.prettierrc.json

@@ -1,4 +1,3 @@
 {
-    "tabWidth": 4,
-    "proseWrap": "always"
+    "tabWidth": 4
 }

docs/docs/.vitepress/config.ts

@@ -8,13 +8,6 @@ export default defineConfig({
     head: [["link", { rel: "icon", type: "image/png", href: "/favicon.png" }]],
     cleanUrls: true,
     ignoreDeadLinks: "localhostLinks",
-    vite: {
-      build: {
-        rollupOptions: {
-          external: ['client-museum-s3.png'] // Added to handle static asset import
-        }
-      }
-    },
     themeConfig: {
         // We use the default theme (with some CSS color overrides). This
         // themeConfig block can be used to further customize the default theme.
@@ -33,6 +26,9 @@ export default defineConfig({
             },
         },
         sidebar: sidebar,
+        outline: {
+            level: [2, 3],
+        },
         socialLinks: [
             { icon: "github", link: "https://github.com/ente-io/ente/" },
             { icon: "twitter", link: "https://twitter.com/enteio" },

docs/docs/.vitepress/sidebar.ts

@@ -52,6 +52,10 @@ export const sidebar = [
                         link: "/photos/features/machine-learning",
                     },
                     { text: "Map", link: "/photos/features/map" },
+                    {
+                        text: "Notifications",
+                        link: "/photos/features/notifications",
+                    },
                     {
                         text: "Passkeys",
                         link: "/photos/features/passkeys",
@@ -203,22 +207,22 @@ export const sidebar = [
                 text: "Migration",
                 collapsed: true,
                 items: [
-                    { text: "Introduction", link: "/auth/migration-guides/" },
+                    { text: "Introduction", link: "/auth/migration/" },
                     {
                         text: "From Authy",
-                        link: "/auth/migration-guides/authy/",
+                        link: "/auth/migration/authy/",
                     },
                     {
                         text: "From Steam",
-                        link: "/auth/migration-guides/steam/",
+                        link: "/auth/migration/steam/",
                     },
                     {
                         text: "From others",
-                        link: "/auth/migration-guides/import",
+                        link: "/auth/migration/import",
                     },
                     {
                         text: "Exporting your data",
-                        link: "/auth/migration-guides/export",
+                        link: "/auth/migration/export",
                     },
                 ],
             },
@@ -235,50 +239,98 @@ export const sidebar = [
         ],
     },
     {
-        text: "Self hosting",
+        text: "Self-hosting",
         collapsed: true,
         items: [
-            { text: "Getting started", link: "/self-hosting/" },
             {
-                text: "Connecting to custom server",
-                link: "/self-hosting/guides/custom-server/",
+                text: "Quickstart",
+                link: "/self-hosting/",
             },
             {
-                text: "Creating accounts",
-                link: "/self-hosting/creating-accounts",
-            },
-            {
-                text: "Configuring your server",
-                link: "/self-hosting/museum",
-            },
-            {
-                text: "Configuring S3",
-                link: "/self-hosting/guides/configuring-s3",
-            },
-            {
-                text: "Reverse proxy",
-                link: "/self-hosting/reverse-proxy",
-            },
-            {
-                text: "Guides",
+                text: "Installation",
                 collapsed: true,
                 items: [
-                    { text: "Introduction", link: "/self-hosting/guides/" },
                     {
-                        text: "Administering your server",
-                        link: "/self-hosting/guides/admin",
+                        text: "Requirements",
+                        link: "/self-hosting/installation/requirements",
                     },
                     {
-                        text: "Configuring CLI for your instance",
-                        link: "/self-hosting/guides/selfhost-cli",
+                        text: "Quickstart script (Recommended)",
+                        link: "/self-hosting/installation/quickstart",
                     },
                     {
-                        text: "Running Ente from source",
-                        link: "/self-hosting/guides/from-source",
+                        text: "Docker Compose",
+                        link: "/self-hosting/installation/compose",
                     },
                     {
-                        text: "Running Ente without Docker",
-                        link: "/self-hosting/guides/standalone-ente",
+                        text: "Manual setup (without Docker)",
+                        link: "/self-hosting/installation/manual",
+                    },
+                    {
+                        text: "Environment variables and defaults",
+                        link: "/self-hosting/installation/env-var",
+                    },
+                    {
+                        text: "Configuration",
+                        link: "/self-hosting/installation/config",
+                    },
+                    {
+                        text: "Post-installation steps",
+                        link: "/self-hosting/installation/post-install/",
+                    },
+                    {
+                        text: "Upgrade",
+                        link: "/self-hosting/installation/upgrade",
+                    },
+                ],
+            },
+            {
+                text: "Administration",
+                collapsed: true,
+                items: [
+                    {
+                        text: "User management",
+                        link: "/self-hosting/administration/users",
+                    },
+                    {
+                        text: "Reverse proxy",
+                        link: "/self-hosting/administration/reverse-proxy",
+                    },
+                    {
+                        text: "Object storage",
+                        link: "/self-hosting/administration/object-storage",
+                    },
+                    {
+                        text: "Ente CLI",
+                        link: "/self-hosting/administration/cli",
+                    },
+                    {
+                        text: "Backup",
+                        link: "/self-hosting/administration/backup",
+                    },
+                ],
+            },
+            {
+                text: "Development",
+                collapsed: true,
+                items: [
+                    {
+                        text: "Building mobile apps",
+                        link: "/self-hosting/development/mobile-build",
+                    },
+                ],
+            },
+            {
+                text: "Community Guides",
+                collapsed: true,
+                items: [
+                    {
+                        text: "Ente via Tailscale",
+                        link: "/self-hosting/guides/tailscale",
+                    },
+                    {
+                        text: "Running Ente using systemd",
+                        link: "/self-hosting/guides/systemd",
                     },
                 ],
             },
@@ -291,68 +343,19 @@ export const sidebar = [
                         link: "/self-hosting/troubleshooting/misc",
                     },
                     {
-                        text: "Bucket CORS",
-                        link: '/self-hosting/troubleshooting/bucket-cors'
+                        text: "Docker / quickstart",
+                        link: "/self-hosting/troubleshooting/docker",
                     },
                     {
                         text: "Uploads",
                         link: "/self-hosting/troubleshooting/uploads",
                     },
                     {
-                        text: "Docker / quickstart",
-                        link: "/self-hosting/troubleshooting/docker",
-                    },
-                    {
-                        text: "Ente CLI secrets",
-                        link: "/self-hosting/troubleshooting/keyring",
-                    },
-                ],
-            },
-            {
-                text: "Community Guides",
-                collapsed: true,
-                items :[
-                    {
-                        text: "Ente via Tailscale",
-                        link: "/self-hosting/guides/Tailscale",
-                    },
-                    {
-                        text: "Ente with External S3",
-                        link: "/self-hosting/guides/external-s3",
-                    }                
-                ]
-            },
-            {
-                text: "FAQ",
-                collapsed: true,
-                items: [
-                    { text: "General", link: "/self-hosting/faq/" },
-                    {
-                        text: "Verification code",
-                        link: "/self-hosting/faq/otp",
-                    },
-                    {
-                        text: "Shared albums",
-                        link: "/self-hosting/faq/sharing",
-                    },
-                    {
-                        text: "Backups",
-                        link: "/self-hosting/faq/backup",
-                    },
-                    {
-                        text: "Environment variables",
-                        link: "/self-hosting/faq/environment",
+                        text: "Ente CLI",
+                        link: "/self-hosting/troubleshooting/cli",
                     },
                 ],
             },
         ],
     },
-    {
-        text: "About",
-        link: "/about/",
-    },
-    {
-        text: "Contribute",
-        link: "/about/contribute",
-    },
 ];

docs/docs/about/contribute.md

@@ -1,15 +0,0 @@
----
-title: Contribute
-description: Details about how to contribute to Ente's docs
----
-
-# Contributing
-
-To contribute to these docs, you can use the "Edit this page" button at the
-bottom of each page. This will allow you to directly edit the markdown file that
-is used to generate this documentation and open a quick pull request directly
-from GitHub's UI.
-
-If you're more comfortable in contributing with your text editor, see the
-`docs/` folder of our GitHub repository,
-[github.com/ente-io/ente](https://github.com/ente-io/ente).

docs/docs/about/index.md

@@ -1,72 +0,0 @@
----
-title: About Ente
-description: >
-    An overview of Ente: the company, and the people behind it, and the products
-    that we make.
----
-
-# About
-
-Ente is a end-to-end encrypted platform for privately, reliably, and securely
-storing your data on the cloud. On top of this platform, Ente offers two
-products:
-
-- **Ente Photos** - An alternative to Google Photos and Apple Photos
-
-- **Ente Auth** - A free 2FA alternative to Authy
-
-Both these apps are available for all desktop (Linux, Mac, Windows) and mobile
-(Android, iOS and F-Droid) platforms. They also work directly in your web
-browser without you needing to install anything.
-
-More products are in the pipeline.
-
-## History
-
-Ente was the founded by Vishnu Mohandas (he's also Ente's CEO) in response to
-privacy concerns with major tech companies. The underlying motivation was the
-understanding that big tech had no incentive to fix their act, but with
-end-to-end encrypted cross platform apps, there was a way for people to take
-back control over their own data without sacrificing on features.
-
-### What does Ente mean?
-
-In Malayalam, Vishnu's native language, "ente" means "mine". Thus "Ente Photos"
-has the literal meaning "my photos".
-
-This was a good name, but still Vishnu looked around for better ones. But one
-day, he discovered that "ente" means "duck" in German. This unexpected
-connection sealed the deal. We should ask him why he likes ducks so much, but
-apparently he does, so this dual meaning ("mine" / "duck") led him to finalize
-the name, and also led to the adoption of "Ducky", Ente's mascot:
-
-<div align="center">
-
-![Ente's mascot, Ducky](ducky.png){width=200px}
-
-</div>
-
-For the full origin story of Ducky you can check out
-[this blog post](https://ente.io/blog/ducky/).
-
-### How do I pronounce Ente?
-
-en-_tay_. Like ca<i>fe</i>.
-
-## Get in touch
-
-If you have a support query that is not answered by these docs, please reach out
-to our Customer Support by sending an email to support@ente.io
-
-To stay up to date with new product launches, and behind the scenes details of
-how we're building Ente, you can read our [blog](https://ente.io/blog) (or
-subscribe to it via [RSS](https://ente.io/blog/rss.xml))
-
-To suggest new features and/or offer your perspective on how we should design
-planned and upcoming features, use our
-[GitHub discussions](https://github.com/ente-io/ente/discussions)
-
-Or if you'd just like to hang out, join our
-[Discord](https://discord.gg/z2YVKkycX3), follow us on
-[Twitter](https://twitter.com/enteio) or give us a shout out on
-[Mastodon](https://mstdn.social/@ente)

docs/docs/auth/faq/index.md

@@ -41,6 +41,16 @@ Usually, this discrepancy occurs because the time in your browser might be
 incorrect. In particular, multiple users have reported that Firefox provides
 incorrect time when certain privacy settings are enabled.
 
+> [!TIP]
+>
+> Newer Ente Auth clients (upcoming 4.4.0+) will automatically try to correct
+> for incorrect system time, so you should be seeing correct codes even if your
+> system time is out of sync. However, this automatic correction will not work
+> if you're using Ente Auth in offline mode.
+>
+> If you've recently changed your system time and the codes are still incorrect,
+> try to refresh / restart the app if needed.
+
 ### Can I access my codes on web?
 
 You can access your codes on the web at [auth.ente.io](https://auth.ente.io).

docs/docs/auth/features/index.md

@@ -12,7 +12,7 @@ This page outlines the key features available in Ente Auth.
 Ente Auth supports the icon pack provided by
 [simple-icons](https://github.com/simple-icons/simple-icons). If an icon you
 need is missing, please refer to the
-[docs/adding-icons](https://github.com/ente-io/ente/blob/main/auth/docs/adding-icons.md)
+[docs/adding-icons](https://github.com/ente-io/ente/blob/main/mobile/apps/auth/docs/adding-icons.md)
 guide for instructions on how to contribute.
 
 ### Search
@@ -105,8 +105,7 @@ Ente Auth offers various import and export options for your codes.
   automatically via the CLI.
 - **Import:** Import codes from various other authentication apps.
 
-For detailed instructions, refer to the
-[migration guides](../migration-guides/).
+For detailed instructions, refer to the [migration guides](../migration/).
 
 ### Deduplicate codes
 
@@ -136,4 +135,4 @@ Easily add or share entries using QR codes:
   right-click (desktop) a code and select "QR". This allows you to easily share
   the complete entry (including the secret) with others by letting them scan the
   displayed QR code. This can also be used to easily add the same entry to
-  another authenticatior app or service.
+  another authenticator app or service.

docs/docs/auth/migration/authy/index.md

@@ -10,8 +10,9 @@ A guide written by Green, an ente.io lover
 > [!WARNING]
 >
 > Authy has dropped all support for its desktop apps. It is no longer possible
-> to export data from Authy using methods 1 and 2. You will need either an iOS device
-> and computer (method 4) or a rooted Android phone (method 3) to follow this guide.
+> to export data from Authy using methods 1 and 2. You will need either an iOS
+> device and computer (method 4) or a rooted Android phone (method 3) to follow
+> this guide.
 
 ---
 
@@ -204,11 +205,24 @@ This uses the tool [Aegis Authenticator](https://getaegis.app/) from
 
 ## Method 4: Authy-iOS-MiTM
 
-**Who should use this?** Technical iOS users of Authy that cannot export their tokens with methods 1 or 2 (due to those methods being patched) or method 3 (due to that method requiring a rooted Android device).
+**Who should use this?** Technical iOS users of Authy that cannot export their
+tokens with methods 1 or 2 (due to those methods being patched) or method 3 (due
+to that method requiring a rooted Android device).
 
-This method works by intercepting the data the Authy app receives while logging in for the first time, which contains your encrypted authenticator tokens. After the encrypted authenticator tokens are dumped, you can decrypt them using your backup password and convert them to an Ente token file.
+This method works by intercepting the data the Authy app receives while logging
+in for the first time, which contains your encrypted authenticator tokens. After
+the encrypted authenticator tokens are dumped, you can decrypt them using your
+backup password and convert them to an Ente token file.
 
-For an up-to-date guide of how to retrieve the encrypted authenticator tokens and decrypt them, please see [Authy-iOS-MiTM](https://github.com/AlexTech01/Authy-iOS-MiTM). To convert the `decrypted_tokens.json` file from that guide into a format Ente Authenticator can recognize, use [this](https://gist.github.com/gboudreau/94bb0c11a6209c82418d01a59d958c93?permalink_comment_id=5317087#gistcomment-5317087) Python script. Once you have the `ente_auth_import.plain` file from that script, transfer it to your device and follow the instructions below to import it into Ente Authenticator.
+For an up-to-date guide of how to retrieve the encrypted authenticator tokens
+and decrypt them, please see
+[Authy-iOS-MiTM](https://github.com/AlexTech01/Authy-iOS-MiTM). To convert the
+`decrypted_tokens.json` file from that guide into a format Ente Authenticator
+can recognize, use
+[this](https://gist.github.com/gboudreau/94bb0c11a6209c82418d01a59d958c93?permalink_comment_id=5317087#gistcomment-5317087)
+Python script. Once you have the `ente_auth_import.plain` file from that script,
+transfer it to your device and follow the instructions below to import it into
+Ente Authenticator.
 
 ## Importing to Ente Authenticator (Method 1, method 2.1, method 4)
 

docs/docs/auth/migration/index.md

@@ -1,7 +1,6 @@
 ---
 title: Migrating to Ente Auth
-description:
-    Guides for migrating your existing 2FA tokens into or out of Ente Auth
+description: Guides for migrating your existing 2FA tokens into or out of Ente Auth
 ---
 
 # Migrating to/from Ente Auth

docs/docs/de/auth/index.md

@@ -10,4 +10,4 @@ Ende-zu-Ende-verschlüsselte Authenticator-App für jedermann. Wir sind froh, da
 du hier bist!
 
 **Please note that this German translation is currently just a placeholder.**
-Know German? [Help us fill this in!](/about/contribute).
+Know German? [Help us fill this in!](/#contribute).

docs/docs/index.md

@@ -1,15 +1,82 @@
 ---
 title: Home
+description: >
+    Introduction to Ente: Products, Community and Support
 ---
 
 # Welcome!
 
-This site contains documentation and help for Ente Photos and Ente Auth. It
-describes various features, and also offers various troubleshooting suggestions.
+![Ducky: Ente's Mascot](/ducky.png){width=50% style="margin: 0 auto"}
 
-Use the **sidebar** menu to navigate to information about the product (Photos or
-Auth) you'd like to know more about. Or use the **search** at the top to try and
-jump directly to page that might contain the information you need.
+## Introduction
 
-To know more about Ente, see [about](/about/) or visit our website
-[ente.io](https://ente.io).
+Ente (pronounced en-_tay_) is a end-to-end encrypted platform for privately,
+reliably, and securely storing your data on the cloud, over which 2 applications
+have been developed and made available for mobile, web and desktop, namely:
+
+- **Ente Photos** - An alternative to Google Photos and Apple Photos.
+- **Ente Auth** - A free 2FA alternative to Authy.
+
+## History
+
+Ente was founded by Vishnu Mohandas (Ente's CEO) in response to privacy concerns
+with major tech companies. The underlying motivation was the understanding that
+big tech had no incentive to fix their act, but with end-to-end encrypted cross
+platform apps, there was a way for people to take back control over their own
+data without sacrificing on features.
+
+### Origin of the name
+
+In Malayalam, Vishnu's native language, "ente" means "mine", thus "Ente Photos"
+literally means "my photos".
+
+But one day, he discovered that "ente" means "duck" in German. This unexpected
+connection sealed the deal after looking for alternative names and led to the
+adoption of ["Ducky"](https://ente.io/blog/ducky/), representing the playfulness
+and friendly nature of the community and team.
+
+## Getting Started
+
+We recommend reading the documentation for [Ente Photos](/photos/) or
+[Ente Auth](/auth/) to get started with installation on the desired platform,
+explore available features and usage.
+
+If you are looking to self-host Ente, we recommend you to read the
+[official documentation](/self-hosting/) for updated information on getting
+started, installation, administration and maintenance.
+
+## Contributing
+
+There are many ways to support Ente and you don't have to be a programmer for
+that. You can spread the word, give feedback, report bugs, help us with
+translations, contribute documentation and community guides and more.
+
+To suggest new features and/or offer your perspective on how we should design
+(planned and upcoming features), use our
+[GitHub discussions](https://github.com/ente-io/ente/discussions)
+
+You can find our contribution guidelines
+[here](https://github.com/ente-io/ente/blob/main/CONTRIBUTING.md).
+
+You can always engage with our community and team to hang out, answer queries
+and stay updated:
+
+- Chat: [Discord](https://ente.io/discord)
+- Discussions: [GitHub](https://github.com/ente-io/ente/discussions)
+- Socials:
+    - Twitter: [enteio](https://twitter.com/enteio)
+    - Mastodon: [@ente@fosstodon.org](https://fosstodon.org/@ente)
+    - Bluesky: [ente.io](https://bsky.app/profile/ente.io)
+    - Instagram: [ente.app](https://www.instagram.com/ente.app)
+- Website:
+    - [Blog](https://ente.io/blog)
+    - [RSS](https://ente.io/blog/rss.xml)
+
+## Getting Help
+
+If you encounter any issues with any of the products that's not answered by our
+documentation, please reach out to our team by sending an email to
+[support@ente.io](mailto:support@ente.io).
+
+For community support, please post your queries on our
+[Discord](https://discord.gg/z2YVKkycX3) server.

docs/docs/photos/faq/desktop.md

@@ -15,7 +15,8 @@ to manually update the software.
 
 ### Upload errors
 
-**How do I identify which files experienced upload issues within the desktop app?**
+**How do I identify which files experienced upload issues within the desktop
+app?**
 
 Check the sections within the upload progress bar for "Failed Uploads," "Ignored
 Uploads," and "Unsuccessful Uploads."
@@ -33,6 +34,5 @@ be specific to your distro (e.g. `xdg-desktop-menu forceupdate`).
 
 > [!NOTE]
 >
-> If you're using an AppImage and not seeing the icon, you'll need to [enable
-> AppImage desktop
-> integration](/photos/troubleshooting/desktop-install/#appimage-desktop-integration).
+> If you're using an AppImage and not seeing the icon, you'll need to
+> [enable AppImage desktop integration](/photos/troubleshooting/desktop-install/#appimage-desktop-integration).

docs/docs/photos/faq/export.md

@@ -7,9 +7,10 @@ description: Frequently asked questions about keeping extra backups of your data
 
 ## How can I backup my data in a local drive outside Ente?
 
-You can use our CLI tool or our desktop app to set up exports of your data
-to your local drive. This way, you can use Ente in your day to day use, with an additional guarantee that a copy of your original photos and videos are
-always available on your machine.
+You can use our CLI tool or our desktop app to set up exports of your data to
+your local drive. This way, you can use Ente in your day to day use, with an
+additional guarantee that a copy of your original photos and videos are always
+available on your machine.
 
 - You can use [Ente's CLI](https://github.com/ente-io/ente/tree/main/cli#export)
   to export your data in a cron job to a location of your choice. The exports

docs/docs/photos/faq/face-recognition.md

@@ -1,7 +1,6 @@
 ---
 title: Face recognition
-description:
-    Frequently asked questions about Ente's face recognition
+description: Frequently asked questions about Ente's face recognition
 ---
 
 # Face recognition

docs/docs/photos/faq/general.md

@@ -26,7 +26,6 @@ unsupported file format and we will do our best to help you out.
 
 Yes, we currently do not support files larger than 4 GB.
 
-
 ## Does Ente support videos?
 
 Ente supports backing up and downloading of videos in their original format and
@@ -68,7 +67,7 @@ reliable as any one can be.
 If you would like to fund the development of this project, please consider
 [subscribing](https://ente.io/download).
 
-## How do I pronounce ente?
+## How do I pronounce Ente?
 
 It's like cafe 😊. kaf-_ay_. en-_tay_.
 
@@ -101,29 +100,53 @@ clicking on "Your map" under "Locations" on the search screen.
 
 ## How to reset my password if I lost it?
 
-On the login page, enter your email and click on Forgot Password. Then, enter your recovery key and create a new password.
+On the login page, enter your email and click on Forgot Password. Then, enter
+your recovery key and create a new password.
 
- # iOS Album Backup and Organization in Ente
+## Can I search for photos using the descriptions I’ve added?
 
- ### How does Ente handle photos that are part of multiple iOS albums?
-When you select multiple albums for backup, Ente prioritizes uploading each photo to the album with the fewest photos. This means a photo will only be uploaded once, even if it exists in multiple albums on your device. If you create new albums on your device after the initial backup, those photos may not appear in the corresponding Ente album if they were already uploaded to a different album.
+Yes, descriptions are searchable, making it easier to find specific photos
+later. To do this, open the photo, tap the (i) button, and enter your
+description.
 
+## How does the deduplication feature work on the desktop app?
 
-### Why don’t all photos from a new iOS album appear in the corresponding Ente album?
-If you create a new album on your device after the initial backup, the photos in that album may have already been uploaded to another album in Ente. To fix this, go to the "On Device" album in Ente, select all photos, and manually add them to the corresponding album in Ente.
+If the app finds exact duplicates, it will show them in the deduplication. When
+you delete a duplicate, the app keeps one copy and creates a symlink for the
+other duplicate. This helps save storage space.
 
-### What happens if I reorganize my photos in the iOS Photos app after backing up?
-Reorganizing photos in the iOS Photos app (e.g., moving photos to new albums) won’t automatically reflect in Ente. You’ll need to manually add those photos to the corresponding albums in Ente to maintain consistency.
+## What happens if I lose access to my email address? Can I use my recovery key to bypass email verification?
 
-### Can I search for photos using the descriptions I’ve added?
-Yes, descriptions are searchable, making it easier to find specific photos later.
-To do this, open the photo, tap the (i) button, and enter your description.
-
-### How does the deduplication feature work on the desktop app?
-If the app finds exact duplicates, it will show them in the deduplication. When you delete a duplicate, the app keeps one copy and creates a symlink for the other duplicate. This helps save storage space.
-
-### What happens if I lose access to my email address? Can I use my recovery key to bypass email verification?
-No, the recovery key does not bypass email verification. For security reasons, we do not disable or bypass email verification unless the account owner reaches out to us and successfully verifies their identity by providing details about their account.
+No, the recovery key does not bypass email verification. For security reasons,
+we do not disable or bypass email verification unless the account owner reaches
+out to us and successfully verifies their identity by providing details about
+their account.
 
 If you lose access to your email, please contact our support team at
 support@ente.io
+
+---
+
+# iOS Album Backup and Organization in Ente
+
+## How does Ente handle photos that are part of multiple iOS albums?
+
+When you select multiple albums for backup, Ente prioritizes uploading each
+photo to the album with the fewest photos. This means a photo will only be
+uploaded once, even if it exists in multiple albums on your device. If you
+create new albums on your device after the initial backup, those photos may not
+appear in the corresponding Ente album if they were already uploaded to a
+different album.
+
+## Why don’t all photos from a new iOS album appear in the corresponding Ente album?
+
+If you create a new album on your device after the initial backup, the photos in
+that album may have already been uploaded to another album in Ente. To fix this,
+go to the "On Device" album in Ente, select all photos, and manually add them to
+the corresponding album in Ente.
+
+## What happens if I reorganize my photos in the iOS Photos app after backing up?
+
+Reorganizing photos in the iOS Photos app (e.g., moving photos to new albums)
+won’t automatically reflect in Ente. You’ll need to manually add those photos to
+the corresponding albums in Ente to maintain consistency.

docs/docs/photos/faq/metadata.md

@@ -62,6 +62,7 @@ the upload time as the photo's creation time.
 ## Modifications
 
 Ente supports modifications to the following metadata:
+
 - File name
 - Date & time
 - Location

docs/docs/photos/faq/security-and-privacy.md

@@ -1,7 +1,6 @@
 ---
 title: Security and Privacy FAQ
-description:
-    Comprehensive information about security and privacy measures in Ente Photos
+description: Comprehensive information about security and privacy measures in Ente Photos
 ---
 
 # Security and Privacy FAQ

docs/docs/photos/faq/video-streaming.md

@@ -1,7 +1,6 @@
 ---
 title: Video streaming FAQ
-description:
-    Frequently asked questions about Ente's video streaming feature
+description: Frequently asked questions about Ente's video streaming feature
 ---
 
 # Video streaming
@@ -16,7 +15,7 @@ description:
 #### On mobile
 
 - Open Settings -> General -> Advanced
-- Switch on the toggle for `Video streaming`
+- Enable the toggle for `Streamable videos`
 
 #### On desktop
 
@@ -78,6 +77,7 @@ generated stream.
 While this feature is in beta, we will not count the storage consumed by your
 streams against your storage quota. This may change in the future. If it does,
 we will provide an option to opt-in to one of the following:
+
 1. Original videos only
 2. Compressed streams only
 3. Both

docs/docs/photos/features/background.md

@@ -43,8 +43,8 @@ need to disable this "Optimize battery usage" mode in the system settings for
 Ente if you wish for Ente to automatically back up your photos in the
 background.
 
-On Android versions 15 and later, if an app is in private space and the private 
-space is locked, Android doesn’t allow the app to run any background processes. 
+On Android versions 15 and later, if an app is in private space and the private
+space is locked, Android doesn’t allow the app to run any background processes.
 As a result, background sync will not work.
 
 ### Desktop

docs/docs/photos/features/cast/index.md

@@ -1,7 +1,6 @@
 ---
 title: Cast
-description:
-    Casting your photos on to a large screen or a TV or a Chromecast device
+description: Casting your photos on to a large screen or a TV or a Chromecast device
 ---
 
 # Cast

docs/docs/photos/features/deduplicate.md

@@ -52,6 +52,11 @@ Ente also provides a tool for manual de-duplication in _Settings → Backup →
 Remove duplicates_. This is useful if you have an existing library with
 duplicates across different albums, but wish to keep only one copy.
 
+During this operation, Ente will discard duplicates across all albums, retain a
+single copy, and add symlinks to this copy within all existing albums. So your
+existing album structure remains unchanged, while the space consumed by the
+duplicate data is freed up.
+
 ## Adding to Ente album creates symlinks
 
 Note that once a file is in Ente, adding it to another Ente album will create a

docs/docs/photos/features/family-plans.md

@@ -1,7 +1,6 @@
 ---
 title: Family plans
-description:
-    Share your Ente Photos plan with your family members with no extra cost
+description: Share your Ente Photos plan with your family members with no extra cost
 ---
 
 # Family plans
@@ -24,19 +23,19 @@ In brief,
 
 ## Storage Limits
 
-If you're an admin of a family, you will be able to set storage limits for the 
+If you're an admin of a family, you will be able to set storage limits for the
 members in your family plan.
 
-In brief, 
+In brief,
 
-- For example, once you set a limit of 10GB for a member, their Storage
-  quota for uploading photos will be limited to 10GB.
+- For example, once you set a limit of 10GB for a member, their Storage quota
+  for uploading photos will be limited to 10GB.
 
-- Once the invited member accepts the Family invite, you will be able to see 
-  an edit icon in the Members List. Click on it to setup a family limit.
+- Once the invited member accepts the Family invite, you will be able to see an
+  edit icon in the Members List. Click on it to setup a family limit.
 
 - If the admin has set a limit for any user, that limit value will be prefilled
-  in the input box. 
+  in the input box.
 
-- If you want to remove any storage limit from a members account, you 
-  can click on the "Remove Limit" and they can upload photos without any limit. 
+- If you want to remove any storage limit from a members account, you can click
+  on the "Remove Limit" and they can upload photos without any limit.

docs/docs/photos/features/machine-learning.md

@@ -47,8 +47,20 @@ device.
 The indexes are synced across all your devices automatically using the same
 end-to-end encrypted security that we use for syncing your photos.
 
-Note that the desktop app does not currently support modifying the face
-groupings, that is only supported by the mobile app.
+---
+
+#### Local indexing on mobile
+
+In general the machine learning is optimized to work well on most mobile device.
+However, devices with low RAM (4-6GB) and large photo libraries might struggle
+to complete the indexing without affecting performance of the app. In such case,
+you might want to disable local indexing and let the desktop run it instead.
+
+You can disable local indexing from the settings, under
+`General > Advanced > Machine learning > Configuration`. This way, you can
+continue to use the ML features without your phone performance taking any hit.
+
+---
 
 For more information on how to use Machine Learning for face recognition please
 check out [the FAQ](../faq/face-recognition).

docs/docs/photos/features/notifications.md

@@ -0,0 +1,33 @@
+---
+title: Notifications
+description: Details about notifications in Ente
+---
+
+# Notifications
+
+The Ente app can send notifications to notify you of an update, or just to
+remind you of some sweet or helpful memory at the right time.
+
+## New shared photos
+
+Receive notifications when someone adds a photo to a shared album that you're a
+part of.
+
+## "On this day" memories
+
+Receive reminders about memories from this day in previous years. These
+reminders will only be shown if there are enough photos taken across previous
+years of the specific day.
+
+## Birthday notifications
+
+Receive reminders when it's someone's birthday. Tapping on the notification will
+take you to photos of the birthday person. This requires you to first add a
+birthday to a person, and will only be shown if there are enough photos of that
+person.
+
+## Notification permission
+
+By default all notification categories are enabled if you give notification
+permission. You can disable all of the above notification categories from
+`Settings > Notifications`. Notifications currently only work on mobile.

docs/docs/photos/features/watch-folders.md

@@ -1,7 +1,6 @@
 ---
 title: Watch folder
-description:
-    Automatic syncing of selected folders using the Ente Photos desktop app
+description: Automatic syncing of selected folders using the Ente Photos desktop app
 ---
 
 # Watch folders

docs/docs/photos/migration/export/index.md

@@ -66,5 +66,4 @@ If you run into any issues during your data export, please reach out to
 
 Note that we also provide a
 [CLI tool](https://github.com/ente-io/ente/tree/main/cli#export) to export your
-data. You can find more information about the export in the
-[export FAQ](/photos/faq/export).
+data.

docs/docs/photos/migration/from-local-hard-disk.md

@@ -1,7 +1,6 @@
 ---
 title: Import from local hard disk
-description:
-    Migrating to Ente Photos by importing data from your local hard disk
+description: Migrating to Ente Photos by importing data from your local hard disk
 ---
 
 # Import photos from your local hard disk

docs/docs/photos/troubleshooting/desktop-install/index.md

@@ -99,3 +99,17 @@ If you do want to run it from the command line, you can do so by passing the
 
 For more details, see this upstream issue on
 [electron](https://github.com/electron/electron/issues/17972).
+
+### Application reporting offline despite Internet connectivity
+
+Due to unreliability of usage of `navigator.onLine` in Linux, the app may report that you are offline, even though the internet connection is functional.
+
+You can resolve the issue by adding a dummy network interface using the following command:
+
+```shell
+ip link add dummy0 type dummy
+ip addr add 10.10.10.1/24 dev dummy0
+ip link set dummy0 up
+```
+
+Once the interface is up, Ente correctly detects that the system is online.

docs/docs/photos/troubleshooting/files-not-uploading.md

@@ -1,7 +1,6 @@
 ---
 title: Files not uploading
-description:
-    Troubleshooting when files are not uploading from your Ente Photos app
+description: Troubleshooting when files are not uploading from your Ente Photos app
 ---
 
 # Files not uploading

docs/docs/self-hosting/administration/backup.md

@@ -0,0 +1,47 @@
+---
+title: Backups - Self-hosting
+description: General introduction to backing up your self hosted Ente instance
+---
+
+# Backing up your Ente instance
+
+A functional Ente backend needs three things:
+
+1. Museum (the API server)
+2. Postgres (the database)
+3. Object storage (any S3-compatible object storage)
+
+Thus, when thinking about backups:
+
+1. For Museum, you should backup your `museum.yaml`, `credentials.yaml` or any
+   other custom configuration that you created.
+2. The entire data volume needs to be backed up for the database and object
+   storage.
+
+A common oversight is taking a lot of care for backing up the object storage,
+even going as far as enabling replication and backing up the the multiple object
+storage volumes, but not applying the same care to the database backup.
+
+While the actual encrypted photos are indeed stored in the object storage,
+**this encrypted data will not be usable without the database** since the
+database contains information like a file specific encryption key.
+
+Viewed differently, to decrypt your data you need three pieces of information:
+
+1. The encrypted file data itself (which comes from the object storage backup).
+2. The encrypted file and collection specific encryption keys (which come from
+   the database backup).
+3. The master key (which comes from your password).
+
+If you're starting out with self hosting, we recommend keeping plaintext backup
+of your photos.
+
+[You can use the CLI or the desktop app to automate this](/photos/faq/export).
+
+Once you get more comfortable with the various parts, you can try backing up
+your instance.
+
+If you rely on your instance backup, ensure that you do full restoration to
+verify that you are able to access your data.
+
+As the industry saying goes, a backup without a restore is no backup at all.

docs/docs/self-hosting/administration/cli.md

@@ -0,0 +1,83 @@
+---
+title: Ente CLI for Self-hosted Instance - Self-hosting
+description: Guide to configuring Ente CLI for Self Hosted Instance
+---
+
+# Ente CLI for self-hosted instance
+
+If you are self-hosting, you can configure Ente CLI to export data & perform
+basic administrative actions.
+
+## Step 1: Configure endpoint
+
+To do this, first configure the CLI to use your server's endpoint.
+
+Define `config.yaml` and place it in `~/.ente/` or directory specified by
+`ENTE_CLI_CONFIG_DIR` or directory where Ente CLI is present.
+
+```yaml
+# Set the API endpoint to your domain where Museum is being served.
+endpoint:
+    api: http://localhost:8080
+```
+
+## Step 2: Whitelist admins
+
+You can whitelist administrator users by following this
+[guide](/self-hosting/administration/users#whitelist-admins).
+
+## Step 3: Add an account
+
+::: info You can not create new accounts using Ente CLI.
+
+You can only log in to your existing accounts.
+
+To create a new account, use Ente Photos (or Ente Auth) web application, desktop
+or mobile.
+
+:::
+
+You can add your existing account using Ente CLI.
+
+```shell
+ente account add
+```
+
+This should prompt you for authentication details and export directory. Your
+account should be added after successful authentication.
+
+It can be used for exporting data (for plain-text backup), managing Ente Auth
+and performing administrative actions.
+
+## Step 4: Increase storage and account validity
+
+You can use `ente admin update-subscription` to increase storage quota and
+account validity (duration).
+
+For infinite storage and validity, use the following command:
+
+```shell
+ente admin update-subscription -a <admin-user-mail> -u <user-email-to-update> --no-limit
+
+# Set a limit
+ente admin update-subscription -a <admin-user-mail> -u <user-email-to-update> --no-limit False
+```
+
+::: info The users must be registered on the server with same e-mail address.
+
+If the commands are failing, ensure:
+
+1. `<admin-user-mail>` is whitelisted as administrator user in `museum.yaml`.
+   For more information, check this
+   [guide](/self-hosting/administration/users#whitelist-admins).
+2. `<user-email-to-update>` is a registered user with completed verification.
+
+:::
+
+For more information, check out the documentation for setting
+[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
+using the CLI.
+
+## References
+
+1. [Ente CLI Documentation](https://github.com/ente-io/ente/blob/main/cli/docs/generated)

docs/docs/self-hosting/administration/object-storage.md

@@ -0,0 +1,133 @@
+---
+title: Configuring Object Storage - Self-hosting
+description:
+    Configure Object Storage for storing files along with some troubleshooting
+    tips
+---
+
+# Configuring Object Storage
+
+Ente relies on [S3-compatible](https://docs.aws.amazon.com/s3/) cloud storage
+for storing files (photos, thumbnails and videos) as objects.
+
+Ente ships MinIO as S3-compatible storage by default in quickstart and Docker
+Compose for quick testing.
+
+This document outlines configuration of S3 buckets and enabling replication for
+further usage.
+
+## Museum
+
+The S3-compatible buckets have to be configured in `museum.yaml` file.
+
+### General Configuration
+
+Some of the common configuration that can be done at top-level are:
+
+1. **SSL Configuration:** If you need to configure SSL (i. e., the buckets are
+   accessible via HTTPS), you'll need to set `s3.are_local_buckets` to `false`.
+2. **Path-style URLs:** Disabling `s3.are_local_buckets` also switches to the
+   subdomain-style URLs for the buckets. However, some S3 providers such as
+   MinIO do not support this.
+
+    Set `s3.use_path_style_urls` to `true` for such cases.
+
+### Replication
+
+> [!IMPORTANT]
+>
+> Replication works only if all 3 storage buckets are configured (2 hot and 1
+> cold storage).
+>
+> For more information, check
+> [this discussion](https://github.com/ente-io/ente/discussions/3167#discussioncomment-10585970)
+> and our article on ensuring [reliability](https://ente.io/reliability/).
+
+Replication is disabled by default in self-hosted instance. Only the first
+bucket (`b2-eu-cen`) is used.
+
+Only the names are specifically fixed, you can put any other keys in
+configuration body.
+
+Use the `s3.hot_storage.primary` option if you'd like to set one of the other
+pre-defined buckets as the primary bucket.
+
+### Bucket configuration
+
+The keys `b2-eu-cen` (primary storage), `wasabi-eu-central-2-v3` (secondary
+storage) and `scw-eu-fr-v3` (cold storage) are hardcoded, however, the keys and
+secret can be anything.
+
+It has no relation to Backblaze, Wasabi or Scaleway.
+
+Each bucket's endpoint, region, key and secret should be configured accordingly
+if using an external bucket.
+
+A sample configuration for `b2-eu-cen` is provided, which can be used for other
+2 buckets as well:
+
+```yaml
+b2-eu-cen:
+    key: <key>
+    secret: <secret>
+    endpoint: localhost:3200
+    region: eu-central-2
+    bucket: b2-eu-cen
+```
+
+## CORS (Cross-Origin Resource Sharing)
+
+If you cannot upload a photo due to CORS error, you need to fix the CORS
+configuration of your bucket.
+
+Use the content provided below for creating a `cors.json` file:
+
+```json
+{
+    "CORSRules": [
+        {
+            "AllowedOrigins": ["*"],
+            "AllowedHeaders": ["*"],
+            "AllowedMethods": ["GET", "HEAD", "POST", "PUT", "DELETE"],
+            "MaxAgeSeconds": 3000,
+            "ExposeHeaders": ["Etag"]
+        }
+    ]
+}
+```
+
+You may have to change the `AllowedOrigins` to allow only certain origins (your
+Ente web apps and Museum) for security.
+
+Assuming you have AWS CLI on your system and that you have configured it with
+your access key and secret, you can execute the below command to set bucket
+CORS. Make sure to enter the right path for the `cors.json` file.
+
+```shell
+aws s3api put-bucket-cors --bucket YOUR_S3_BUCKET --cors-configuration /path/to/cors.json
+```
+
+### MinIO
+
+Assuming you have configured an alias for MinIO account using the command:
+
+```shell
+mc alias set storage-account-alias minio-endpoint minio-key minio-secret
+```
+
+where,
+
+1. `storage-account-alias` is a valid storage account alias name
+2. `minio-endpoint` is the endpoint where MinIO is being served without the
+   protocol (http or https). Example: `localhost:3200`
+3. `minio-key` is the MinIO username defined in `MINIO_ROOT_USER`
+4. `minio-secret` is the MinIO password defined in `MINIO_PASSWORD`
+
+To set the `AllowedOrigins` Header, you can use the following command:.
+
+```shell
+mc admin config set storage-account-alias api cors_allow_origin="*"
+```
+
+You can create also `.csv` file and dump the list of origins you would like to
+allow and replace the `*` with path to the CSV file.

docs/docs/self-hosting/administration/reverse-proxy.md

@@ -0,0 +1,101 @@
+---
+Title: Configuring Reverse Proxy - Self-hosting
+Description: Configuring reverse proxy for Museum and other services
+---
+
+# Reverse proxy
+
+Reverse proxy helps in making application services accessible via the Internet
+without exposing multiple ports for various services.
+
+It also allows configuration of HTTPS through SSL certificate management.
+
+We highly recommend using HTTPS for Museum (Ente's server). For security
+reasons, Museum will not accept incoming HTTP traffic.
+
+## Pre-requisites
+
+1.  **Reverse Proxy:** We recommend using Caddy for simplicity of configuration
+    and automatic certificate generation and management, although you can use
+    other alternatives such as NGINX, Traefik, etc.
+
+    Install Caddy using the following command on Debian/Ubuntu-based systems:
+
+    ```shell
+    sudo apt install caddy
+    ```
+
+    Start the service and enable it to start upon system boot.
+
+    ```shell
+    sudo systemctl start caddy
+    sudo systemctl enable caddy
+    ```
+
+## Step 1: Configure A or AAAA records
+
+Set up the appropriate records for the endpoints in your DNS management
+dashboard (usually associated with your domain registrar).
+
+`A` or `AAAA` records pointing to your server's IP address are sufficient.
+
+DNS propagation can take a few minutes to take effect.
+
+![cloudflare](/cloudflare.png)
+
+## Step 2: Configure reverse proxy
+
+After installing Caddy, `Caddyfile` is created at `/etc/caddy/`. Edit
+`/etc/caddy/Caddyfile` to configure reverse proxies.
+
+You can edit the minimal configuration provided below for your own needs.
+
+> yourdomain.tld is an example. Replace it with your own domain.
+
+```groovy
+# For Museum
+api.ente.yourdomain.tld {
+    reverse_proxy http://localhost:8080
+}
+
+# For Ente Photos web app
+web.ente.yourdomain.tld {
+    reverse_proxy http://localhost:3000
+}
+
+# For Ente Accounts web app
+accounts.ente.yourdomain.tld {
+    reverse_proxy http://localhost:3001
+}
+
+# For Ente Albums web app
+albums.ente.yourdomain.tld {
+    reverse_proxy http://localhost:3002
+}
+
+# For Ente Auth web app
+auth.ente.yourdomain.tld {
+    reverse_proxy http://localhost:3003
+}
+
+# For Ente Cast web app
+cast.ente.yourdomain.tld {
+    reverse_proxy http://localhost:3004
+}
+```
+
+## Step 3: Reload reverse proxy
+
+Reload Caddy for changes to take effect.
+
+```shell
+sudo systemctl caddy reload
+```
+
+## Step 4: Verify the setup
+
+Ente Photos web app should be up on https://web.ente.yourdomain.tld and Museum
+at https://api.ente.yourdomain.tld.
+
+> [!TIP] If you are using other reverse proxy servers such as NGINX, Traefik,
+> etc., please check out their documentation.

docs/docs/self-hosting/administration/users.md

@@ -0,0 +1,126 @@
+---
+title: User Management - Self-hosting
+description: Guide to configuring Ente CLI for Self Hosted Instance
+---
+
+# User Management
+
+You may wish to self-host Ente for your family or close circle. In such cases,
+you may wish to enable administrative access for few users, disable new
+registrations, manage one-time tokens (OTTs), etc.
+
+This document covers the details on how you can administer users on your server.
+
+## Whitelist admins
+
+The administrator users have to be explicitly whitelisted in `museum.yaml`. You
+can achieve this the following steps:
+
+1.  Connect to `ente_db` (the database used for storing data related to Ente).
+
+    ```shell
+    # Change the DB name and DB user name if you use different
+    # values.
+    # If using Docker
+
+    docker exec -it <postgres-ente-container-name>
+    psql -U pguser -d ente_db
+
+    # Or when using psql directly
+    psql -U pguser -d ente_db
+    ```
+
+2.  Get the user ID of the first user by running the following SQL query:
+
+    ```sql
+    SELECT * from users;
+    ```
+
+3.  Edit `internal.admins` or `internal.admin` (if you wish to whitelist only
+    single user) in `museum.yaml` to add the user ID you wish to whitelist.
+
+    - For multiple admins:
+
+    ```yaml
+    internal:
+        admins:
+            - <user_id>
+    ```
+
+    - For single admin:
+
+    ```yaml
+    internal:
+        admin: <user_id>
+    ```
+
+4.  Restart Museum by restarting the cluster
+
+::: tip Restart your Compose clusters whenever you make changes
+
+If you have edited the Compose file or configuration file (`museum.yaml`), make
+sure to recreate the cluster's containers.
+
+You can do this by the following command:
+
+```shell
+docker compose down && docker compose up -d
+```
+
+:::
+
+## Increase storage and account validity
+
+You can use Ente CLI for increasing storage quota and account validity for users
+on your instance. Check this guide for more
+[information](/self-hosting/administration/cli#step-4-increase-storage-and-account-validity)
+
+## Handle user verification codes
+
+Ente currently relies on verification codes for completion of registration.
+
+These are accessible in server logs. If using Docker Compose, they can be
+accessed by running `sudo docker compose logs` in the cluster folder where
+Compose file resides.
+
+However, you may wish to streamline this workflow. You can follow one of the 2
+methods if you wish to have many users in the system.
+
+### Use hardcoded OTTs
+
+You can configure to use hardcoded OTTs only for specific emails, or based on
+suffix.
+
+A sample configuration for the same is provided below, which is to be used in
+`museum.yaml`:
+
+```yaml
+internal:
+    hardcoded-ott:
+        emails:
+            - "example@example.org,123456"
+        local-domain-suffix: "@example.org"
+        local-domain-value: 012345
+```
+
+This sets OTT to 123456 for the email address example@example.com and 012345 for
+emails having @example.com as suffix.
+
+### Send email with verification code
+
+You can configure SMTP for sending verification code e-mails to users, if you do
+not wish to hardcode OTTs and have larger audience.
+
+For more information on configuring email, check out the
+[email configuration](/self-hosting/installation/config#email) section.
+
+## Disable registrations
+
+For security purposes, you may choose to disable registrations on your instance.
+You can disable new registrations by using the following configuration in
+`museum.yaml`.
+
+```yaml
+internal:
+    disable-registration: true
+```

docs/docs/self-hosting/creating-accounts.md

@@ -1,27 +0,0 @@
----
-title: Creating accounts
-description: Creating accounts on your deployment
----
-
-# Creating accounts 
-
-Once Ente is up and running, the Ente Photos web app will be accessible on
-`http://localhost:3000`. Open this URL in your browser and proceed with creating
-an account.
-
-The default API endpoint for museum will be `localhost:8080`.
-
-![endpoint](/endpoint.png)
-
-To complete your account registration you will need to enter a 6-digit
-verification code.
-
-This code can be found in the server logs, which should already be shown in your
-quickstart terminal. Alternatively, you can open the server logs with the
-following command from inside the `my-ente` folder:
-
-```sh 
-sudo docker compose logs
-```
-
-![otp](/otp.png)

docs/docs/self-hosting/faq/backup.md

@@ -1,65 +0,0 @@
----
-title: Backups
-description: General introduction to backing up your self hosted Ente instance
----
-
-# Backing up your Ente instance
-
-> [!WARNING]
->
-> This is not meant to be a comprehensive and bullet proof guide. There are many
-> moving parts, and small mistakes might make your backups unusable.
->
-> Please treat this only as a general introduction. And remember to test your
-> restores.
-
-At the minimum, a functional Ente backend needs three things:
-
-1. Museum (the API server)
-2. Postgres (the database)
-3. Object storage (any S3-compatible object storage)
-
-When thinking about backups, this translates into backing up the relevant state
-from each of these:
-
-1. For museum, you'd want to backup your `museum.yaml`, `credentials.yaml` or
-   any other custom configuration that you created. In particular, you should
-   backup the
-   [secrets that are specific to your instance](https://github.com/ente-io/ente/blob/74377a93d8e20e969d9a2531f32f577b5f0ef090/server/configurations/local.yaml#L188)
-   (`key.encryption`, `key.hash` and `jwt.secret`).
-
-2. For postgres, the entire data volume needs to be backed up.
-
-3. For object storage, the entire data volume needs to be backed up.
-
-A common oversight is taking a lot of care for backing up the object storage,
-even going as far as enabling replication and backing up the the multiple object
-storage volumes, but not applying the same care to the database backup.
-
-While the actual encrypted photos are indeed stored in the object storage,
-**this encrypted data will not be usable without the database** since the
-database contains information like a file specific encryption key.
-
-Viewed differently, to decrypt your data you need three pieces of information:
-
-1. The encrypted file data itself (which comes from the object storage backup).
-
-2. The ([encrypted](https://ente.io/architecture/)) file and collection specific
-   encryption keys (which come from the database backup).
-
-3. The master key (which comes from your password).
-
----
-
-If you're starting out with self hosting, our recommendation is to start by
-keeping a plaintext backup of your photos.
-[You can use the CLI or the desktop app to automate this](/photos/faq/export).
-
-Once you get more comfortable with the various parts, you can try backing up
-your instance. As a reference,
-[this document outlines how Ente itself treats backups](https://ente.io/reliability).
-
-If you stop doing plaintext backups and instead rely on your instance backup,
-ensure that you do the full restore process also to verify you can get back your
-data. As the industry saying goes, a backup without a restore is no backup at
-all.

docs/docs/self-hosting/faq/environment.md

@@ -1,49 +0,0 @@
----
-title: "Environment Variables and Ports"
-description: "Information about all the Environment Variables needed to run Ente"
----
-
-# Environment variables and ports
-A self-hosted Ente instance requires specific endpoints in both Museum (the server) and web apps. This document outlines the essential environment variables and port mappings of the web apps.
-
-Here's the list of important variables that a self hoster should know about:
-
-### Museum
-
-1. `NEXT_PUBLIC_ENTE_ENDPOINT`
-
-The above environment variable is used to configure Museums endpoint. Where Museum is 
-running and which port it is listening on. This endpoint should be configured for 
-all the apps to connect to your self hosted endpoint. 
-
-All the apps (regardless of platform) by default connect to api.ente.io - which is 
-our production instance of Museum.
-
-### Web Apps
-
-> [!IMPORTANT]
-> Web apps don't need to be configured with the below endpoints. Web app environment
-> variables are being documented here just so that the users know everything in detail.
-> Checkout [Configuring your Server](/self-hosting/museum) to configure endpoints for
-> particular app.
-
-In Ente, all the web apps are separate NextJS applications. Therefore, they are all 
-configured via environment variables. The photos app (Ente Photos) has information 
-about and connects to other web apps like albums, cast, etc.
-
-
-1. `NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT`
-
-This environment variable is used to configure and declare the endpoint for the Albums
-web app.
-
-## Ports
-
-The below format is according to how ports are mapped in Docker. 
-Typically,`<host>:<container-port>`
-
-1. `8080:8080`: Museum (Ente's server)
-2. `3000:3000`: Ente Photos web app
-3. `3001:3001`: Ente Accounts web app
-4. `3003:3003`: [Ente Auth web app](https://ente.io/auth/)
-5. `3004:3004`: [Ente Cast web app](http://ente.io/cast)

docs/docs/self-hosting/faq/index.md

@@ -1,47 +0,0 @@
----
-title: FAQ - Self hosting
-description: Frequently asked questions about self hosting Ente
----
-
-# Frequently Asked Questions
-
-### Do Ente Photos and Ente Auth share the same backend?
-
-Yes. The apps share the same backend, the same database and the same object
-storage namespace. The same user account works for both of them.
-
-### Can I just self host Ente Auth?
-
-Yes, if you wish, you can self-host the server and use it only for the 2FA auth
-app. The starter Docker compose will work fine for either Photos or Auth (or
-both!).
-
-> You currently don't need to configure the S3 object storage (e.g. minio
-> containers) if you're only using your self hosted Ente instance for auth.
-
-### Can I use the server with _X_ as the object storage?
-
-Yes. As long as whatever X you're using provides an S3 compatible API, you can
-use it as the underlying object storage. For example, the starter self-hosting
-Docker compose file we offer uses MinIO, and on our production deployments we
-use Backblaze/Wasabi/Scaleway. But that's not the full list - as long as the
-service you intend to use has a S3 compatible API, it can be used.
-
-### How do I increase storage space for users on my self hosted instance?
-
-See the [guide for administering your server](/self-hosting/guides/admin). In
-particular, you can use the `ente admin update-subscription` CLI command to
-increase the
-[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
-of accounts on your instance.
-
-### How can I become an admin on my self hosted instance?
-
-The first user you create on your instance is treated as an admin.
-
-If you want, you can modify this behaviour by providing an explicit list of
-admins in the [configuration](/self-hosting/guides/admin#becoming-an-admin).
-
-### Can I disable registration of new accounts on my self hosted instance?
-
-Yes. See `internal.disable-registration` in local.yaml.

docs/docs/self-hosting/faq/otp.md

@@ -1,45 +0,0 @@
----
-title: Verification code
-description: Getting the OTP for a self hosted Ente
----
-
-# Verification code
-
-The self-hosted Ente by default does not send out emails, so you can pick the
-verification code by:
-
-- Getting it from the server logs, or
-
-- Reading it from the DB (otts table)
-
-The easiest option when getting started is to look for it in the server (museum)
-logs. If you're already running the docker compose cluster using the quickstart
-script, you should be already seeing the logs in your terminal. Otherwise you
-can go to the folder (e.g. `my-ente`) where your `compose.yaml` is, then run
-`docker compose logs museum --follow`. Once you can see the logs, look for a
-line like:
-
-```
-... Skipping sending email to email@example.com: *Verification code: 112089*
-```
-
-That is the verification code.
-
-> [!TIP]
->
-> You can also configure your instance to send out emails so that you can get
-> your verification code via emails by using the `smtp` section in the config.
-
-You can also set pre-defined hardcoded OTTs for certain users when running
-locally by creating a `museum.yaml` and adding the `internal.hardcoded-ott`
-configuration setting to it. See
-[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
-in the server source code for details about how to define this.
-
-> [!NOTE]
->
-> If you're not able to get the OTP with the above methods, make sure that you
-> are actually connecting to your self hosted instance and not to Ente's
-> production servers. e.g. you can use the network requests tab in the browser
-> console to verify that the API requests are going to your server instead of
-> `api.ente.io`.

docs/docs/self-hosting/faq/sharing.md

@@ -1,104 +0,0 @@
----
-title: Album sharing
-description: Getting album sharing to work using an self-hosted Ente
----
-
-# Is public sharing available for self-hosted instances?
-
-Yes.
-
-You'll need to run two instances of the web app, one is regular web app, but
-another one is the same code but running on a different origin (i.e. on a
-different hostname or different port).
-
-Then, you need to tell the regular web app to use your second instance to
-service public links. You can do this by setting the
-`NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT` to point to your second instance when running
-or building the regular web app.
-
-For more details, see
-[.env](https://github.com/ente-io/ente/blob/main/web/apps/photos/.env) and
-[.env.development](https://github.com/ente-io/ente/blob/main/web/apps/photos/.env.development).
-
-As a concrete example, assuming we have a Ente server running on
-`localhost:8080`, we can start two instances of the web app, passing them
-`NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT` that points to the origin
-("scheme://host[:port]") of the second "albums" instance.
-
-The first one, the normal web app
-
-```sh
-NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 \
-    NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=http://localhost:3002 \
-    yarn dev:photos
-```
-
-The second one, the same code but acting as the "albums" app (the only
-difference is the port it is running on):
-
-```sh
-NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 \
-    NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=http://localhost:3002 \
-    yarn dev:albums
-```
-
-If you also want to change the prefix (the origin) in the generated public
-links, to use your custom albums endpoint in the generated public link instead
-of albums.ente.io, set `apps.public-albums` property in museum's configuration
-
-For example, when running using the starter docker compose file, you can do this
-by creating a `museum.yaml` and defining the following configuration there:
-
-```yaml
-apps:
-    public-albums: http://localhost:3002
-```
-
-(For more details, see
-[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
-in the server's source code).
-
-## Dockerfile example
-
-Here is an example of a Dockerfile by @Dylanger on our community Discord. This
-runs a standalone self-hosted version of the public albums app in production
-mode.
-
-```Dockerfile
-FROM node:20-alpine as builder
-
-WORKDIR /app
-COPY . .
-
-ARG NEXT_PUBLIC_ENTE_ENDPOINT=https://your.ente.example.org
-ARG NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=https://your.albums.example.org
-
-RUN yarn install && yarn build
-
-FROM node:20-alpine
-
-WORKDIR /app
-COPY --from=builder /app/apps/photos/out .
-
-RUN npm install -g serve
-
-ENV PORT=3000
-EXPOSE ${PORT}
-
-CMD serve -s . -l tcp://0.0.0.0:${PORT}
-```
-
-Note that this only runs the public albums app, but the same principle can be
-used to run both the normal Ente photos app and the public albums app. There is
-a slightly more involved example showing how to do this also provided by in a
-community contributed guide about
-[configuring external S3](/self-hosting/guides/external-s3).
-
-You will also want to tell museum about your custom shared albums endpoint so
-that it uses that instead of the default URL when creating share links. You can
-configure that in museum's `config.yaml`:
-
-```
-apps:
-    public-albums: https://your.albums.example.org
-```

docs/docs/self-hosting/guides/admin.md

@@ -1,89 +0,0 @@
----
-title: Server admin
-description: Administering your custom self-hosted Ente instance using the CLI
----
-
-## Becoming an admin
-
-By default, the first user (and only the first user) created on the system is
-considered as an admin.
-
-This facility is provided as a convenience for people who are getting started
-with self hosting. For more serious deployments, we recommend creating an
-explicit whitelist of admins.
-
-> [!NOTE]
->
-> The first user is only treated as the admin if the list of admins in the 
-> configuration is empty.
->
-> Also, if at some point you delete the first user, then you will need to define
-> a whitelist to make some other user as the admin if you wish (since the first
-> account has been deleted).
-
-To whitelist the user IDs that can perform admin actions on the server, use the
-following steps:
-
-- Create a `museum.yaml` in the directory where you're starting museum from. For
-  example, if you're running using `docker compose up`, then this file should be
-  in the same directory as `compose.yaml` (generally, `server/museum.yaml`).
-
-    > Docker might've created an empty `museum.yaml` _directory_ on your machine
-    > previously. If so, delete that empty directory and create a new file named
-    > `museum.yaml`.
-
-- In this `museum.yaml` we can add overrides over the default configuration.
-
-For whitelisting the admin userIDs we need to define an `internal.admins`. See
-the "internal" section in
-[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml)
-in the server source code for details about how to define this.
-
-Here is an example. Suppose we wanted to whitelist a user with ID
-`1580559962386440`, we can create the following `museum.yaml`
-
-```yaml
-internal:
-    admins:
-        - 1580559962386440
-```
-
-You can use
-[account list](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_list.md)
-command to find the user id of any account.
-
-# Administering your custom server
-
-> [!NOTE]
-> For the first user (admin) to perform administrative actions using the CLI, their
-> userID must be whitelisted in the `museum.yaml` configuration file under
-> `internal.admins`. While the first user is automatically granted admin privileges
-> on the server, this additional step is required for CLI operations.
-
-You can use
-[Ente's CLI](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0) to
-administer your self hosted server.
-
-First we need to get your CLI to connect to your custom server. Define a
-config.yaml and put it either in the same directory as CLI or path defined in
-env variable `ENTE_CLI_CONFIG_PATH`
-
-```yaml
-endpoint:
-    api: "http://localhost:8080"
-```
-
-Now you should be able to
-[add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md),
-and subsequently increase the
-[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
-using the CLI.
-
-> [!NOTE]
->
-> The CLI command to add an account does not create Ente accounts. It only adds
-> existing accounts to the list of (existing) accounts that the CLI can use.
-
-## Backups
-
-See this [FAQ](/self-hosting/faq/backup).

docs/docs/self-hosting/guides/configuring-s3.md

@@ -1,124 +0,0 @@
----
-title: Configuring S3 buckets
-description:
-    Configure S3 endpoints to fix upload errors or use your self hosted ente
-    from outside localhost
----
-
-# Architecture
-
-![Client, Museum, S3](/client-museum-s3.png)
-
-There are three components involved in uploading a file:
-
-1.  The client (e.g. the web app or the mobile app)
-2.  Ente's server (museum)
-3.  The S3-compatible object storage (e.g. MinIO in the default starter)
-
-For the uploads to work, all three of them need to be able to reach each other.
-This is because the client uploads directly to the object storage.
-
-A file upload flows as follows:
-
-1.  Client that wants to upload a file asks museum where it should upload the
-    file to
-2.  museum creates pre-signed URLs for the S3 bucket that was configured
-3.  Client directly uploads to the S3 buckets these URLs
-4.  Client finally informs museum that a file has been uploaded to this URL
-
-The upshot of this is that _both_ the client and museum should be able to reach
-your S3 bucket.
-
-## Configuring S3 
-
-The URL for the S3 bucket is configured in
-[scripts/compose/credentials.yaml](https://github.com/ente-io/ente/blob/main/server/scripts/compose/credentials.yaml#L10).
-
-You can edit this file directly while testing, though it is more robust to
-create a `museum.yaml` (in the same folder as the Docker compose file) and to
-setup your custom configuration there.
-
-> [!TIP]
-> For more details about these configuration objects, see the documentation for
-> the `s3` object in
-> [configurations/local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml).
-
-By default, you only need to configure the endpoint for the first bucket.
-
-The Docker compose file is shipped with MinIO as the self hosted S3 compatible
-storage. By default, MinIO server is served on `localhost:3200` and the MinIO UI
-on `localhost:3201`.
-
-For example, in a localhost network situation, the way this connection works is,
-museum (`1`) and MinIO (`2`) run on the same Docker network and the web app
-(`3`) will also be hosted on your localhost. This enables all the three
-components of the setup to communicate with each other seamlessly.
-
-The same principle applies if you're deploying to your custom domain.
-
-## Replication 
-
-![Replication](/replication.png)
-<p align="center">Community contributed diagram of Ente's replication process</p>
-
-> [!IMPORTANT]
-> 
-> As of now, replication works only if all the 3 storage type needs are
-> fulfilled (1 hot, 1 cold and 1 glacier storage).
->
-> [Reference](https://github.com/ente-io/ente/discussions/3167#discussioncomment-10585970)
-
-If you're wondering why there are 3 buckets on the MinIO UI - that's because our
-production instance uses these to perform
-[replication](https://ente.io/reliability/).
-
-If you're also wondering about why the bucket names are specifically what they are, 
-it's because that is exactly what we are using on our production instance. 
-We use `b2-eu-cen` as hot, `wasabi-eu-central-2-v3` as cold (also the secondary hot) 
-and `scw-eu-fr-v3` as glacier storage. As of now, all of this is hardcoded. 
-Hence, the same hardcoded configuration is applied when you self host Ente.
-
-In a self hosted Ente instance replication is turned off by default. When
-replication is turned off, only the first bucket (`b2-eu-cen`) is used, and the
-other two are ignored. Only the names here are specifically fixed, but in the
-configuration body you can put any other keys. It does not have any relation
-with `b2`, `wasabi` or even `scaleway`.
-
-Use the `s3.hot_storage.primary` option if you'd like to set one of the other 
-predefined buckets as the primary bucket.
-
-## SSL Configuration 
-
-> [!NOTE]
->
-> If you need to configure SSL, you'll need to turn off `s3.are_local_buckets`
-> (which disables SSL in the default starter compose template).
->
-
-Disabling `s3.are_local_buckets` also switches to the subdomain style URLs for
-the buckets. However, not all S3 providers support these. In particular, MinIO
-does not work with these in default configuration. So in such cases you'll also
-need to enable `s3.use_path_style_urls`.
-
-## Summary
-
-Set the S3 bucket `endpoint` in `credentials.yaml` to a `yourserverip:3200` or
-some such IP / hostname that is accessible from both where you are running the
-Ente clients (e.g. the mobile app) and also from within the Docker compose
-cluster.
-
-### Example
-
-An example `museum.yaml` when you're trying to connect to museum running on your
-computer from your phone on the same WiFi network:
-
-```yaml
-s3:
-    are_local_buckets: true
-    b2-eu-cen:
-        key: test
-        secret: testtest
-        endpoint: http://<YOUR-WIFI-IP>:3200
-        region: eu-central-2
-        bucket: b2-eu-cen
-```

docs/docs/self-hosting/guides/custom-server/index.md

@@ -1,115 +0,0 @@
----
-title: Custom server
-description: Using a custom self-hosted server with Ente client apps and CLI
----
-
-# Connecting to a custom server
-
-You can modify various Ente client apps and CLI to connect to a self hosted
-custom server endpoint.
-
-[[toc]]
-
-## Mobile
-
-The pre-built Ente apps from GitHub / App Store / Play Store / F-Droid can be
-easily configured to use a custom server.
-
-You can tap 7 times on the onboarding screen to bring up a page where you can
-configure the endpoint the app should be connecting to.
-
-![Setting a custom server on the onboarding screen](custom-server.png)
-
-## Desktop and web
-
-Same as the mobile app, you can tap 7 times on the onboarding screen to
-configure the endpoint the app should connect to.
-
-<div align="center">
-
-![Setting a custom server on the onboarding screen on desktop or self-hosted web
-apps](web-dev-settings.png){width=400px}
-
-</div>
-
-This works on both the desktop app and web app (if you deploy on your own).
-
-To make it easier to identify when a custom server is being used, app will
-thereafter show the endpoint in use (if not Ente's production server) at the
-bottom of the login prompt:
-
-![Custom server indicator on the onboarding screen](web-custom-endpoint-indicator.png)
-
-Similarly, it'll be shown at other screens during the login flow. After login,
-you can also see it at the bottom of the sidebar.
-
-Note that the custom server configured this way is cleared when you reset the
-state during logout. In particular, the app also does a reset when you press the
-change email button during the login flow.
-
-### Building from source
-
-Alternatively (e.g. if you don't wish to configure this setting and just want to
-change the endpoint the client connects to by default), you can build the app
-from source and use the `NEXT_PUBLIC_ENTE_ENDPOINT` environment variable to tell
-it which server to connect to. For example:
-
-```sh
-NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev:photos
-```
-
-For more details, see
-[hosting the web app](https://help.ente.io/self-hosting/guides/web-app).
-
-## CLI
-
-> [!NOTE]
->
-> You can download the CLI from
-> [here](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0)
-
-Define a config.yaml and put it either in the same directory as where you run
-the CLI from ("current working directory"), or in the path defined in env
-variable `ENTE_CLI_CONFIG_PATH`:
-
-```yaml
-endpoint:
-    api: "http://localhost:8080"
-```
-
-(Another
-[example](https://github.com/ente-io/ente/blob/main/cli/config.yaml.example))
-
-## Find the hostname of your server
-
-If you want to access your museum within your own network, you can use the
-`hostname` command to find a addressable local network hostname or IP for your
-computer, and then use it by suffixing it with the port number.
-
-First, run
-
-```sh
-hostname
-```
-
-The result will look something like this
-
-```sh
-my-computer.local
-```
-
-You will need to replace the server endpoint with an address that uses your
-server's hostname and the port number. Here's an example:
-
-```
-http://my-computer.local:8080
-```
-
-Note that this will only work within your network. To access it from outside the
-network, you need to use the public IP or hostname.
-
-> [!TIP]
->
-> If you're having trouble uploading from your mobile app, it is likely that
-> museum is not able to connect to your S3 storage. See the [Configuring
-> S3](/self-hosting/guides/configuring-s3) guide for more details.

docs/docs/self-hosting/guides/db-migration.md

@@ -1,158 +0,0 @@
----
-title: DB Migration
-description:
-    Migrating your self hosted Postgres 12 database to newer Postgres versions
----
-
-# Migrating Postgres 12 to 15
-
-The old sample docker compose file used Postgres 12, which is now nearing end of
-life, so we've updated it to Postgres 15. Postgres major versions changes
-require a migration step. This document mentions some approaches you can use.
-
-> [!TIP]
->
-> Ente itself does not use any specific Postgres 12 or Postgres 15 features, and
-> will talk to either happily. It should also work with newer Postgres versions,
-> but let us know if you run into any problems and we'll update this page.
-
-### Taking a backup
-
-`docker compose exec` allows us to run a command against a running container. We
-can use it to run the `pg_dumpall` command on the postgres container to create a
-plaintext backup.
-
-Assuming your cluster is already running, and you are in the `ente/server`
-directory, you can run the following (this command uses the default credentials,
-you'll need to change these to match your setup):
-
-```sh
-docker compose exec postgres env PGPASSWORD=pgpass PGUSER=pguser PG_DB=ente_db pg_dumpall >pg12.backup.sql
-```
-
-This will produce a `pg12.backup.sql` in your current directory. You can open it
-in a text editor (it can be huge!) to verify that it looks correct.
-
-We won't be needing this file, this backup is recommended just in case something
-goes amiss with the actual migration.
-
-> If you need to restore from this plaintext backup, you could subsequently run
-> something like:
->
-> ```sh
-> docker compose up postgres
-> cat pg12.backup.sql | docker compose exec -T postgres env PGPASSWORD=pgpass psql -U pguser -d ente_db
-> ```
-
-## The migration
-
-At the high level, the steps are
-
-1. Stop your cluster.
-
-2. Start just the postgres container after changing the image to
-   `pgautoupgrade/pgautoupgrade:15-bookworm`.
-
-3. Once the in-place migration completes, stop the container, and change the
-   image to `postgres:15`.
-
-#### 1. Stop the cluster
-
-Stop your running Ente cluster.
-
-```sh
-docker compose down
-```
-
-#### 2. Run `pgautoupgrade`
-
-Modify your `compose.yaml`, changing the image for the "postgres" container from
-"postgres:12" to "pgautoupgrade/pgautoupgrade:15-bookworm"
-
-```diff
-diff a/server/compose.yaml b/server/compose.yaml
-
-   postgres:
--    image: postgres:12
-+    image: pgautoupgrade/pgautoupgrade:15-bookworm
-     ports:
-```
-
-[pgautoupgrade](https://github.com/pgautoupgrade/docker-pgautoupgrade) is a
-community docker image that performs an in-place migration.
-
-After making the change, run only the `postgres` container in the cluster
-
-```sh
-docker compose up postgres
-```
-
-The container will start and peform an in-place migration. Once it is done, it
-will start postgres normally. You should see something like this is the logs
-
-```
-postgres-1  | Automatic upgrade process finished with no errors reported
-...
-postgres-1  | ...  starting PostgreSQL 15...
-```
-
-At this point, you can stop the container (`CTRL-C`).
-
-#### 3. Finish by changing image
-
-Modify `compose.yaml` again, changing the image to "postgres:15".
-
-```diff
-diff a/server/compose.yaml b/server/compose.yaml
-
-   postgres:
--    image: pgautoupgrade/pgautoupgrade:15-bookworm
-+    image: postgres:15
-     ports:
-```
-
-And cleanup the temporary containers by
-
-```sh
-docker compose down --remove-orphans
-```
-
-Migration is now complete. You can start your Ente cluster normally.
-
-```sh
-docker compose up
-```
-
-## Migration elsewhere
-
-The above instructions are for Postgres running inside docker, as the sample
-docker compose file does. There are myriad other ways to run Postgres, and the
-migration sequence then will depend on your exact setup.
-
-Two common approaches are
-
-1. Backup and restore, the `pg_dumpall` + `psql` import sequence described in
-   [Taking a backup](#taking-a-backup) above.
-
-2. In place migrations using `pg_upgrade`, which is what the
-   [pgautoupgrade](#the-migration) migration above does under the hood.
-
-The first method, backup and restore, is low tech and will work similarly in
-most setups. The second method is more efficient, but requires a bit more
-careful preparation.
-
-As another example, here is how one can migrate 12 to 15 when running Postgres
-on macOS, installed using Homebrew.
-
-1. Stop your postgres. Make sure there are no more commands shown by
-   `ps aux | grep '[p]ostgres'`.
-
-2. Install postgres15.
-
-3. Migrate data using `pg_upgrade`:
-
-    ```sh
-    /opt/homebrew/Cellar/postgresql@15/15.8/bin/pg_upgrade -b /opt/homebrew/Cellar/postgresql@12/12.18_1/bin -B /opt/homebrew/Cellar/postgresql@15/15.8/bin/ -d /opt/homebrew/var/postgresql@12 -D /opt/homebrew/var/postgresql@15
-    ```
-
-4. Start postgres 15 and verify version using `SELECT VERSION()`.

docs/docs/self-hosting/guides/external-s3.md

@@ -1,261 +0,0 @@
----
-title: External S3 buckets
-description:
-    Self hosting Ente's server and photos web app when using an external S3
-    bucket
----
-
-# Hosting server and web app using external S3
-
-> [!NOTE]
->
-> This is a community contributed guide, and some of these steps ~~might be~~
-> ARE out of sync with the upstream changes. This document is retained for
-> reference purposes, but if something is not working correctly, please see the
-> latest [READMEs](https://github.com/ente-io/ente/blob/main/server/README.md)
-> in the repository and/or other guides in [self-hosting](/self-hosting/).
-
-This guide is for self hosting the server and the web application of Ente Photos
-using docker compose and an external S3 bucket. So we assume that you already
-have the keys and secrets for the S3 bucket. The plan is as follows:
-
-1. Create a `compose.yaml` file
-2. Set up the `.credentials.env` file
-3. Run `docker-compose up`
-4. Create an account and increase storage quota
-5. Fix potential CORS issue with your bucket
-
-## 1. Create a `compose.yaml` file
-
-After cloning the main repository with
-
-```bash
-git clone https://github.com/ente-io/ente.git
-# Or git clone git@github.com:ente-io/ente.git
-cd ente
-```
-
-Create a `compose.yaml` file at the root of the project with the following
-content (there is nothing to change here):
-
-```yaml
-services:
-    museum:
-        build:
-            context: server
-            args:
-                GIT_COMMIT: local
-        ports:
-            - 8080:8080 # API
-            - 2112:2112 # Prometheus metrics
-        depends_on:
-            postgres:
-                condition: service_healthy
-
-        # Wait for museum to ping pong before starting the webapp.
-        healthcheck:
-            test: [
-                    "CMD",
-                    "echo",
-                    "1", # I don't know what to put here
-                ]
-        environment:
-            # no need to touch these
-            ENTE_DB_HOST: postgres
-            ENTE_DB_PORT: 5432
-            ENTE_DB_NAME: ente_db
-            ENTE_DB_USER: pguser
-            ENTE_DB_PASSWORD: pgpass
-        env_file:
-            - ./.credentials.env
-        volumes:
-            - custom-logs:/var/logs
-            - museum.yaml:/museum.yaml:ro
-        networks:
-            - internal
-
-    web:
-        build:
-            context: web
-        ports:
-            - 8081:80
-            - 8082:80
-        depends_on:
-            museum:
-                condition: service_healthy
-        env_file:
-            - ./.credentials.env
-
-    postgres:
-        image: postgres:12
-        ports:
-            - 5432:5432
-        environment:
-            POSTGRES_USER: pguser
-            POSTGRES_PASSWORD: pgpass
-            POSTGRES_DB: ente_db
-        # Wait for postgres to be accept connections before starting museum.
-        healthcheck:
-            test: ["CMD", "pg_isready", "-q", "-d", "ente_db", "-U", "pguser"]
-            interval: 1s
-            timeout: 5s
-            retries: 20
-        volumes:
-            - postgres-data:/var/lib/postgresql/data
-        networks:
-            - internal
-volumes:
-    custom-logs:
-    postgres-data:
-networks:
-    internal:
-```
-
-It maybe be added in the future, but if it does not exist, create a `Dockerfile`
-in the `web` directory with the following content:
-
-```Dockerfile
-# syntax=docker/dockerfile:1
-FROM node:21-bookworm-slim as ente-builder
-WORKDIR /app
-RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt/lists/*
-COPY . .
-RUN yarn install
-ENV NEXT_PUBLIC_ENTE_ENDPOINT=DOCKER_RUNTIME_REPLACE_ENDPOINT
-ENV NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=DOCKER_RUNTIME_REPLACE_ALBUMS_ENDPOINT
-RUN yarn build
-
-
-FROM nginx:1.25-alpine-slim
-COPY --from=ente-builder /app/apps/photos/out /usr/share/nginx/html
-COPY <<EOF /etc/nginx/conf.d/default.conf
-server {
-  listen 80 default_server;
-  root /usr/share/nginx/html;
-  location / {
-      try_files \$uri \$uri.html \$uri/ =404;
-  }
-  error_page 404 /404.html;
-  location = /404.html {
-      internal;
-  }
-}
-EOF
-ARG ENDPOINT="http://localhost:8080"
-ENV ENDPOINT "$ENDPOINT"
-ARG ALBUMS_ENDPOINT="http://localhost:8082"
-ENV ALBUMS_ENDPOINT "$ALBUMS_ENDPOINT"
-COPY <<EOF /docker-entrypoint.d/replace_ente_endpoints.sh
-echo "Replacing endpoints"
-echo "  Endpoint: \$ENDPOINT"
-echo "  Albums Endpoint: \$ALBUMS_ENDPOINT"
-
-replace_enpoints() {
-  sed -i -e 's,DOCKER_RUNTIME_REPLACE_ENDPOINT,'"\$ENDPOINT"',g' \$1
-  sed -i -e 's,DOCKER_RUNTIME_REPLACE_ALBUMS_ENDPOINT,'"\$ALBUMS_ENDPOINT"',g' \$1
-}
-for jsfile in `find '/usr/share/nginx/html' -type f -name '*.js'`
-do
-    replace_enpoints "\$jsfile"
-done
-EOF
-
-RUN chmod +x /docker-entrypoint.d/replace_ente_endpoints.sh
-```
-
-This runs nginx inside to handle both the web & album URLs so we don't have to
-make two web images with different port.
-
-- `DOCKER_RUNTIME_REPLACE_ENDPOINT` this is your public museum API URL.
-- `DOCKER_RUNTIME_REPLACE_ALBUMS_ENDPOINT` this is the shared albums URL (for
-  more details about configuring shared albums, see
-  [faq/sharing](/self-hosting/faq/sharing)).
-
-Note how above we had updated the `compose.yaml` file for the server with
-
-```yaml
-web:
-    build:
-        context: web
-    ports:
-        - 8081:80
-        - 8082:80
-```
-
-so that web and album both point to the same container and nginx will handle it.
-
-## 2. Set up the `.credentials.env` file
-
-Create a `.credentials.env` file at the root of the project with the following
-content (here you need to set the correct value of each variable):
-
-<!-- The following code block should have language env, but vitepress currently
-doesn't support that language, so use sh as a reasonable fallback instead. -->
-
-```sh
-# run  `go run tools/gen-random-keys/main.go` in the server directory to generate the keys
-ENTE_KEY_ENCRYPTION=
-ENTE_KEY_HASH=
-ENTE_JWT_SECRET=
-
-# if you deploy it on a server under a domain, you need to set the correct value of the following variables
-# it can be changed later
-
-# The backend server URL (Museum) to be used by the webapp
-ENDPOINT=http://localhost:8080
-# The URL of the public albums webapp (also need to be updated in museum.yml so the correct links are generated)
-ALBUMS_ENDPOINT=http://localhost:8082
-```
-
-Create the `museum.yaml` with additional configuration, this will be mounted
-(read-only) into the container:
-
-```yaml
-s3:
-    are_local_buckets: false
-    # For some self-hosted S3 deployments you (e.g. Minio) you might need to disable bucket subdomains
-    use_path_style_urls: true
-    # The key must be named like so
-    b2-eu-cen:
-        key: $YOUR_S3_KEY
-        secret: $YOUR_S3_SECRET
-        endpoint: $YOUR_S3_ENDPOINT
-        region: $YOUR_S3_REGION
-        bucket: $YOUR_S3_BUCKET_NAME
-# The same value as the one specified in ALBUMS_ENDPOINT
-apps:
-    public-albums: http://localhost:8082
-```
-
-## 3. Run `docker-compose up`
-
-Run `docker-compose up` at the root of the project (add `-d` to run it in the
-background).
-
-## 4. Create an account and increase storage quota
-
-Open `http://localhost:8080` or whatever Endpoint you mentioned for the web app
-and create an account. If your SMTP related configurations are all set and
-right, you will receive an email with your OTT in it. There are two work arounds
-to retrieve the OTP, checkout
-[this document](https://help.ente.io/self-hosting/faq/otp) for getting your
-OTT's..
-
-If you successfully log in, select any plan and increase the storage quota with
-the following command:
-
-```bash
-docker compose exec -i postgres psql -U pguser -d ente_db -c "INSERT INTO storage_bonus (bonus_id, user_id, storage, type, valid_till) VALUES ('self-hosted-myself', (SELECT user_id FROM users), 1099511627776, 'ADD_ON_SUPPORT', 0)"
-```
-
-After few reloads, you should see 1 To of quota.
-
-## Related
-
-Some other users have also shared their setups.
-
-- [Using Traefik](https://github.com/ente-io/ente/pull/3663)
-
-- [Building custom images from source (Linux)](https://github.com/ente-io/ente/discussions/3778)
-
-- [Troubleshooting Bucket CORS](/self-hosting/troubleshooting/bucket-cors)

docs/docs/self-hosting/guides/from-source.md

@@ -1,228 +0,0 @@
----
-title: Ente from Source
-description: Getting started self hosting Ente Photos and/or Ente Auth
----
-
-
-# Ente from Source
-
-> [!WARNING] NOTE
-> The below documentation will cover instructions about self-hosting the web app manually. If you
-> want to deploy Ente hassle free, use the [one line](https://ente.io/blog/self-hosting-quickstart/) 
-> command to setup Ente. This guide might be deprecated in the near future.
-
-## Installing Docker
-
-Refer to
-[How to install Docker from the APT repository](https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository)
-for detailed instructions.
-
-## Start the server
-
-```sh
-git clone https://github.com/ente-io/ente
-cd ente/server
-docker compose up --build
-```
-
-> [!TIP]
->
-> You can also use a pre-built Docker image from `ghcr.io/ente-io/server`
-> ([More info](https://github.com/ente-io/ente/blob/main/server/docs/docker.md))
-
-Install the necessary dependencies for running the web client
-
-```sh
-# installing npm and yarn
-
-sudo apt update
-sudo apt install nodejs npm
-sudo npm install -g yarn // to install yarn globally
-```
-
-Then in a separate terminal, you can run (e.g) the web client
-
-```sh
-cd ente/web
-git submodule update --init --recursive
-yarn install
-NEXT_PUBLIC_ENTE_ENDPOINT=http://localhost:8080 yarn dev
-```
-
-That's about it. If you open http://localhost:3000, you will be able to create
-an account on a Ente Photos web app running on your machine, and this web app
-will be connecting to the server running on your local machine at
-`localhost:8080`.
-
-For the mobile apps, you don't even need to build, and can install normal Ente
-apps and configure them to use your
-[custom self-hosted server](/self-hosting/guides/custom-server/).
-
-> If you want to build the mobile apps from source, see the instructions
-> [here](/self-hosting/guides/mobile-build).
-
-## Web app with Docker and Compose
-
-The instructoins in previous section were just a temporary way to run the web app locally. 
-To run the web apps as services, the user has to build a docker image manually. 
-
-> [!IMPORTANT]
->
-> Recurring changes might be made by the team or from community if more
-> improvements can be made so that we are able to build a full-fledged docker
-> image.
-
-```dockerfile
-FROM node:20-bookworm-slim as builder
-
-WORKDIR ./ente
-
-COPY . .
-COPY apps/ .
-
-# Will help default to yarn versoin 1.22.22
-RUN corepack enable
-
-# Endpoint for Ente Server
-ENV NEXT_PUBLIC_ENTE_ENDPOINT=https://your-ente-endpoint.com
-ENV NEXT_PUBLIC_ENTE_ALBUMS_ENDPOINT=https://your-albums-endpoint.com
-
-RUN yarn cache clean
-RUN yarn install --network-timeout 1000000000
-RUN yarn build:photos && yarn build:accounts && yarn build:auth && yarn build:cast
-
-FROM node:20-bookworm-slim
-
-WORKDIR /app
-
-COPY --from=builder /ente/apps/photos/out /app/photos
-COPY --from=builder /ente/apps/accounts/out /app/accounts
-COPY --from=builder /ente/apps/auth/out /app/auth
-COPY --from=builder /ente/apps/cast/out /app/cast
-
-RUN npm install -g serve
-
-ENV PHOTOS=3000
-EXPOSE ${PHOTOS}
-
-ENV ACCOUNTS=3001
-EXPOSE ${ACCOUNTS}
-
-ENV AUTH=3002
-EXPOSE ${AUTH}
-
-ENV CAST=3003
-EXPOSE ${CAST}
-
-# The albums app does not have navigable pages on it, but the
-# port will be exposed in-order to self up the albums endpoint
-# `apps.public-albums` in museum.yaml configuration file.
-ENV ALBUMS=3004
-EXPOSE ${ALBUMS}
-
-CMD ["sh", "-c", "serve /app/photos -l tcp://0.0.0.0:${PHOTOS} & serve /app/accounts -l tcp://0.0.0.0:${ACCOUNTS} & serve /app/auth -l tcp://0.0.0.0:${AUTH} & serve /app/cast -l tcp://0.0.0.0:${CAST}"]
-```
-
-The above is a multi-stage Dockerfile which creates a production ready static
-output of the 4 apps (Photos, Accounts, Auth and Cast) and serves the static
-content with Caddy.
-
-Looking at 2 different node base-images doing different tasks in the same
-Dockerfile would not make sense, but the Dockerfile is divided into two just to
-improve the build efficiency as building this Dockerfile will arguably take more
-time.
-
-Lets build a Docker image from the above Dockerfile. Copy and paste the above
-Dockerfile contents in the root of your web directory which is inside
-`ente/web`. Execute the below command to create an image from this Dockerfile.
-
-```sh
-# Build the image
-docker build -t <image-name>:<tag> --no-cache --progress plain .
-```
-
-You can always edit the Dockerfile and remove the steps for apps which you do
-not intend to install on your system (like auth or cast) and opt out of those.
-
-Regarding Albums App, take a note that they are not apps with navigable pages, 
-if accessed on the web-browser they will simply redirect to ente.web.io.
-
-## compose.yaml
-
-Moving ahead, we need to paste the below contents into the compose.yaml inside
-`ente/server/compose.yaml` under the services section.
-
-```yaml
-ente-web:
-    image: <image-name> # name of the image you used while building
-    ports:
-        - 3000:3000
-        - 3001:3001
-        - 3002:3002
-        - 3003:3003
-        - 3004:3004
-    environment:
-        - NODE_ENV=development
-    restart: always
-```
-
-Now, we're good to go. All we are left to do now is start the containers.
-
-```sh
-docker compose up -d # --build
-
-# Accessing the logs
-docker compose logs <container-name>
-```
-
-## Configure App Endpoints 
-
-> [!NOTE] 
-> Previously, this was dependent on the env variables `NEXT_ENTE_PUBLIC_ACCOUNTS_ENDPOINT`
-> and etc. Please check the below documentation to update your setup configurations
-
-You can configure the web endpoints for the other apps including Accounts, Albums
-Family and Cast in your `museum.yaml` configuration file. Checkout 
-[`local.yaml`](https://github.com/ente-io/ente/blob/543411254b2bb55bd00a0e515dcafa12d12d3b35/server/configurations/local.yaml#L76-L89)
-to configure the endpoints. Make sure to setup up your DNS Records accordingly to the 
-similar URL's you set up in `museum.yaml`.
-
-Next part is to configure the web server.
-
-# Web server configuration
-
-The last step ahead is configuring reverse_proxy for the ports on which the apps
-are being served (you will have to make changes, if you have cusotmized the
-ports). The web server of choice in this guide is
-[Caddy](https://caddyserver.com) because with caddy you don't have to manually
-configure/setup SSL ceritifcates as caddy will take care of that.
-
-```sh
-photos.yourdomain.com {
-	reverse_proxy http://localhost:3001
-    # for logging
-    log {
-        level error
-    }
-}
-
-auth.yourdomain.com {
-    reverse_proxy http://localhost:3002
-}
-# and so on ...
-```
-
-Next, start the caddy server :).
-
-```sh
-# If caddy service is not enabled
-sudo systemctl enable caddy
-
-sudo systemctl daemon-reload
-sudo systemctl start caddy
-```
-
-## Contributing
-
-Please start a discussion on the Github Repo if you have any suggestions for the
-Dockerfile, You can also share your setups on Github Discussions.

docs/docs/self-hosting/guides/index.md

@@ -1,5 +1,5 @@
 ---
-title: Self Hosting
+title: Guides - Self-hosting
 description: Guides for self hosting Ente Photos and/or Ente Auth
 ---
 
@@ -10,14 +10,12 @@ walkthroughs, tutorials and other FAQ pages in this directory.
 
 See the sidebar for existing guides. In particular:
 
-- If you're just looking to get started, see
-  [configure custom server](custom-server/).
+- If you're just looking to get started, see installation.
 
-- For various admin related tasks, e.g. increasing the storage quota on your
-  self hosted instance, see [administering your custom server](admin).
+- For various administrative tasks, e.g. increasing the storage quota for user
+  on your self-hosted instance, see
+  [user management](/self-hosting/administration/users).
 
 - For configuring your S3 buckets to get the object storage to work from your
   mobile device or for fixing an upload errors, see
-  [configuring S3](configuring-s3). There is also a longer
-  [community contributed guide](external-s3) for a more self hosted setup of
-  both the server and web app using external S3 buckets for object storage.
+  [object storage](/self-hosting/administration/object-storage).

docs/docs/self-hosting/guides/selfhost-cli.md

@@ -1,39 +0,0 @@
----
-title: CLI for Self Hosted Instance
-description: Guide to configuring Ente CLI for Self Hosted Instance
----
-
-## Self Hosting
-
-If you are self-hosting the server, you can still configure CLI to export data &
-perform basic admin actions.
-
-To do this, first configure the CLI to point to your server. Define a
-config.yaml and put it either in the same directory as CLI binary or path
-defined in env variable `ENTE_CLI_CONFIG_DIR`
-
-```yaml
-endpoint:
-    api: "http://localhost:8080"
-```
-
-You should be able to
-[add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md),
-and subsequently increase the
-[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
-using the CLI.
-
-For the admin actions, you first need to whitelist admin users. You can create
-`server/museum.yaml`, and whitelist add the admin userID `internal.admins`. See
-[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml#L211C1-L232C1)
-in the server source code for details about how to define this.
-
-You can use
-[account list](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_list.md)
-command to find the user id of any account.
-
-```yaml
-internal:
-    admins:
-        # - 1580559962386440
-```

docs/docs/self-hosting/guides/standalone-ente.md

@@ -1,116 +0,0 @@
----
-title: Installing Ente Standalone (without Docker)
-description: Installing and setting up Ente standalone without docker.
----
-
-# Installing and Deploying Ente Standalone (without Docker)
-
-## Running Museum (Ente's server) without Docker
-
-First, start by installing all the dependencies to get your machine ready for
-development.
-
-```sh
-# For MacOS
-brew tap homebrew/core
-brew update
-brew install go
-
-# For Ubuntu based distros
-sudo apt update && sudo apt upgrade
-sudo apt install golang-go
-```
-
-Alternatively, you can also download the latest binaries from
-['All Release'](https://go.dev/dl/) page from the official website.
-
-```sh
-brew install postgres@15
-# Link the postgres keg
-brew link postgresql@15
-
-brew install libsodium
-
-# For Ubuntu based distros
-sudo apt install postgresql
-sudo apt install libsodium23 libsodium-dev
-```
-
-The package `libsodium23` might be installed already in some cases.
-
-Installing pkg-config
-
-```sh
-brew install pkg-config
-
-# For Ubuntu based distros
-sudo apt install pkg-config
-```
-
-## Starting Postgres
-
-### With pg_ctl
-
-```sh
-pg_ctl -D /usr/local/var/postgres -l logfile start
-```
-
-Dependeing on the Operating System type the path for postgres binary or
-configuration file might be different, please check if the command keeps failing
-for you.
-
-Ideally, if you are on a Linux system with systemd as the init. You can also
-start postgres as a systemd service. After Installation execute the following
-commands:
-
-```sh
-sudo systemctl enable postgresql
-sudo systemctl daemon-reload && sudo systemctl start postgresql
-```
-
-### Create user
-
-```sh
-createuser -s postgres
-```
-
-## Start Museum
-
-Start by cloning ente to your system.
-
-```sh
-git clone https://github.com/ente-io/ente
-```
-
-```sh
-export ENTE_DB_USER=postgres
-cd ente/server
-go run cmd/museum/main.go
-```
-
-You can also add the export line to your shell's RC file, to avoid exporting the
-environment variable every time.
-
-For live reloads, install [air](https://github.com/air-verse/air#installation).
-Then you can just call air after declaring the required environment variables.
-For example,
-
-```sh
-ENTE_DB_USER=postgres
-air
-```
-
-## Museum as a background service
-
-Please check the below links if you want to run Museum as a service, both of
-them are battle tested.
-
-1. [How to run museum as a systemd service](https://gist.github.com/mngshm/a0edb097c91d1dc45aeed755af310323)
-2. [Museum.service](https://github.com/ente-io/ente/blob/23e678889189157ecc389c258267685934b83631/server/scripts/deploy/museum.service#L4)
-
-Once you are done with setting and running Museum, all you are left to do is run
-the web app and reverse_proxy it with a webserver. You can check the following
-resources for Deploying your web app.
-
-1. [Hosting the Web App](https://help.ente.io/self-hosting/guides/web-app).
-2. [Running Ente Web app as a systemd Service](https://gist.github.com/mngshm/72e32bd483c2129621ed0d74412492fd)