-
Notifications
You must be signed in to change notification settings - Fork 149
Merge main branch and resolve conflicts in validate_memory_files.cjs #15319
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
# Conflicts: # .github/workflows/smoke-copilot.lock.yml # actions/setup/js/safe_output_handler_manager.cjs # actions/setup/js/safe_output_unified_handler_manager.cjs # actions/setup/js/validate_memory_files.cjs # docs/src/content/docs/reference/safe-outputs.md # pkg/cli/logs_extract_zip_test.go
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR merges the latest changes from the main branch into a cleanup PR for validate_memory_files.cjs. The merge brings in several new features and improvements from main while preserving the JavaScript modernization changes (arrow functions, optional chaining, typedef) already present in the target branch.
Changes:
- Merged main branch updates including new
unassign-from-usersafe output feature, refiner workflow, and various bug fixes - Resolved merge conflicts by accepting main branch versions for generated files and test updates
- Preserved the modernized
validate_memory_files.cjsimplementation in the target branch
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
pkg/cli/logs_extract_zip_test.go |
Enhanced test to handle read-only directory failures gracefully when running with elevated privileges |
docs/src/content/docs/reference/safe-outputs.md |
Added documentation for new unassign-from-user safe output feature |
actions/setup/js/safe_output_unified_handler_manager.cjs |
Improved error handling to be TypeScript-safe using instanceof Error check |
actions/setup/js/safe_output_handler_manager.cjs |
Improved error handling to be TypeScript-safe using instanceof Error check |
.github/workflows/smoke-copilot.lock.yml |
Updated cron schedule from "37 */12 * * *" to "46 */12 * * *" |
.github/workflows/refiner.md |
New workflow for code refinement: aligns style, detects security issues, improves tests |
.github/workflows/refiner.lock.yml |
Generated lock file for the refiner workflow (1159 lines) |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
* Clean validate_memory_files.cjs - modernize code with arrow functions and optional chaining * Fix JavaScript formatting in merge_remote_agent_github_folder.cjs (#15316) * Merge main branch and resolve conflicts in validate_memory_files.cjs (#15319) * Add refiner workflow for automated code style and security analysis (#15307) * test: avoid flaky readonly dir assertion in extractZipFile (#15312) * docs: add unassign-from-user safe output documentation (#15310) * Fix TypeScript type errors in error handling for unknown types (#15308) * Initial plan --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Mark L <73659136+liuxiaopai-ai@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: JSweep Bot <jsweep-bot@github.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: Mark L <73659136+liuxiaopai-ai@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Merged latest changes from main branch into the jsweep cleanup PR for
validate_memory_files.cjs. The merge required conflict resolution across multiple files.Conflict Resolution
Changes Preserved
The modernized
validate_memory_files.cjscode from the original PR remains intact:All 21 tests continue to pass with the cleaned implementation.
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.