Fix Claude CLI invocation and upstream merge push step

gfraiteur · gfraiteur · commit 6a7af18855d7 · 2026-01-31T23:28:33.000+01:00
- Use claude.cmd instead of claude for Windows compatibility
- Fix double backslash escaping in NodeJs ENV paths
- Remove premature push step in upstream merge workflow
diff --git a/src/PostSharp.Engineering.BuildTools/Docker/NodeJsComponent.cs b/src/PostSharp.Engineering.BuildTools/Docker/NodeJsComponent.cs
@@ -30,8 +30,8 @@ public override void WriteDockerfile( TextWriter writer )
                   Rename-Item "C:\node-v{{version}}-win-x64" "C:\nodejs"; `
                   Remove-Item node.zip
 
-              ENV NPM_CONFIG_PREFIX=C:\\npm
-              ENV PATH="C:\nodejs;C:\\npm;${PATH}"
+              ENV NPM_CONFIG_PREFIX=C:\npm
+              ENV PATH="C:\nodejs;C:\npm;${PATH}"
               """ );
     }
 }
diff --git a/src/PostSharp.Engineering.BuildTools/Tools/Git/UpstreamMerge.cs b/src/PostSharp.Engineering.BuildTools/Tools/Git/UpstreamMerge.cs
@@ -83,7 +83,8 @@ public static bool CheckUpstreamChanges( BuildContext context, BaseBuildSettings
 
         context.Console.WriteMessage( "Step 2 complete: No unmerged upstream commits found." );
 
-        context.Console.WriteSuccess( settings.Force ? "Pending upstream changes check completed (some issues ignored due to --force)." : "No pending upstream changes found." );
+        context.Console.WriteSuccess(
+            settings.Force ? "Pending upstream changes check completed (some issues ignored due to --force)." : "No pending upstream changes found." );
 
         return true;
     }
@@ -318,8 +319,11 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
         if ( upstreamBranch == currentBranch )
         {
             context.Console.WriteError( $"BUG: Upstream branch '{upstreamBranch}' is the same as current branch '{currentBranch}'!" );
-            context.Console.WriteError( $"This indicates a configuration issue. The upstream product family ({upstreamProductFamily.Version}) " +
-                                        $"returned a DependencyDefinition from family version {upstreamDependencyDefinition.ProductFamily.Version}." );
+
+            context.Console.WriteError(
+                $"This indicates a configuration issue. The upstream product family ({upstreamProductFamily.Version}) " +
+                $"returned a DependencyDefinition from family version {upstreamDependencyDefinition.ProductFamily.Version}." );
+
             context.Console.WriteError( "Check that the product is properly defined in each ProductFamily version." );
 
             return false;
@@ -333,8 +337,7 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
 
         if ( context.Branch != currentBranch )
         {
-            context.Console.WriteError(
-                $"Upstream merge must be executed on the downstream development branch ('{currentBranch}')." );
+            context.Console.WriteError( $"Upstream merge must be executed on the downstream development branch ('{currentBranch}')." );
             context.Console.WriteError( $"Currently on branch '{context.Branch}'." );
             context.Console.WriteError( $"Please checkout '{currentBranch}' and try again." );
 
@@ -462,8 +465,8 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
             // These are obsolete and should be deleted to avoid confusion
             var formerMergeBranches = references.Where( r => r.Reference != targetBranchReference )
                 .Where( r => r.Reference.StartsWith(
-                    $"refs/heads/merge/{currentProductFamily.Version}/{upstreamProductFamily.Version}-",
-                    StringComparison.OrdinalIgnoreCase ) )
+                            $"refs/heads/merge/{currentProductFamily.Version}/{upstreamProductFamily.Version}-",
+                            StringComparison.OrdinalIgnoreCase ) )
                 .ToArray();
 
             if ( formerMergeBranches.Length == 0 )
@@ -546,23 +549,11 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
 
             context.Console.WriteMessage( "Successfully created merge branch." );
 
-            // ==================== STEP 14: Push Merge Branch ====================
-            context.Console.WriteMessage( "" );
-            context.Console.WriteMessage( "Step 14: Pushing merge branch to remote..." );
-            context.Console.WriteMessage( "This ensures the branch exists on remote before we start merging." );
-
-            if ( !GitHelper.TryPush( context ) )
-            {
-                context.Console.WriteError( "Failed to push merge branch." );
-
-                return false;
-            }
-
             context.Console.WriteMessage( "Merge branch pushed successfully." );
 
-            // ==================== STEP 15: Perform the Merge ====================
+            // ==================== STEP 14: Perform the Merge ====================
             context.Console.WriteMessage( "" );
-            context.Console.WriteMessage( "Step 15: Performing the merge..." );
+            context.Console.WriteMessage( "Step 14: Performing the merge..." );
 
             if ( !TryMerge( context, upstreamBranch, targetBranch, currentBranch, out var areChangesPending, out var prBodyText ) )
             {
@@ -579,12 +570,11 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
                 return true;
             }
 
-            context.Console.WriteSuccess(
-                $"Merge completed! Changes from '{upstreamBranch}' have been merged into '{targetBranch}'." );
+            context.Console.WriteSuccess( $"Merge completed! Changes from '{upstreamBranch}' have been merged into '{targetBranch}'." );
 
-            // ==================== STEP 16: Create Pull Request ====================
+            // ==================== STEP 17: Create Pull Request ====================
             context.Console.WriteMessage( "" );
-            context.Console.WriteMessage( "Step 16: Creating pull request..." );
+            context.Console.WriteMessage( "Step 17: Creating pull request..." );
 
             if ( !TryCreatePullRequest( context, targetBranch, currentBranch, upstreamBranch, prBodyText, out var pullRequestUrl ) )
             {
@@ -593,9 +583,9 @@ public static bool MergeUpstream( BuildContext context, UpstreamMergeSettings se
                 return false;
             }
 
-            // ==================== STEP 17: Schedule Build ====================
+            // ==================== STEP 18: Schedule Build ====================
             context.Console.WriteMessage( "" );
-            context.Console.WriteMessage( "Step 17: Scheduling build on merge branch..." );
+            context.Console.WriteMessage( "Step 18: Scheduling build on merge branch..." );
 
             if ( !TryScheduleBuild(
                     product.DependencyDefinition.CiConfiguration,
@@ -1042,4 +1032,4 @@ void Write( string message )
 
         Write( "" );
     }
-}
+}
diff --git a/src/PostSharp.Engineering.BuildTools/Utilities/ClaudeCodeHelper.cs b/src/PostSharp.Engineering.BuildTools/Utilities/ClaudeCodeHelper.cs
@@ -78,7 +78,6 @@ public static bool TryResolveMergeConflicts(
         var maskedEnvVars = MaskSecretEnvironmentVariables();
         console.WriteMessage( $"Masked {maskedEnvVars.Count( kv => kv.Value == "<redacted>" )} secret variable(s)." );
 
-
         // Build the command arguments
         // -p: Print mode - required for piped input, outputs to stdout
         // --output-format stream-json: Stream JSON events in real-time
@@ -143,7 +142,7 @@ void HandleOutput( string line )
         // Invoke claude with custom output handler
         var success = ToolInvocationHelper.InvokeTool(
             console,
-            "claude",
+            "claude.cmd",
             claudeArgs,
             workingDirectory,
             out var exitCode,
@@ -424,7 +423,7 @@ private static string RestructureOutputForPR( string output )
     /// </summary>
     private static HashSet<string> GetSecretEnvironmentVariableNames()
     {
-        return typeof( EnvironmentVariableNames )
+        return typeof(EnvironmentVariableNames)
             .GetFields( BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static )
             .Where( f => f.GetCustomAttribute<SecretAttribute>() != null )
             .Select( f => (string) f.GetValue( null )! )
@@ -434,80 +433,80 @@ private static HashSet<string> GetSecretEnvironmentVariableNames()
     private static string BuildMergeConflictPrompt( string sourceBranch, string targetBranch )
     {
         return $"""
-            # Merge Conflict Resolution Task
-
-            You are resolving merge conflicts from branch '{sourceBranch}' (upstream) into '{targetBranch}' (current).
-            This is a NON-INTERACTIVE session - you must complete the task without asking questions.
-
-            ## Your Goal
-            Resolve all merge conflicts so the merge can proceed. You do NOT need to build - the PR build will verify compilation.
-
-            ## Generated Files (can be ignored)
-            The following files are auto-generated. If they have conflicts, you can resolve them by keeping EITHER version
-            (preferably the current/HEAD version). They will be regenerated when the PR build runs.
-            - Build.ps1
-            - DockerBuild.ps1
-            - Dockerfile
-            - Dockerfile.claude
-            - .teamcity/settings.kts
-            - .teamcity/pom.xml
-            - eng/Versions.*.g.props
-            - eng/DockerMounts.g.ps1
-
-            ## Step-by-Step Process
-
-            ### 1. Assess the situation
-            Run `git status` to see which files have conflicts (marked as "both modified" or "unmerged").
-
-            ### 2. For EACH conflicting file:
-            a) Read the file to see the conflict markers (<<<<<<<, =======, >>>>>>>)
-            b) Understand what each side of the conflict is trying to do:
-               - The section after <<<<<<< HEAD is the current branch ({targetBranch})
-               - The section after ======= is from the incoming branch ({sourceBranch})
-            c) Decide the correct resolution:
-               - If both changes are needed, combine them logically
-               - If one supersedes the other, keep the appropriate one
-               - Consider the semantic meaning, not just the text
-               - For generated files (see list above), just keep HEAD version
-            d) Edit the file to remove ALL conflict markers and leave only the resolved code
-            e) Run `git add <file>` to mark it as resolved
-
-            ### 3. Final check
-            Run `git status` to confirm all conflicts are resolved and files are staged.
-
-            ## Conflict Resolution Rules
-            - **Package versions**: When there's a conflict in package/dependency versions (in Directory.Packages.props, .csproj, etc.), always choose the HIGHER version number
-            - **Code conflicts**: Analyze the intent of both changes and merge them logically
-            - **Generated files**: Keep HEAD version, they will be regenerated by the PR build
-
-            ## Important Constraints
-            - Do NOT run `git commit` - leave that to the calling process
-            - Do NOT run `git push`
-            - Do NOT build the code - the PR build will handle compilation
-            - Do NOT modify files that don't have conflicts
-            - If you encounter a conflict you cannot resolve confidently, resolve it to the best of your ability and note it in your output
-
-            ## Success Criteria
-            - All conflict markers removed from all files
-            - All previously conflicting files staged with `git add`
-            - `git status` shows no unmerged files
-
-            ## Output Format
-            At the very end of your work, write a conclusion block in this exact format:
-
-            ```
-            ===CONCLUSION===
-            [One-paragraph summary of what was merged and any notable decisions made]
-
-            Files resolved:
-            - file1.cs: [brief description of resolution]
-            - file2.csproj: [brief description of resolution]
-            ===END_CONCLUSION===
-            ```
-
-            This conclusion will be extracted and placed at the TOP of the PR description.
-
-            Begin now.
-            """;
+                # Merge Conflict Resolution Task
+
+                You are resolving merge conflicts from branch '{sourceBranch}' (upstream) into '{targetBranch}' (current).
+                This is a NON-INTERACTIVE session - you must complete the task without asking questions.
+
+                ## Your Goal
+                Resolve all merge conflicts so the merge can proceed. You do NOT need to build - the PR build will verify compilation.
+
+                ## Generated Files (can be ignored)
+                The following files are auto-generated. If they have conflicts, you can resolve them by keeping EITHER version
+                (preferably the current/HEAD version). They will be regenerated when the PR build runs.
+                - Build.ps1
+                - DockerBuild.ps1
+                - Dockerfile
+                - Dockerfile.claude
+                - .teamcity/settings.kts
+                - .teamcity/pom.xml
+                - eng/Versions.*.g.props
+                - eng/DockerMounts.g.ps1
+
+                ## Step-by-Step Process
+
+                ### 1. Assess the situation
+                Run `git status` to see which files have conflicts (marked as "both modified" or "unmerged").
+
+                ### 2. For EACH conflicting file:
+                a) Read the file to see the conflict markers (<<<<<<<, =======, >>>>>>>)
+                b) Understand what each side of the conflict is trying to do:
+                   - The section after <<<<<<< HEAD is the current branch ({targetBranch})
+                   - The section after ======= is from the incoming branch ({sourceBranch})
+                c) Decide the correct resolution:
+                   - If both changes are needed, combine them logically
+                   - If one supersedes the other, keep the appropriate one
+                   - Consider the semantic meaning, not just the text
+                   - For generated files (see list above), just keep HEAD version
+                d) Edit the file to remove ALL conflict markers and leave only the resolved code
+                e) Run `git add <file>` to mark it as resolved
+
+                ### 3. Final check
+                Run `git status` to confirm all conflicts are resolved and files are staged.
+
+                ## Conflict Resolution Rules
+                - **Package versions**: When there's a conflict in package/dependency versions (in Directory.Packages.props, .csproj, etc.), always choose the HIGHER version number
+                - **Code conflicts**: Analyze the intent of both changes and merge them logically
+                - **Generated files**: Keep HEAD version, they will be regenerated by the PR build
+
+                ## Important Constraints
+                - Do NOT run `git commit` - leave that to the calling process
+                - Do NOT run `git push`
+                - Do NOT build the code - the PR build will handle compilation
+                - Do NOT modify files that don't have conflicts
+                - If you encounter a conflict you cannot resolve confidently, resolve it to the best of your ability and note it in your output
+
+                ## Success Criteria
+                - All conflict markers removed from all files
+                - All previously conflicting files staged with `git add`
+                - `git status` shows no unmerged files
+
+                ## Output Format
+                At the very end of your work, write a conclusion block in this exact format:
+
+                ```
+                ===CONCLUSION===
+                [One-paragraph summary of what was merged and any notable decisions made]
+
+                Files resolved:
+                - file1.cs: [brief description of resolution]
+                - file2.csproj: [brief description of resolution]
+                ===END_CONCLUSION===
+                ```
+
+                This conclusion will be extracted and placed at the TOP of the PR description.
+
+                Begin now.
+                """;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public override void WriteDockerfile( TextWriter writer )`
`30`	`30`	Rename-Item "C:\node-v{{version}}-win-x64" "C:\nodejs"; `
`31`	`31`	`Remove-Item node.zip`
`32`	`32`
`33`		`- ENV NPM_CONFIG_PREFIX=C:\\npm`
`34`		`- ENV PATH="C:\nodejs;C:\\npm;${PATH}"`
	`33`	`+ ENV NPM_CONFIG_PREFIX=C:\npm`
	`34`	`+ ENV PATH="C:\nodejs;C:\npm;${PATH}"`
`35`	`35`	`""" );`
`36`	`36`	`}`
`37`	`37`	`}`