From 7ff99c23b54cfc017e536d6e2199067efd4a3cb3 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 22 Apr 2026 16:05:34 +0200
Subject: [PATCH] refactor: patches (#2797)

---
 dev/patch.sh                                  | 60 +++++++++++++---
 dev/update_patches.sh                         | 70 ++++++++++++++-----
 ...ry-name.patch => 00-binary-fix-name.patch} |  0
 ...d.patch => 00-brand-remove-branding.patch} |  0
 ...d.patch => 00-build-disable-esbuild.patch} |  0
 ...le.patch => 00-build-disable-mangle.patch} |  0
 ...0-build-download-extensions-from-gh.patch} |  0
 ...atch => 00-build-fix-npm-preinstall.patch} |  0
 ...h.no => 00-build-update-electron.patch.no} |  0
 ...ch => 00-build-update-sourcemap-url.patch} |  0
 ...able-cloud.patch => 00-cloud-remove.patch} |  0
 ...h => 00-community-add-announcements.patch} |  0
 ...00-copilot-disable-terminal-suggest.patch} |  0
 ... => 00-copilot-fix-action-condition.patch} |  0
 ...0-ext-github-authentication-use-pat.patch} |  0
 ...h => 00-ext-github-remove-vscodedev.patch} |  0
 ...sion-disable-signature-verification.patch} |  0
 ... 00-remote-add-missing-dependencies.patch} |  0
 ...mote-url.patch => 00-remote-add-url.patch} |  0
 ...ch => 00-remote-remove-missing-vsda.patch} |  0
 ...h => 00-security-add-command-filter.patch} |  0
 ...allery.patch => 00-settings-gallery.patch} |  0
 ...t.patch => 00-settings-user-product.patch} |  0
 ...metry.patch => 00-telemetry-disable.patch} |  0
 ...=> 00-tunnel-disable-recommendation.patch} |  0
 ...tal-font.patch => 00-ui-custom-font.patch} |  0
 ...r.patch => 00-ui-improve-eol-banner.patch} |  0
 ...t-issue.patch => 00-ui-report-issue.patch} |  0
 ....patch.yet => 00-update-disable.patch.yet} |  0
 ...atch => 00-update-rename-cache-path.patch} |  0
 ...sce.patch => 00-vsce-use-custom-lib.patch} |  0
 ...ase.patch => 10-version-add-release.patch} |  0
 ...tch => 11-update-use-github-release.patch} |  0
 ...p.patch => 20-keymap-use-custom-lib.patch} |  0
 ...s.patch => 21-policy-use-custom-lib.patch} |  0
 ...> 30-build-add-missing-dependencies.patch} |  0
 ...cli.patch => 40-cli-use-reh-archive.patch} |  0
 ...atch => 50-build-improve-gulp-tasks.patch} |  0
 ...t.patch => 51-ext-copilot-remove-it.patch} |  0
 ...curity-add-option-for-malicious-ext.patch} |  0
 ...ch => 61-extension-close-connection.patch} |  0
 ...ode-docker.patch => 00-build-docker.patch} |  0
 ...m.patch => 00-asset-fix-rpm-version.patch} |  0
 ...tall.patch => 00-build-improve-qemu.patch} |  0
 .../{cli.patch => 00-cli-fix-unused.patch}    |  0
 ...th.patch => 00-env-improve-xdg-path.patch} |  0
 ...home.patch => 00-log-use-state-home.patch} |  0
 ....patch => 00-policy-use-custom-path.patch} |  0
 ...ap.patch => 00-remote-fix-bootstrap.patch} |  0
 ....patch => 31-build-fix-dependencies.patch} |  0
 ...upport.patch => 41-arch-add-support.patch} |  0
 ...pc64le.patch => 42-arch-add-ppc64le.patch} |  0
 ...iscv64.patch => 43-arch-add-riscv64.patch} |  0
 ...oong64.patch => 44-arch-add-loong64.patch} |  0
 ...-4-s390x.patch => 45-arch-add-s390x.patch} |  0
 ...te.patch => 00-build-disable-remote.patch} |  0
 ... => 00-system-support-16k-page-size.patch} |  0
 ...tch => 00-build-override-dependency.patch} |  0
 ...patch => 00-ui-update-emulated-urls.patch} |  0
 patches/osx/fix-codesign.patch.no             | 30 --------
 ...appx.patch => 00-build-disable-appx.patch} |  0
 ....patch => 00-build-min-version-win7.patch} |  0
 ...{cli.patch => 41-cli-fix-update-url.patch} |  0
 prepare_vscode.sh                             |  2 +-
 64 files changed, 107 insertions(+), 55 deletions(-)
 rename patches/{binary-name.patch => 00-binary-fix-name.patch} (100%)
 rename patches/{brand.patch => 00-brand-remove-branding.patch} (100%)
 rename patches/{fix-disable-esbuild.patch => 00-build-disable-esbuild.patch} (100%)
 rename patches/{remove-mangle.patch => 00-build-disable-mangle.patch} (100%)
 rename patches/{ext-from-gh.patch => 00-build-download-extensions-from-gh.patch} (100%)
 rename patches/{fix-npm-preinstall.patch => 00-build-fix-npm-preinstall.patch} (100%)
 rename patches/{update-electron.patch.no => 00-build-update-electron.patch.no} (100%)
 rename patches/{sourcemaps.patch => 00-build-update-sourcemap-url.patch} (100%)
 rename patches/{disable-cloud.patch => 00-cloud-remove.patch} (100%)
 rename patches/{feat-announcements.patch => 00-community-add-announcements.patch} (100%)
 rename patches/{terminal-suggest.patch => 00-copilot-disable-terminal-suggest.patch} (100%)
 rename patches/{disable-copilot.patch => 00-copilot-fix-action-condition.patch} (100%)
 rename patches/{use-github-pat.patch => 00-ext-github-authentication-use-pat.patch} (100%)
 rename patches/{disable-vscodedev.patch => 00-ext-github-remove-vscodedev.patch} (100%)
 rename patches/{disable-signature-verification.patch => 00-extension-disable-signature-verification.patch} (100%)
 rename patches/{fix-remote-libs.patch => 00-remote-add-missing-dependencies.patch} (100%)
 rename patches/{add-remote-url.patch => 00-remote-add-url.patch} (100%)
 rename patches/{disable-missing-vsda.patch => 00-remote-remove-missing-vsda.patch} (100%)
 rename patches/{feat-command-filter.patch => 00-security-add-command-filter.patch} (100%)
 rename patches/{fix-gallery.patch => 00-settings-gallery.patch} (100%)
 rename patches/{feat-user-product.patch => 00-settings-user-product.patch} (100%)
 rename patches/{telemetry.patch => 00-telemetry-disable.patch} (100%)
 rename patches/{fix-tunnel-extension-recommendation.patch => 00-tunnel-disable-recommendation.patch} (100%)
 rename patches/{feat-experimental-font.patch => 00-ui-custom-font.patch} (100%)
 rename patches/{fix-eol-banner.patch => 00-ui-improve-eol-banner.patch} (100%)
 rename patches/{report-issue.patch => 00-ui-report-issue.patch} (100%)
 rename patches/{disable-update.patch.yet => 00-update-disable.patch.yet} (100%)
 rename patches/{update-cache-path.patch => 00-update-rename-cache-path.patch} (100%)
 rename patches/{fix-build-vsce.patch => 00-vsce-use-custom-lib.patch} (100%)
 rename patches/{version-0-release.patch => 10-version-add-release.patch} (100%)
 rename patches/{version-1-update.patch => 11-update-use-github-release.patch} (100%)
 rename patches/{fix-keymap.patch => 20-keymap-use-custom-lib.patch} (100%)
 rename patches/{fix-policies.patch => 21-policy-use-custom-lib.patch} (100%)
 rename patches/{optional-tree-sitter.patch => 30-build-add-missing-dependencies.patch} (100%)
 rename patches/{cli.patch => 40-cli-use-reh-archive.patch} (100%)
 rename patches/{feat-gulp-build-tasks.patch => 50-build-improve-gulp-tasks.patch} (100%)
 rename patches/{feat-remove-copilot.patch => 51-ext-copilot-remove-it.patch} (100%)
 rename patches/{feat-ext-unsafe.patch => 60-security-add-option-for-malicious-ext.patch} (100%)
 rename patches/{fix-extensions-control-connection.patch => 61-extension-close-connection.patch} (100%)
 rename patches/alpine/reh/{fix-node-docker.patch => 00-build-docker.patch} (100%)
 rename patches/linux/{rpm.patch => 00-asset-fix-rpm-version.patch} (100%)
 rename patches/linux/{fix-npm-postinstall.patch => 00-build-improve-qemu.patch} (100%)
 rename patches/linux/{cli.patch => 00-cli-fix-unused.patch} (100%)
 rename patches/linux/{update-xdg-path.patch => 00-env-improve-xdg-path.patch} (100%)
 rename patches/linux/{feat-logs-home.patch => 00-log-use-state-home.patch} (100%)
 rename patches/linux/{fix-global-policy.patch => 00-policy-use-custom-path.patch} (100%)
 rename patches/linux/{fix-reh-bootstrap.patch => 00-remote-fix-bootstrap.patch} (100%)
 rename patches/linux/{fix-build.patch => 31-build-fix-dependencies.patch} (100%)
 rename patches/linux/{arch-0-support.patch => 41-arch-add-support.patch} (100%)
 rename patches/linux/{arch-1-ppc64le.patch => 42-arch-add-ppc64le.patch} (100%)
 rename patches/linux/{arch-2-riscv64.patch => 43-arch-add-riscv64.patch} (100%)
 rename patches/linux/{arch-3-loong64.patch => 44-arch-add-loong64.patch} (100%)
 rename patches/linux/{arch-4-s390x.patch => 45-arch-add-s390x.patch} (100%)
 rename patches/linux/client/{disable-remote.patch => 00-build-disable-remote.patch} (100%)
 rename patches/linux/client/{avoid-crash-16k-page-size.patch => 00-system-support-16k-page-size.patch} (100%)
 rename patches/linux/reh/s390x/{package.json.patch => 00-build-override-dependency.patch} (100%)
 rename patches/osx/{fix-emulated-urls.patch => 00-ui-update-emulated-urls.patch} (100%)
 delete mode 100644 patches/osx/fix-codesign.patch.no
 rename patches/windows/{appx.patch => 00-build-disable-appx.patch} (100%)
 rename patches/windows/{win7.patch => 00-build-min-version-win7.patch} (100%)
 rename patches/windows/{cli.patch => 41-cli-fix-update-url.patch} (100%)

