Rebase off of VS Code v1.107.X to support GitHub Copilot in Eclipse Che

build/dockerfiles/assembly.Dockerfile

@@ -7,9 +7,9 @@
 #
 
 # Grab content from previously build images
-FROM linux-libc-ubi8 as linux-libc-ubi8-content
-FROM linux-libc-ubi9 as linux-libc-ubi9-content
-FROM linux-musl as linux-musl-content
+# FROM localhost/linux-libc-ubi8:latest as linux-libc-ubi8-content
+FROM localhost/linux-libc-ubi9 as linux-libc-ubi9-content
+# FROM linux-musl as linux-musl-content
 
 # https://quay.io/eclipse/che-machine-exec#^7\.
 FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
@@ -22,8 +22,8 @@ RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/
 
 WORKDIR /mnt/rootfs
 
-COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
-COPY --from=linux-libc-ubi8-content --chown=0:0 /checode-linux-libc/ubi8 /mnt/rootfs/checode-linux-libc/ubi8
+# COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
+# COPY --from=linux-libc-ubi8-content --chown=0:0 /checode-linux-libc/ubi8 /mnt/rootfs/checode-linux-libc/ubi8
 COPY --from=linux-libc-ubi9-content --chown=0:0 /checode-linux-libc/ubi9 /mnt/rootfs/checode-linux-libc/ubi9
 
 RUN mkdir -p /mnt/rootfs/projects && mkdir -p /mnt/rootfs/home/che && mkdir -p /mnt/rootfs/bin/

build/dockerfiles/linux-libc-ubi9.Dockerfile

@@ -7,7 +7,8 @@
 #
 
 # https://registry.access.redhat.com/ubi9/nodejs-20
-FROM registry.access.redhat.com/ubi9/nodejs-22:9.6-1760386551 as linux-libc-ubi9-builder
+# FROM registry.access.redhat.com/ubi9/nodejs-22:9.6-1760386551 as linux-libc-ubi9-builder
+FROM nexus.clg.lab:5002/dev-spaces/vscode-builder:latest as linux-libc-ubi9-builder
 
 USER root
 
@@ -48,7 +49,7 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\
     else \
       LIBKEYBOARD=""; echo "Warning: arch $(uname -m) not supported"; \
     fi; } \
-    && yum install -y $LIBSECRET $LIBKEYBOARD make cmake gcc gcc-c++ python3.9 git git-core-doc openssh less libX11-devel libxkbcommon krb5-devel bash tar gzip rsync patch npm \
+    && yum install -y $LIBSECRET $LIBKEYBOARD make cmake gcc gcc-c++ python3.9 git git-core-doc openssh less libX11-devel libxkbcommon krb5-devel bash tar gzip rsync patch \
     && yum -y clean all && rm -rf /var/cache/yum
 
 #########################################################
@@ -59,7 +60,8 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\
 COPY code /checode-compilation
 WORKDIR /checode-compilation
 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
-    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 \
+    VSCODE_MANGLE_WORKERS=1
 
 # Initialize a git repository for code build tools
 RUN git init .
@@ -77,7 +79,7 @@ RUN NODE_ARCH=$(echo "console.log(process.arch)" | node) \
     && mkdir -p /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH} \
     && echo "caching /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node" \
     && cp /usr/bin/node /checode-compilation/.build/node/v${NODE_VERSION}/linux-${NODE_ARCH}/node \
-    && NODE_OPTIONS="--max-old-space-size=4096" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \
+    && NODE_OPTIONS="--max-old-space-size=49152" ./node_modules/.bin/gulp vscode-reh-web-linux-${NODE_ARCH}-min \
     && cp -r ../vscode-reh-web-linux-${NODE_ARCH} /checode \
     # cache shared libs from this image to provide them to a user's container
     && mkdir -p /checode/ld_libs \
@@ -92,55 +94,55 @@ RUN chmod a+x /checode/out/server-main.js \
 # Do not change line above! It is used to cut this section to skip tests
 
 # Compile tests
-RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
-	compile-extension:markdown-language-features \
-	compile-extension:typescript-language-features \
-	compile-extension:emmet \
-	compile-extension:git \
-	compile-extension:ipynb \
-	compile-extension-media \
-  compile-extension:configuration-editing
-
-# # Compile test suites
-# https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
-RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
-
-# install test dependencies
-ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
-RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
-# Install procps to manage to kill processes and centos stream repository
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-      ARCH=$(uname -m) && \
-      yum install --nobest -y procps \
-        https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/e/epel-release-9-10.el9.noarch.rpm \
-        https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-9.0-23.el9.noarch.rpm \
-        https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-9.0-23.el9.noarch.rpm; \
-    fi
-
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-      yum install -y chromium && \
-      PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \
-      rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
-      ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
-    fi
-
-# use of retry and timeout
-COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
-RUN chmod u+x /opt/app-root/src/retry.sh
-
-# Run integration tests (Browser)
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-      NODE_ARCH=$(echo "console.log(process.arch)" | node) \
-      VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
-      /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
-    fi
-
-# Run smoke tests (Browser)
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-      NODE_ARCH=$(echo "console.log(process.arch)" | node) \
-      VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
-      /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
-    fi
+# RUN ./node_modules/.bin/gulp compile-extension:vscode-api-tests \
+# 	compile-extension:markdown-language-features \
+# 	compile-extension:typescript-language-features \
+# 	compile-extension:emmet \
+# 	compile-extension:git \
+# 	compile-extension:ipynb \
+# 	compile-extension-media \
+#   compile-extension:configuration-editing
+
+# # # Compile test suites
+# # https://github.com/microsoft/vscode/blob/cdde5bedbf3ed88f93b5090bb3ed9ef2deb7a1b4/test/integration/browser/README.md#compile
+# RUN if [ "$(uname -m)" = "x86_64" ]; then npm --prefix test/smoke run compile && npm --prefix test/integration/browser run compile; fi
+
+# # install test dependencies
+# ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
+# RUN if [ "$(uname -m)" = "x86_64" ]; then npm run playwright-install; fi
+# # Install procps to manage to kill processes and centos stream repository
+# RUN if [ "$(uname -m)" = "x86_64" ]; then \
+#       ARCH=$(uname -m) && \
+#       yum install --nobest -y procps \
+#         https://rpmfind.net/linux/epel/9/Everything/x86_64/Packages/e/epel-release-9-10.el9.noarch.rpm \
+#         https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-gpg-keys-9.0-23.el9.noarch.rpm \
+#         https://rpmfind.net/linux/centos-stream/9-stream/BaseOS/x86_64/os/Packages/centos-stream-repos-9.0-23.el9.noarch.rpm; \
+#     fi
+
+# RUN if [ "$(uname -m)" = "x86_64" ]; then \
+#       yum install -y chromium && \
+#       PLAYWRIGHT_CHROMIUM_PATH=$(echo /opt/app-root/src/.cache/ms-playwright/chromium-*/) && \
+#       rm "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome" && \
+#       ln -s /usr/bin/chromium-browser "${PLAYWRIGHT_CHROMIUM_PATH}/chrome-linux/chrome"; \
+#     fi
+
+# # use of retry and timeout
+# COPY /build/scripts/helper/retry.sh /opt/app-root/src/retry.sh
+# RUN chmod u+x /opt/app-root/src/retry.sh
+
+# # Run integration tests (Browser)
+# RUN if [ "$(uname -m)" = "x86_64" ]; then \
+#       NODE_ARCH=$(echo "console.log(process.arch)" | node) \
+#       VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
+#       /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m ./scripts/test-web-integration.sh --browser chromium; \
+#     fi
+
+# # Run smoke tests (Browser)
+# RUN if [ "$(uname -m)" = "x86_64" ]; then \
+#       NODE_ARCH=$(echo "console.log(process.arch)" | node) \
+#       VSCODE_REMOTE_SERVER_PATH="$(pwd)/../vscode-reh-web-linux-${NODE_ARCH}" \
+#       /opt/app-root/src/retry.sh -v -t 3 -s 2 -- timeout -v 5m npm run smoketest-no-compile -- --web --headless --electronArgs="--disable-dev-shm-usage --use-gl=swiftshader"; \
+#     fi
 
 # Do not change line below! It is used to cut this section to skip tests
 ### Ending of tests

code/.config/guardian/.gdnsuppress

