Merge remote-tracking branch 'eclipse/main'

Author: RomanNikitenko

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # Default Owners
-* @azatsarynnyy @RomanNikitenko @vitaliy-guliy
+* @rgrunber @azatsarynnyy @RomanNikitenko @vitaliy-guliy

.rebase/CHANGELOG.md

@@ -20,6 +20,27 @@ https://github.com/che-incubator/che-code/pull/605
 - code/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 ---
 
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/613
+
+- code/build/package.json
+- code/extensions/microsoft-authentication/package.json
+---
+
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/621
+
+- code/build/package.json
+- code/test/mcp/package.json
+---
+
+#### @sbouchet
+https://github.com/che-incubator/che-code/pull/611
+
+- code/package.json
+- code/build/npm/gyp/package.json
+---
+
 #### @sbouchet
 https://github.com/che-incubator/che-code/pull/607
 

.rebase/add/code/build/npm/gyp/package.json

@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "glob": "10.5.0"
+    }
+}

.rebase/add/code/build/package.json

@@ -2,6 +2,10 @@
     "overrides": {
         "prebuild-install": {
             "tar-fs": "2.1.4"
-        }
+        },
+        "jsonwebtoken": {
+            "jws": "^3.2.3"
+        },
+        "qs": "6.14.1"
     }
 }

.rebase/add/code/extensions/microsoft-authentication/package.json

@@ -1,4 +1,7 @@
 {
+    "overrides": {
+        "jws": "^3.2.3"
+    },
     "workspaces": [
         "packageMocks/keytar"
     ]

.rebase/add/code/test/mcp/package.json

@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "qs": "6.14.1"
+    }
+}

.rebase/override/code/build/package.json

@@ -1,5 +1,6 @@
 {
     "devDependencies": {
-		"@types/minimatch": "^3.0.5"
+      "@types/minimatch": "^3.0.5",
+      "jws": "^4.0.1"
     }
 }

.rebase/override/code/package.json

@@ -3,6 +3,8 @@
     "bin": "out/vs/server/main.js",
     "devDependencies": {
       "@vscode/l10n-dev": "0.0.18",
+      "@vscode/test-cli": "^0.0.12",
+      "@vscode/test-web": "^0.0.77",
       "minimatch": "^3.0.5"
     }
 }

README.md

@@ -48,6 +48,24 @@ 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`.

build/dockerfiles/dev.sshd.Dockerfile

@@ -6,43 +6,15 @@
 # SPDX-License-Identifier: EPL-2.0
 #
 
-FROM quay.io/devfile/universal-developer-image:latest
+FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:9.6
 
 USER 0
 
-RUN dnf -y install libsecret openssh-server && \
-    dnf -y clean all --enablerepo='*'
+RUN microdnf -y install libsecret openssh-server nss_wrapper-libs && \
+    microdnf -y clean all --enablerepo='*'
 
-# Step 1. Generate SSH Host keys
-RUN mkdir /opt/ssh
-RUN chmod 755 /opt/ssh
-RUN chown -R root:root /opt/ssh/
-
-RUN ssh-keygen -q -N "" -t dsa -f /opt/ssh/ssh_host_dsa_key && \
-    ssh-keygen -q -N "" -t rsa -b 4096 -f /opt/ssh/ssh_host_rsa_key && \
-    ssh-keygen -q -N "" -t ecdsa -f /opt/ssh/ssh_host_ecdsa_key && \
-    ssh-keygen -q -N "" -t ed25519 -f /opt/ssh/ssh_host_ed25519_key
-
-# Step 2. Configure SSH as non-root user
-RUN cp /etc/ssh/sshd_config /opt/ssh/
-
-# Step 3. Fix permissions
-RUN chmod 644 /opt/ssh/ssh_host_* /opt/ssh/sshd_config
-
-# Use non-privileged port, set user authorized keys, disable strict checks
-RUN sed -i \
--e 's|#Port 22|Port 2022|' \
--e 's|#StrictModes yes|StrictModes=no|' \
--e 's|#PidFile /var/run/sshd.pid|PidFile /tmp/sshd.pid|' \
--e 's|#LogLevel INFO|LogLevel DEBUG3|' \
-  /opt/ssh/sshd_config
-
-# Provide new path containing host keys
-RUN sed -i \
--e 's|#HostKey /etc/ssh/ssh_host_rsa_key|HostKey /opt/ssh/ssh_host_rsa_key|' \
--e 's|#HostKey /etc/ssh/ssh_host_ecdsa_key|HostKey /opt/ssh/ssh_host_ecdsa_key|' \
--e 's|#HostKey /etc/ssh/ssh_host_ed25519_key|HostKey /opt/ssh/ssh_host_ed25519_key|' \
-  /opt/ssh/sshd_config
+# sshd_config is root:root 600
+RUN chmod 644 /etc/ssh/sshd_config
 
 # Add script to start and stop the service
 COPY --chown=0:0 /build/scripts/sshd.start /
@@ -53,9 +25,6 @@ COPY /build/scripts/code-sshd-page/* /opt/www/
 # Lock down /etc/passwd until fixed in UDI
 RUN chmod 644 /etc/passwd
 
-# Bypass nologin shell for random generated user
-RUN cp /bin/bash /sbin/nologin
-
 EXPOSE 2022 3400
 
 USER 10001