Merge remote-tracking branch 'eclipse/main'

Co-authored-by: Cursor <cursoragent@cursor.com>

# Conflicts:
#	build/dockerfiles/linux-musl.Dockerfile

Author: RomanNikitenko

.rebase/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.
 
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/698
+
+- code/package.json
+---
+
 #### @RomanNikitenko
 https://github.com/che-incubator/che-code/pull/689
 

.rebase/add/code/package.json

@@ -62,6 +62,7 @@
             "glob": {
                 "minimatch": "^5.1.9"
             }
-        }
+        },
+        "es5-ext": "npm:@unes/es5-ext@0.10.64-1"
     }
 }

.vscode/extensions.json

@@ -48,24 +48,6 @@ To test your changes in Eclipse Che run the following VS Code tasks:
 3. `run` to run the VS Code server
 4. Follow the suggested URL to test your changes.
 
-## Using Roo Code with Google Gemini
-
-Roo Code is a powerful extension that brings AI-powered features to your Che-Code environment. To get started, connect it to Google Gemini for access to advanced language models.
-
-### Extension Installation
-The "Roo Code" extension is included in the list of recommended extensions for this repository and should install automatically when you start your workspace. If it is not installed automatically, you can find it on the [Open VSX Registry](https://open-vsx.org/).
-
-### Obtaining a Google Gemini API Key
-If you do not already have one, visit the Google Gemini website to create an API key.
-
-### Configuring Google Gemini
-1.  **Open Roo Code**: Launch the Roo Code extension from the Activity Bar in Che-Code.
-2.  **Access Settings**: The first time you launch the extension, a welcome screen will appear with an option to create a Roo account or proceed without one. The settings will open automatically after you make a selection. Alternatively, you can access the settings by clicking the gear icon (⚙️) in the top-right corner of the Roo Code panel.
-3.  **Configure the API Provider**:
-    *   **API Provider**: Select "Google Gemini" from the dropdown menu.
-    *   **API Key**: Paste your Gemini API key into the corresponding field.
-    *   **Model**: Choose your desired Gemini model, such as "gemini-2.5-pro," from the list of available options.
-
 ## Updates and branches
 
 This repository has a main branch being rebased on the main remote branch of `Code-OSS`.

README.md

@@ -16,7 +16,7 @@ RUN microdnf -y install libsecret openssh-server nss_wrapper-libs \
     microdnf -y clean all --enablerepo='*'
 
 # UBI 9/10
-FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:9.7
+FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7
 
 USER 0
 

build/dockerfiles/assembly.sshd.Dockerfile

@@ -18,29 +18,6 @@ RUN dnf -y install patch libsecret libX11-devel libxkbcommon \
     util-linux-user && \
     dnf -y clean all --enablerepo='*'
 
-# Pin gcloud CLI to a tested release from the official RHEL/CentOS repository.
-# See https://cloud.google.com/sdk/docs/release-notes for recent versions.
-ARG GCLOUD_CLI_VERSION=563.0.0
-RUN printf '%s\n' \
-    '[google-cloud-cli]' \
-    'name=Google Cloud CLI' \
-    'baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64' \
-    'enabled=1' \
-    'gpgcheck=1' \
-    'repo_gpgcheck=0' \
-    'gpgkey=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg' \
-    > /etc/yum.repos.d/google-cloud-sdk.repo && \
-    dnf makecache --repo=google-cloud-cli && \
-    dnf list --showduplicates google-cloud-cli 2>/dev/null \
-        | grep -q "${GCLOUD_CLI_VERSION}" || \
-    { echo "ERROR: google-cloud-cli version ${GCLOUD_CLI_VERSION} not found in repo."; \
-      echo "Available versions (most recent last):"; \
-      dnf list --showduplicates google-cloud-cli 2>/dev/null | tail -10; \
-      exit 1; } && \
-    dnf -y install libxcrypt-compat google-cloud-cli-${GCLOUD_CLI_VERSION} && \
-    dnf -y clean all --enablerepo='*' && \
-    gcloud --version
-
 COPY --chmod=664 /build/conf/dev/.p10k.zsh /home/user/.p10k.zsh
 
 # zsh support

build/dockerfiles/dev.Dockerfile

@@ -60,6 +60,7 @@ COPY code /checode-compilation
 WORKDIR /checode-compilation
 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
     PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 \
+    VSCODE_SKIP_HEADER_INSTALL=1 \
     PATH="/opt/rh/gcc-toolset-13/root/usr/bin:${PATH}"
 
 # Initialize a git repository for code build tools

build/dockerfiles/linux-libc-ubi8.Dockerfile

@@ -59,7 +59,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_SKIP_HEADER_INSTALL=1
 
 # Initialize a git repository for code build tools
 RUN git init .

build/dockerfiles/linux-libc-ubi9.Dockerfile

@@ -16,6 +16,9 @@ pre {
   display: table-cell;
   width: 98%;
   padding: 10px;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  word-break: break-all;
 }
 
 /* Inline code */

build/scripts/code-sshd-page/page-style.css

@@ -9,7 +9,7 @@
 
 function copyToClipboard(id) {
   var copyText = document.getElementById(id);
-  navigator.clipboard.writeText(copyText.innerHTML);
+  navigator.clipboard.writeText(copyText.innerText);
 }
 
 function initializePlatformContent() {
@@ -37,3 +37,8 @@ function syncDocsContent() {
   var manualElem = document.getElementById("docs-manual");
   docsElem.innerHTML = useExtension ? extensionElem.innerHTML : manualElem.innerHTML;
 }
+
+function openDevspacesURI(namespace, podName, userName, dwName, encodedKeyMessage, encodedUrl) {
+  const gatewayLink = `vscode://redhat.devspaces-remote-ssh?namespace=${namespace}&podName=${podName}&userName=${userName}&dwName=${dwName}&key=${encodedKeyMessage}&url=${encodedUrl}`;
+  window.open(gatewayLink, "_self");
+}