Skip to content

Update main-os to latest upstream with OS customizations#50

Open
tbragaf wants to merge 10000 commits intomain-osfrom
update-main-os
Open

Update main-os to latest upstream with OS customizations#50
tbragaf wants to merge 10000 commits intomain-osfrom
update-main-os

Conversation

@tbragaf
Copy link

@tbragaf tbragaf commented Mar 4, 2026

Summary

Brings main-os up to date with our main branch (synced with microsoft/vscode), while preserving all OutSystems-specific customizations.

OS customizations ported

  • customIcon on CompletionItem — adds customIcon?: HTMLElement to the interface in languages.ts (the file formerly known as modes.ts)
  • Custom icon rendering in suggest widgetsuggestWidgetRenderer.ts (now under browser/ subfolder) now checks for customIcon before the standard kind-based icon logic, and renders the custom element inside iconContainer
  • OS Azure Pipelinesbuild/azure-pipelines/os-monaco-core-pipeline.yml restored for the monaco-editor-core build/deploy pipeline

Commits from main-os that were NOT ported (already upstream or not needed)

Commit Reason
92cc555 Fix microsoft#178795 (Luis Oliveira) Already merged upstream via microsoft/vscode PR microsoft#178795
75e0085 Update version Minor version bump, superseded by upstream versioning
5a1b499, 93376c6, 7db1a2b, 9580998, 7e87a0b, 022e0ab, b5ae100 Microsoft contributor commits, all already incorporated in upstream main

Test plan

  • Verify CompletionItem.customIcon is accessible in monaco-editor consumers
  • Verify suggest widget renders custom icons when customIcon is set on a completion item
  • Verify pipeline YAML triggers correctly on main-os branch

dependabot bot and others added 30 commits March 2, 2026 09:29
Bumps [minimatch](https://github.com/isaacs/minimatch) from 9.0.5 to 9.0.9.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v9.0.5...v9.0.9)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 9.0.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps  and [minimatch](https://github.com/isaacs/minimatch). These dependencies needed to be updated together.

Updates `minimatch` from 10.1.1 to 10.2.4
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v10.1.1...v10.2.4)

Updates `minimatch` from 3.1.2 to 3.1.5
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v10.1.1...v10.2.4)

Updates `minimatch` from 9.0.5 to 9.0.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v10.1.1...v10.2.4)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 10.2.4
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 9.0.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [minimatch](https://github.com/isaacs/minimatch) to 3.1.5 and updates ancestor dependencies  and [minimatch](https://github.com/isaacs/minimatch). These dependencies need to be updated together.


Updates `minimatch` from 3.1.2 to 3.1.5
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `minimatch` from 9.0.5 to 9.0.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

Updates `minimatch` from 5.1.6 to 5.1.9
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: direct:development
- dependency-name: minimatch
  dependency-version: 9.0.9
  dependency-type: indirect
- dependency-name: minimatch
  dependency-version: 5.1.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…osoft#298658)

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.1.2 to 3.1.5.
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](isaacs/minimatch@v3.1.2...v3.1.5)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-version: 3.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
microsoft#298423)

fix(json.schemaDownload.trustedDomains): avoid always update json.schemaDownload.trustedDomains

Signed-off-by: loongtao.zhang <loongtao.zhang@outlook.com>
…icrosoft#298610)

* feat: add support for Copilot user agents and related functionality

* Update comments

* Updates
…tency

