[main] Source code updates from dotnet/dotnet #124095
Conversation
|
Caution 🚨 Action Required — Conflict detectedA conflict was detected when trying to update this PR with changes from build The conflicts in the following files need to be manually resolved:
ℹ️ To resolve the conflicts, please follow these steps:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
github-actions
bot
added
the
needs-area-label
lewing
added
area-codeflow
|
Important While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged). You can continue with one of the following options:
💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance. |
src/coreclr/vm/arm64/asmhelpers.S
Outdated
| EPILOG_RETURN | ||
| NESTED_END CallJittedMethodRetBuff, _TEXT | ||
|
|
||
| // X0 - routines array |
There was a problem hiding this comment.
I don't think the changes in this file should be part of the PR
Code Review: PR #124095Holistic AssessmentMotivation: VMR codeflow update bringing source code changes from dotnet/dotnet along with dependency version updates. Approach: Standard codeflow PR pattern - version bumps in eng/ files plus source changes that flowed from the VMR. Net positive: ✅ Yes - this is a routine infrastructure update with low-risk source changes. Detailed Findings✅ Version Updates (eng/Version.Details.*, global.json, Versions.props)Standard dependency bumps for Arcade, Helix, Roslyn, NuGet, and other infrastructure packages. These are auto-generated by Maestro and follow the expected codeflow pattern. ✅ ARM64 Interpreter Call Stubs (src/coreclr/vm/arm64/asmhelpers.S)Adds four new
These follow the exact same pattern as existing ✅ BOM Removal (TensorPrimitives.Bit.cs)*Removes UTF-8 BOM from two source files. This is a minor cleanup with no semantic impact. 💡 WebAssembly Pack Tasks Simplification (Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.csproj)
This appears to be a deliberate simplification removing .NET Framework support for this build task. The props file update maintains consistency with the new output structure. SummaryVerdict: ✅ Approve This is a standard VMR codeflow PR with routine dependency updates and low-risk source changes. The new ARM64 assembly helpers correctly implement sign/zero extension for small integer types, following established patterns. The WebAssembly task simplification is consistent across both the project and props files. No issues identified that would block merging. |
akoeplinger
force-pushed
the
darc-main-25f83604-472f-4ddc-8317-7683fd918efe
branch
from
c7893c8 to
f1caa3b
Compare
Diff: https://github.com/dotnet/dotnet/compare/3531114c7feabc86ea3769ca2c5b804e5339a932..3531114c7feabc86ea3769ca2c5b804e5339a932 From: dotnet/dotnet@3531114 To: dotnet/dotnet@3531114 The following files had conflicts that were resolved by a user: - eng/Versions.props
They got reverted in #123973
akoeplinger
deleted the
darc-main-25f83604-472f-4ddc-8317-7683fd918efe
branch
|
@premun FYI there was some weird thing going on here, would appreciate a look |
|
New PR: #124232 |
…e push & empty diff detection (#124231) This improves the vmr-codeflow-status Copilot CLI skill with enhancements discovered while investigating a stale codeflow PR ([#124095](#124095)). ## Design Change: Current State First Inspired by the code-review skill restructuring in #124229, the analysis now follows a **"current state first, comments as history"** pattern: 1. **Assess current state** from primary signals (PR state, diff size, force pushes, timeline) before reading any Maestro comments 2. **Form an independent verdict** (MERGED / CLOSED / NO-OP / IN PROGRESS / STALE / ACTIVE) 3. **Then** read comments as historical context to explain how we got to the current state 4. **Recommendations** are generated by the agent from a structured JSON summary, not hardcoded script logic Previously, the script read Maestro conflict/staleness comments first and drew conclusions from them — even when those comments were stale (e.g., after someone had already force-pushed a resolution). Recommendations were a 130-line if/elseif chain that couldn't adapt to edge cases. ## New Capabilities ### 1. Current State Assessment (Step 2) Synthesizes primary signals into an immediate verdict before any comment parsing: - `✅ MERGED` — PR has been merged, no action needed - `✖️ CLOSED` — PR was closed without merging, Maestro should create a replacement - `📭 NO-OP` — empty diff, likely already resolved - `🔄 IN PROGRESS` — recent force push, awaiting update - `⏳ STALE` — no activity for >3 days - `✅ ACTIVE` — PR has content and recent activity ### 2. Force Push Detection Queries PR timeline for `head_ref_force_pushed` events, showing who force-pushed and when. Uses `--slurp` for correct pagination handling. ### 3. Empty Diff Detection Checks `changedFiles`/`additions`/`deletions` to flag 0-change PRs as NO-OP (regardless of whether a force push caused it). ### 4. Post-Action Staleness Analysis Cross-references force push timestamps against conflict/staleness warnings. When a force push post-dates these warnings, the script correctly identifies the issues as potentially resolved. ### 5. JSON Summary + Agent-Generated Recommendations The script's hardcoded recommendations (130+ lines of branching logic) have been replaced with: - A `[CODEFLOW_SUMMARY]` JSON block emitted at the end of the script with all key facts - `isCodeflowPR` boolean for explicit codeflow vs non-codeflow classification - A "Generating Recommendations" section in SKILL.md that teaches the agent how to reason over the summary - The agent now synthesizes contextual, nuanced recommendations instead of picking from a canned decision tree ### 6. Codeflow History (renamed section) The former "Staleness & Conflict Check" is now "Codeflow History" with a framing line: *"Maestro warnings (historical — see Current State for present status)"*. This signals that comments describe past events, not necessarily current state. ## Testing - Verified against PR #124095 (closed backflow with conflicts + force push) and PR #124231 (non-codeflow PR) - Multi-model review round 1 (Claude Sonnet 4, GPT-5): consensus findings → added merged/closed state handling, empty-diff-only NO-OP, `--slurp` pagination fix - Multi-model test round 2 (Claude Sonnet 4, GPT-5): functional test of JSON summary → fixed `isUpToDate` null handling, negative `daysSinceUpdate`, added `isCodeflowPR` field, clean exit codes, non-codeflow guidance in SKILL.md
3 participants
Note
This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.
This pull request brings the following source code changes
From https://github.com/dotnet/dotnet
Updated Dependencies
Associated changes in source repos
Diff the source with this PR branch