diff --git a/dev/patch.sh b/dev/patch.sh
index 63d5bf5..8ce692f 100755
--- a/dev/patch.sh
+++ b/dev/patch.sh
@@ -30,19 +30,63 @@ normalize_file "${1}"
 if [[ "${FILE}" != "../patches/helper/settings.patch" ]]; then
   git apply --reject "../patches/helper/settings.patch"
 
-  while [ $# -gt 1 ]; do
-    echo "Parameter: $1"
+  if [[ $# -gt 1 ]]; then
+    while [ $# -gt 1 ]; do
+      echo "Parameter: $1"
+      normalize_file "${1}"
+
+      git apply --reject "${FILE}"
+
+      shift
+    done
+
+    git add .
+    git commit --no-verify -q -m "VSCODIUM HELPER"
+
+    normalize_file "${1}"
+  else
     normalize_file "${1}"
 
-    git apply --reject "${FILE}"
+    BASENAME=$(basename "${FILE}")
+    DIRNAME=$(dirname "${FILE}")
 
-    shift
-  done
+    if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+      GROUP_ID="${BASH_REMATCH[1]}"
+      INDEX="${BASH_REMATCH[2]}"
+      ENDNAME="${BASH_REMATCH[3]}"
 
-  git add .
-  git commit --no-verify -q -m "VSCODIUM HELPER"
+      for ((I = 0; I < INDEX; I++)); do
+        NOT_FOUND=1
 
-  normalize_file "${1}"
+        for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+          if [[ -f "$CANDIDATE" ]]; then
+            echo "Candidate: ${CANDIDATE}"
+            normalize_file "${CANDIDATE}"
+
+            git apply --reject "${FILE}"
+
+            NOT_FOUND=0
+          fi
+        done
+
+        if (( $NOT_FOUND )); then
+          for CANDIDATE in "${DIRNAME}/../${GROUP_ID}${I}-"*.patch; do
+            if [[ -f "$CANDIDATE" ]]; then
+              echo "Candidate: ${CANDIDATE}"
+              normalize_file "${CANDIDATE}"
+
+              git apply --reject "${FILE}"
+            fi
+          done
+        fi
+      done
+
+      git add .
+      git commit --no-verify -q -m "VSCODIUM HELPER"
+
+      normalize_file "${1}"
+    fi
+  fi
 fi
 
 echo "FILE: ${FILE}"
diff --git a/dev/update_patches.sh b/dev/update_patches.sh
index 8fcbf8e..32f5e5b 100755
--- a/dev/update_patches.sh
+++ b/dev/update_patches.sh
@@ -119,6 +119,7 @@ check_file() {
       fi
 
       while [[ -n "$( find . -name '*.rej' -print )" ]]; do
+        echo "patch: ${1}"
         find . -name '*.rej' -print
         read -rp "Press any key when the conflict have been resolved..." -n1 -s
         echo
@@ -144,8 +145,26 @@ while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
 done
 
 for FILE in ../patches/*.patch; do
-  if [[ "${FILE}" == *"/fix-policies.patch" ]]; then
-    check_file "../patches/fix-keymap.patch" "../patches/fix-policies.patch"
+  ADDITIONAL_FILES=()
+  BASENAME=$(basename "${FILE}")
+  DIRNAME=$(dirname "${FILE}")
+
+  if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+    GROUP_ID="${BASH_REMATCH[1]}"
+    INDEX="${BASH_REMATCH[2]}"
+    ENDNAME="${BASH_REMATCH[3]}"
+
+    for ((I = 0; I < INDEX; I++)); do
+      for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+        if [[ -f "$CANDIDATE" ]]; then
+          ADDITIONAL_FILES+=("$CANDIDATE")
+        fi
+      done
+    done
+  fi
+
+  if [[ ${#ADDITIONAL_FILES[@]} -gt 0 ]]; then
+    check_file ${ADDITIONAL_FILES[@]} "${FILE}"
   else
     check_file "${FILE}"
   fi
@@ -159,25 +178,44 @@ fi
 
 for ARCH in alpine linux osx windows; do
   for FILE in "../patches/${ARCH}/"*.patch; do
-    if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "linux" && "${FILE}" == *"/fix-dependencies.patch" ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
-      echo "skip ${FILE}"
+    ADDITIONAL_FILES=()
+    BASENAME=$(basename "${FILE}")
+    DIRNAME=$(dirname "${FILE}")
+
+    if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+      GROUP_ID="${BASH_REMATCH[1]}"
+      INDEX="${BASH_REMATCH[2]}"
+      ENDNAME="${BASH_REMATCH[3]}"
+
+      for ((I = 0; I < INDEX; I++)); do
+        NOT_FOUND=1
+
+        for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+          if [[ -f "$CANDIDATE" ]]; then
+            ADDITIONAL_FILES+=("$CANDIDATE")
+            NOT_FOUND=0
+          fi
+        done
+
+        if (( $NOT_FOUND )); then
+          for CANDIDATE in "${DIRNAME}/../${GROUP_ID}${I}-"*.patch; do
+            if [[ -f "$CANDIDATE" ]]; then
+              ADDITIONAL_FILES+=("$CANDIDATE")
+            fi
+          done
+        fi
+      done
+
+      if [[ ${#ADDITIONAL_FILES[@]} -gt 0 ]]; then
+        check_file ${ADDITIONAL_FILES[@]} "${FILE}"
+      else
+        check_file "${FILE}"
+      fi
     else
       check_file "${FILE}"
     fi
   done
 
-  if [[ "${ARCH}" == "linux" ]]; then
-    check_file "../patches/optional-tree-sitter.patch" "../patches/linux/fix-dependencies.patch"
-
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
-  elif [[ "${ARCH}" == "windows" ]]; then
-    check_file "../patches/cli.patch" "../patches/windows/cli.patch"
-  fi
-
   for TARGET in client reh; do
     for FILE in "../patches/${ARCH}/${TARGET}/"*.patch; do
       check_file "${FILE}"
diff --git a/patches/binary-name.patch b/patches/00-binary-fix-name.patch
similarity index 100%
rename from patches/binary-name.patch
rename to patches/00-binary-fix-name.patch
diff --git a/patches/brand.patch b/patches/00-brand-remove-branding.patch
similarity index 100%
rename from patches/brand.patch
rename to patches/00-brand-remove-branding.patch
diff --git a/patches/fix-disable-esbuild.patch b/patches/00-build-disable-esbuild.patch
similarity index 100%
rename from patches/fix-disable-esbuild.patch
rename to patches/00-build-disable-esbuild.patch
diff --git a/patches/remove-mangle.patch b/patches/00-build-disable-mangle.patch
similarity index 100%
rename from patches/remove-mangle.patch
rename to patches/00-build-disable-mangle.patch
diff --git a/patches/ext-from-gh.patch b/patches/00-build-download-extensions-from-gh.patch
similarity index 100%
rename from patches/ext-from-gh.patch
rename to patches/00-build-download-extensions-from-gh.patch
diff --git a/patches/fix-npm-preinstall.patch b/patches/00-build-fix-npm-preinstall.patch
similarity index 100%
rename from patches/fix-npm-preinstall.patch
rename to patches/00-build-fix-npm-preinstall.patch
diff --git a/patches/update-electron.patch.no b/patches/00-build-update-electron.patch.no
similarity index 100%
rename from patches/update-electron.patch.no
rename to patches/00-build-update-electron.patch.no
diff --git a/patches/sourcemaps.patch b/patches/00-build-update-sourcemap-url.patch
similarity index 100%
rename from patches/sourcemaps.patch
rename to patches/00-build-update-sourcemap-url.patch
diff --git a/patches/disable-cloud.patch b/patches/00-cloud-remove.patch
similarity index 100%
rename from patches/disable-cloud.patch
rename to patches/00-cloud-remove.patch
diff --git a/patches/feat-announcements.patch b/patches/00-community-add-announcements.patch
similarity index 100%
rename from patches/feat-announcements.patch
rename to patches/00-community-add-announcements.patch
diff --git a/patches/terminal-suggest.patch b/patches/00-copilot-disable-terminal-suggest.patch
similarity index 100%
rename from patches/terminal-suggest.patch
rename to patches/00-copilot-disable-terminal-suggest.patch
diff --git a/patches/disable-copilot.patch b/patches/00-copilot-fix-action-condition.patch
similarity index 100%
rename from patches/disable-copilot.patch
rename to patches/00-copilot-fix-action-condition.patch
diff --git a/patches/use-github-pat.patch b/patches/00-ext-github-authentication-use-pat.patch
similarity index 100%
rename from patches/use-github-pat.patch
rename to patches/00-ext-github-authentication-use-pat.patch
diff --git a/patches/disable-vscodedev.patch b/patches/00-ext-github-remove-vscodedev.patch
similarity index 100%
rename from patches/disable-vscodedev.patch
rename to patches/00-ext-github-remove-vscodedev.patch
diff --git a/patches/disable-signature-verification.patch b/patches/00-extension-disable-signature-verification.patch
similarity index 100%
rename from patches/disable-signature-verification.patch
rename to patches/00-extension-disable-signature-verification.patch
diff --git a/patches/fix-remote-libs.patch b/patches/00-remote-add-missing-dependencies.patch
similarity index 100%
rename from patches/fix-remote-libs.patch
rename to patches/00-remote-add-missing-dependencies.patch
diff --git a/patches/add-remote-url.patch b/patches/00-remote-add-url.patch
similarity index 100%
rename from patches/add-remote-url.patch
rename to patches/00-remote-add-url.patch
diff --git a/patches/disable-missing-vsda.patch b/patches/00-remote-remove-missing-vsda.patch
similarity index 100%
rename from patches/disable-missing-vsda.patch
rename to patches/00-remote-remove-missing-vsda.patch
diff --git a/patches/feat-command-filter.patch b/patches/00-security-add-command-filter.patch
similarity index 100%
rename from patches/feat-command-filter.patch
rename to patches/00-security-add-command-filter.patch
diff --git a/patches/fix-gallery.patch b/patches/00-settings-gallery.patch
similarity index 100%
rename from patches/fix-gallery.patch
rename to patches/00-settings-gallery.patch
diff --git a/patches/feat-user-product.patch b/patches/00-settings-user-product.patch
similarity index 100%
rename from patches/feat-user-product.patch
rename to patches/00-settings-user-product.patch
diff --git a/patches/telemetry.patch b/patches/00-telemetry-disable.patch
similarity index 100%
rename from patches/telemetry.patch
rename to patches/00-telemetry-disable.patch
diff --git a/patches/fix-tunnel-extension-recommendation.patch b/patches/00-tunnel-disable-recommendation.patch
similarity index 100%
rename from patches/fix-tunnel-extension-recommendation.patch
rename to patches/00-tunnel-disable-recommendation.patch
diff --git a/patches/feat-experimental-font.patch b/patches/00-ui-custom-font.patch
similarity index 100%
rename from patches/feat-experimental-font.patch
rename to patches/00-ui-custom-font.patch
diff --git a/patches/fix-eol-banner.patch b/patches/00-ui-improve-eol-banner.patch
similarity index 100%
rename from patches/fix-eol-banner.patch
rename to patches/00-ui-improve-eol-banner.patch
diff --git a/patches/report-issue.patch b/patches/00-ui-report-issue.patch
similarity index 100%
rename from patches/report-issue.patch
rename to patches/00-ui-report-issue.patch
diff --git a/patches/disable-update.patch.yet b/patches/00-update-disable.patch.yet
similarity index 100%
rename from patches/disable-update.patch.yet
rename to patches/00-update-disable.patch.yet
diff --git a/patches/update-cache-path.patch b/patches/00-update-rename-cache-path.patch
similarity index 100%
rename from patches/update-cache-path.patch
rename to patches/00-update-rename-cache-path.patch
diff --git a/patches/fix-build-vsce.patch b/patches/00-vsce-use-custom-lib.patch
similarity index 100%
rename from patches/fix-build-vsce.patch
rename to patches/00-vsce-use-custom-lib.patch
diff --git a/patches/version-0-release.patch b/patches/10-version-add-release.patch
similarity index 100%
rename from patches/version-0-release.patch
rename to patches/10-version-add-release.patch
diff --git a/patches/version-1-update.patch b/patches/11-update-use-github-release.patch
similarity index 100%
rename from patches/version-1-update.patch
rename to patches/11-update-use-github-release.patch
diff --git a/patches/fix-keymap.patch b/patches/20-keymap-use-custom-lib.patch
similarity index 100%
rename from patches/fix-keymap.patch
rename to patches/20-keymap-use-custom-lib.patch
diff --git a/patches/fix-policies.patch b/patches/21-policy-use-custom-lib.patch
similarity index 100%
rename from patches/fix-policies.patch
rename to patches/21-policy-use-custom-lib.patch
diff --git a/patches/optional-tree-sitter.patch b/patches/30-build-add-missing-dependencies.patch
similarity index 100%
rename from patches/optional-tree-sitter.patch
rename to patches/30-build-add-missing-dependencies.patch
diff --git a/patches/cli.patch b/patches/40-cli-use-reh-archive.patch
similarity index 100%
rename from patches/cli.patch
rename to patches/40-cli-use-reh-archive.patch
diff --git a/patches/feat-gulp-build-tasks.patch b/patches/50-build-improve-gulp-tasks.patch
similarity index 100%
rename from patches/feat-gulp-build-tasks.patch
rename to patches/50-build-improve-gulp-tasks.patch
diff --git a/patches/feat-remove-copilot.patch b/patches/51-ext-copilot-remove-it.patch
similarity index 100%
rename from patches/feat-remove-copilot.patch
rename to patches/51-ext-copilot-remove-it.patch
diff --git a/patches/feat-ext-unsafe.patch b/patches/60-security-add-option-for-malicious-ext.patch
similarity index 100%
rename from patches/feat-ext-unsafe.patch
rename to patches/60-security-add-option-for-malicious-ext.patch
diff --git a/patches/fix-extensions-control-connection.patch b/patches/61-extension-close-connection.patch
similarity index 100%
rename from patches/fix-extensions-control-connection.patch
rename to patches/61-extension-close-connection.patch
diff --git a/patches/alpine/reh/fix-node-docker.patch b/patches/alpine/reh/00-build-docker.patch
similarity index 100%
rename from patches/alpine/reh/fix-node-docker.patch
rename to patches/alpine/reh/00-build-docker.patch
diff --git a/patches/linux/rpm.patch b/patches/linux/00-asset-fix-rpm-version.patch
similarity index 100%
rename from patches/linux/rpm.patch
rename to patches/linux/00-asset-fix-rpm-version.patch
diff --git a/patches/linux/fix-npm-postinstall.patch b/patches/linux/00-build-improve-qemu.patch
similarity index 100%
rename from patches/linux/fix-npm-postinstall.patch
rename to patches/linux/00-build-improve-qemu.patch
diff --git a/patches/linux/cli.patch b/patches/linux/00-cli-fix-unused.patch
similarity index 100%
rename from patches/linux/cli.patch
rename to patches/linux/00-cli-fix-unused.patch
diff --git a/patches/linux/update-xdg-path.patch b/patches/linux/00-env-improve-xdg-path.patch
similarity index 100%
rename from patches/linux/update-xdg-path.patch
rename to patches/linux/00-env-improve-xdg-path.patch
diff --git a/patches/linux/feat-logs-home.patch b/patches/linux/00-log-use-state-home.patch
similarity index 100%
rename from patches/linux/feat-logs-home.patch
rename to patches/linux/00-log-use-state-home.patch
diff --git a/patches/linux/fix-global-policy.patch b/patches/linux/00-policy-use-custom-path.patch
similarity index 100%
rename from patches/linux/fix-global-policy.patch
rename to patches/linux/00-policy-use-custom-path.patch
diff --git a/patches/linux/fix-reh-bootstrap.patch b/patches/linux/00-remote-fix-bootstrap.patch
similarity index 100%
rename from patches/linux/fix-reh-bootstrap.patch
rename to patches/linux/00-remote-fix-bootstrap.patch
diff --git a/patches/linux/fix-build.patch b/patches/linux/31-build-fix-dependencies.patch
similarity index 100%
rename from patches/linux/fix-build.patch
rename to patches/linux/31-build-fix-dependencies.patch
diff --git a/patches/linux/arch-0-support.patch b/patches/linux/41-arch-add-support.patch
similarity index 100%
rename from patches/linux/arch-0-support.patch
rename to patches/linux/41-arch-add-support.patch
diff --git a/patches/linux/arch-1-ppc64le.patch b/patches/linux/42-arch-add-ppc64le.patch
similarity index 100%
rename from patches/linux/arch-1-ppc64le.patch
rename to patches/linux/42-arch-add-ppc64le.patch
diff --git a/patches/linux/arch-2-riscv64.patch b/patches/linux/43-arch-add-riscv64.patch
similarity index 100%
rename from patches/linux/arch-2-riscv64.patch
rename to patches/linux/43-arch-add-riscv64.patch
diff --git a/patches/linux/arch-3-loong64.patch b/patches/linux/44-arch-add-loong64.patch
similarity index 100%
rename from patches/linux/arch-3-loong64.patch
rename to patches/linux/44-arch-add-loong64.patch
diff --git a/patches/linux/arch-4-s390x.patch b/patches/linux/45-arch-add-s390x.patch
similarity index 100%
rename from patches/linux/arch-4-s390x.patch
rename to patches/linux/45-arch-add-s390x.patch
diff --git a/patches/linux/client/disable-remote.patch b/patches/linux/client/00-build-disable-remote.patch
similarity index 100%
rename from patches/linux/client/disable-remote.patch
rename to patches/linux/client/00-build-disable-remote.patch
diff --git a/patches/linux/client/avoid-crash-16k-page-size.patch b/patches/linux/client/00-system-support-16k-page-size.patch
similarity index 100%
rename from patches/linux/client/avoid-crash-16k-page-size.patch
rename to patches/linux/client/00-system-support-16k-page-size.patch
diff --git a/patches/linux/reh/s390x/package.json.patch b/patches/linux/reh/s390x/00-build-override-dependency.patch
similarity index 100%
rename from patches/linux/reh/s390x/package.json.patch
rename to patches/linux/reh/s390x/00-build-override-dependency.patch
diff --git a/patches/osx/fix-emulated-urls.patch b/patches/osx/00-ui-update-emulated-urls.patch
similarity index 100%
rename from patches/osx/fix-emulated-urls.patch
rename to patches/osx/00-ui-update-emulated-urls.patch
diff --git a/patches/osx/fix-codesign.patch.no b/patches/osx/fix-codesign.patch.no
deleted file mode 100644
index f5fdd14..0000000
--- a/patches/osx/fix-codesign.patch.no
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/build/darwin/sign.js b/build/darwin/sign.js
-index dff30fd..df48bee 100644
---- a/build/darwin/sign.js
-+++ b/build/darwin/sign.js
-@@ -56,5 +56,7 @@ async function main(buildDir) {
-         ignore: (filePath) => {
-+            const ext = path_1.default.extname(filePath);
-             return filePath.includes(gpuHelperAppName) ||
-                 filePath.includes(rendererHelperAppName) ||
--                filePath.includes(pluginHelperAppName);
-+                filePath.includes(pluginHelperAppName) ||
-+                ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
-         }
-diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
-index ecf1627..a414032 100644
---- a/build/darwin/sign.ts
-+++ b/build/darwin/sign.ts
-@@ -60,6 +60,9 @@ async function main(buildDir?: string): Promise<void> {
- 		ignore: (filePath: string) => {
--			return filePath.includes(gpuHelperAppName) ||
--				filePath.includes(rendererHelperAppName) ||
--				filePath.includes(pluginHelperAppName);
-+			const ext = path.extname(filePath);
-+            return filePath.includes(gpuHelperAppName) ||
-+                filePath.includes(rendererHelperAppName) ||
-+                filePath.includes(pluginHelperAppName) ||
-+				ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
- 		}
-+
- 	};
diff --git a/patches/windows/appx.patch b/patches/windows/00-build-disable-appx.patch
similarity index 100%
rename from patches/windows/appx.patch
rename to patches/windows/00-build-disable-appx.patch
diff --git a/patches/windows/win7.patch b/patches/windows/00-build-min-version-win7.patch
similarity index 100%
rename from patches/windows/win7.patch
rename to patches/windows/00-build-min-version-win7.patch
diff --git a/patches/windows/cli.patch b/patches/windows/41-cli-fix-update-url.patch
similarity index 100%
rename from patches/windows/cli.patch
rename to patches/windows/41-cli-fix-update-url.patch
diff --git a/prepare_vscode.sh b/prepare_vscode.sh
index eac0559..6dc2973 100755
--- a/prepare_vscode.sh
+++ b/prepare_vscode.sh
@@ -146,7 +146,7 @@ echo "ORG_NAME=\"${ORG_NAME}\""
 echo "TUNNEL_APP_NAME=\"${TUNNEL_APP_NAME}\""
 
 if [[ "${DISABLE_UPDATE}" == "yes" ]]; then
-  mv ../patches/disable-update.patch.yet ../patches/disable-update.patch
+  mv ../patches/00-update-disable.patch.yet ../patches/00-update-disable.patch
 fi
 
 for file in ../patches/*.patch; do