style(find-widget): unify border-radius with CSS variable for consistency
style(inline-chat-gutter-menu): update border-radius to use CSS variable for consistency
bpasero and others added 14 commits March 4, 2026 05:57
…s to more kinds (microsoft#299060)

* modal - improve handling of Escape key and expand use of modal editors to more kinds

* Update src/vs/workbench/browser/parts/editor/editorCommands.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…n CLI envs (microsoft#299117)

* eng - explain fallback for how to check for compilation issues fast in CLI envs

* Update .github/copilot-instructions.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update .github/copilot-instructions.md

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* .

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Git - tweak copilot worktree folder detection

* Pull request feedback
- Add customIcon field to CompletionItem interface (languages.ts, was modes.ts)
- Add custom icon rendering logic in suggestWidgetRenderer.ts (moved to browser/ subfolder)
- Add OS Azure Pipelines build/deploy pipeline for monaco-editor-core
@wiz-code-outsystems
Copy link

wiz-code-outsystems bot commented Mar 4, 2026

Wiz Scan Summary

⚠️ Many findings detected
Many findings were detected, but only a subset of the findings are displayed inline due to API constraints. To view all findings inline, please click here.
Scanner Findings
Vulnerability Finding Vulnerabilities 1 High 3 Medium
Data Finding Sensitive Data 2 Medium
Secret Finding Secrets -
IaC Misconfiguration IaC Misconfigurations 1 High 5 Medium 5 Low 4 Info
SAST Finding SAST Findings 149 Medium 60 Low
Software Management Finding Software Management Findings -
Total 2 High 159 Medium 65 Low 4 Info

View scan details in Wiz

To detect these findings earlier in the dev lifecycle, try using Wiz Code VS Code Extension.

Pull Request Developer Guidance

Questions? See the Wiz FAQ.

Please contact the Security Office if you encounter issues with Wiz PR scanning.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

High Vulnerability Finding on line 0

More Details

Vulnerabilities [russh:0.37.1]

Name Severity Source Fixed version CVSS score CVSS exploitability score Has public exploit Has CISA KEV exploit
CVE-2023-48795 Medium GHSA-45x7-px36-x8w8 0.40.2 5.9 2.2 true false
CVE-2024-43410 High GHSA-vgvv-x7xg-6cqg 0.44.1 7.5 3.9 true false
CVE-2025-54804 Medium GHSA-h5rc-j5f5-3gcm 0.54.1 6.5 2.8 true false

To ignore this finding as an exception, reply to this conversation with #wiz_ignore reason

If you'd like to ignore this finding in all future scans, add an exception in the .wiz file (learn more) or create an Ignore Rule (learn more).


To get more details on how to remediate this issue using AI, reply to this conversation with #wiz remediate

@@ -1,5 +1,5 @@
FROM ubuntu
MAINTAINER Kimbro Staken
FROM mcr.microsoft.com/devcontainers/base:ubuntu

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

High IaC Finding

Missing User Instruction
on resource FROM mcr.microsoft.com/devcontainers/base:ubuntu AS mcr.microsoft.com/devcontainers/base:ubuntu

More Details
This rule checks whether a `USER` instruction is specified in the Dockerfile. The rule fails when the `USER` instruction is missing, causing the container to run with root privileges (UID 0). If an attacker compromises an application running as root, they gain the privileges needed to potentially escape the container and attack the host node. It also increases the blast radius of a breach, allowing full control to modify files or install malware within the container. Enforcing a non-root user is a fundamental security measure that minimizes the attack surface and contains the impact of a potential compromise.

Expected

The Dockerfile stage should contain the 'USER' instruction

Found

The Dockerfile stage does not contain any 'USER' instruction

Rule ID: 6cd7a272-d9d1-4667-8224-73140fbaabdd


To ignore this finding as an exception, reply to this conversation with #wiz_ignore reason

If you'd like to ignore this finding in all future scans, add an exception in the .wiz file (learn more) or create an Ignore Rule (learn more).


To get more details on how to remediate this issue using AI, reply to this conversation with #wiz remediate

@tbragaf tbragaf changed the base branch from main-os to main March 4, 2026 14:18
@tbragaf tbragaf changed the base branch from main to main-os March 4, 2026 14:18
@os-lmo os-lmo self-requested a review March 5, 2026 14:56
@tbragaf tbragaf changed the base branch from main-os to main March 5, 2026 15:48
@tbragaf tbragaf changed the base branch from main to main-os March 5, 2026 15:48
@os-lmo
Copy link
Collaborator

os-lmo commented Mar 5, 2026

I did a high level check of the code in person with Tiago

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.