@@ -1,76 +1,68 @@
 {
-  "hydrated": false,
+  "hydrated": true,
   "properties": {
     "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions"
   },
   "version": "1.0.0",
   "suppressionSets": {
     "default": {
       "name": "default",
-      "createdDate": "2025-03-17 11:52:32Z",
-      "lastUpdatedDate": "2025-08-06 13:58:56Z"
+      "createdDate": "2025-01-28 06:29:05Z",
+      "lastUpdatedDate": "2025-08-25 17:55:20Z"
     }
   },
   "results": {
-    "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8": {
-      "signature": "216e2ac9cb596796224b47799f656570a01fa0d9b5f935608b47d15ab613c8e8",
+    "6216d3477ad4f56cb4ec316a9aaff02e9530a10d56469a4ef4063b8d02fe344b": {
+      "signature": "6216d3477ad4f56cb4ec316a9aaff02e9530a10d56469a4ef4063b8d02fe344b",
       "alternativeSignatures": [
-        "07746898f43afab7cc50931b33154c2d9e1a35f82a649dbe8aecf785b3d5a813"
+        "46ad210995b2ff199f3bee5f271938a4251ed7a60058041ace1beaa53e36b51c"
       ],
+      "target": "file:///D:/a/_work/1/vscode-server-win32-x64/node.exe",
       "memberOf": [
         "default"
       ],
-      "createdDate": "2025-03-17 11:52:32Z"
+      "tool": "binskim",
+      "ruleId": "BA2008",
+      "createdDate": "2025-08-25 17:54:06Z"
     },
-    "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624": {
-      "signature": "77797a3e44634bb2994bd13ccc95ff4575bba474585dbd2cf3068a1c16bc0624",
+    "b8a4702fb4b855719e5e5033c3b629fbe6267d516ce8a18bd8f3be3b9962434b": {
+      "signature": "b8a4702fb4b855719e5e5033c3b629fbe6267d516ce8a18bd8f3be3b9962434b",
       "alternativeSignatures": [
-        "4a6cb67bd4b401e9669c13a2162660aaefc0a94a4122e5b50c198414db545672"
+        "52d986be88f1c5696fc87d7794279d02f5084c645440e2dd2c3b5a2176b6bf52"
       ],
+      "target": "file:///D:/a/_work/1/vscode-server-win32-x64-web/node.exe",
       "memberOf": [
         "default"
       ],
-      "createdDate": "2025-03-17 11:52:32Z"
+      "tool": "binskim",
+      "ruleId": "BA2008",
+      "createdDate": "2025-08-25 17:54:06Z"
     },
-    "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad": {
-      "signature": "30418bcc5269eaeb2832a2404465784431d4e72a2af332320c2b1db4768902ad",
+		"4dbc45d0405de2e83d53f10227e36b2a9d15eceb2c5e6934da5c4a1bffbfad89": {
+      "signature": "4dbc45d0405de2e83d53f10227e36b2a9d15eceb2c5e6934da5c4a1bffbfad89",
       "alternativeSignatures": [
-        "b7b9eb974d7d3a4ae14df8695ca5a62592c8c9d20b7eda70a6535d50cbda3e7f"
+        "b6bab85ba5e97bc4e6ff2e8a7913cb9f4f3346f7bda435d176e0b1e3cfb883cf"
       ],
+      "target": "file:///D:/a/_work/1/vscode-server-win32-arm64/node.exe",
       "memberOf": [
         "default"
       ],
-      "createdDate": "2025-03-17 11:52:32Z"
+      "tool": "binskim",
+      "ruleId": "BA2008",
+      "createdDate": "2025-08-25 17:45:35Z"
     },
-		"9d60fae9db4b8d511637e4a0f902820fbabf962c64ce2b2b8c8ae54c0c06d3ab": {
-      "signature": "9d60fae9db4b8d511637e4a0f902820fbabf962c64ce2b2b8c8ae54c0c06d3ab",
+    "024ff37af329b63d2d9c83784cc071badf63b7729e3dd0969ab921d2f04d8e09": {
+      "signature": "024ff37af329b63d2d9c83784cc071badf63b7729e3dd0969ab921d2f04d8e09",
       "alternativeSignatures": [
-        "d06382c4909cfa81370526b06d4c47ebdf4425fc0b36053d3f457d5cdf5df8a8"
+        "b46b7d6ed331f3e62eff23c57d3a074f76ef618f108929851065904200f5a572"
       ],
+      "target": "file:///D:/a/_work/1/vscode-server-win32-arm64-web/node.exe",
       "memberOf": [
         "default"
       ],
-      "createdDate": "2025-08-06 13:58:56Z"
-    },
-    "7f0626fd14d60d2810a8ddfc1e9fdf1563b991dc8e1ac5880eca42449f752e90": {
-      "signature": "7f0626fd14d60d2810a8ddfc1e9fdf1563b991dc8e1ac5880eca42449f752e90",
-      "alternativeSignatures": [
-        "6d3dc1d67e5413347520202ce038daf52825c58099670688103db2661facf187"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2025-08-06 13:58:56Z"
-    },
-    "40121a40ac42fef69ebcb2b8c2ec7ee659c8d10bc7ab4e95d2a290a48b3d281f": {
-      "signature": "40121a40ac42fef69ebcb2b8c2ec7ee659c8d10bc7ab4e95d2a290a48b3d281f",
-      "alternativeSignatures": [
-        "3f4bc3f870aa2c71232dd65907522d59a1964c148e373105dec71e0d3da9427f"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2025-08-06 13:58:56Z"
+      "tool": "binskim",
+      "ruleId": "BA2008",
+      "createdDate": "2025-08-25 17:45:35Z"
     }
   }
 }

code/.eslint-ignore

@@ -10,6 +10,7 @@
 **/extensions/markdown-language-features/media/**
 **/extensions/markdown-language-features/notebook-out/**
 **/extensions/markdown-math/notebook-out/**
+**/extensions/mermaid-chat-features/chat-webview-out/**
 **/extensions/notebook-renderers/renderer-out/index.js
 **/extensions/simple-browser/media/index.js
 **/extensions/terminal-suggest/src/completions/upstream/**
@@ -24,9 +25,8 @@
 **/extensions/vscode-api-tests/testWorkspace2/**
 **/fixtures/**
 **/node_modules/**
-**/out-*/**/*.js
-**/out-editor-*/**
-**/out/**/*.js
+**/out/**
+**/out-*/**
 **/src/**/dompurify.js
 **/src/**/marked.js
 **/src/**/semver.js