Skip to content

Merge main branch and recompile workflows#7608

Merged
pelikhan merged 11 commits intomain-1bac2aba4e03afbafrom
copilot/sub-pr-7588
Dec 25, 2025
Merged

Merge main branch and recompile workflows#7608
pelikhan merged 11 commits intomain-1bac2aba4e03afbafrom
copilot/sub-pr-7588

Conversation

Copy link
Contributor

Copilot AI commented Dec 25, 2025

Merged latest main branch into security fix PR and recompiled all workflow lock files to sync with updated dependencies and schema changes.

Changes

  • Merge: Integrated 3937 commits from main using --allow-unrelated-histories (grafted branch)
  • Conflict resolution: Preserved security fix in sanitize_content_core.cjs, adopted main versions for all other files
  • Recompilation: Updated 123 workflow lock files with latest action pins and embedded JavaScript

Security fix preserved

The single atomic regex replacement for XML comment removal remains intact:

// Before (vulnerable to injection via chained operations)
s = s.replace(/<!--[\s\S]*?-->/g, "").replace(/<!--[\s\S]*?--!>/g, "");

// After (atomic operation prevents injection)
s = s.replace(/<!--[\s\S]*?--!?>/g, "");

Notes

  • One workflow (smoke-copilot.md) has pre-existing validation error unrelated to this merge
  • Embedded JavaScript in pkg/workflow/js/ updated via build system

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Copilot AI and others added 2 commits December 25, 2025 11:02
Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
Copilot AI changed the title [WIP] Fix incomplete multi-character sanitization in removeXmlComments Merge main branch and recompile workflows Dec 25, 2025
Copilot AI requested a review from pelikhan December 25, 2025 11:08
@pelikhan pelikhan marked this pull request as ready for review December 25, 2025 11:15
@pelikhan pelikhan merged commit 19fbfd6 into main-1bac2aba4e03afba Dec 25, 2025
@pelikhan pelikhan deleted the copilot/sub-pr-7588 branch December 25, 2025 11:15
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.

2 participants