Merge remote-tracking branch 'refs/remotes/origin/main'

Author: brunoborges

fix-test-harness.patch

@@ -0,0 +1,22 @@
+--- a/test/harness/replayingCapiProxy.ts
++++ b/test/harness/replayingCapiProxy.ts
+@@ -533,7 +533,17 @@ export function createReplayingCapiProxyForTest(
+ async function parseHttpExchange(
+   requestBody: string,
+   responseBody: string | undefined,
+ ): Promise<ParsedHttpExchange> {
+-  const request = JSON.parse(requestBody) as ChatCompletionCreateParamsBase;
++  if (!requestBody || requestBody.trim() === '') {
++    throw new Error('Empty request body provided to parseHttpExchange');
++  }
++  
++  let request: ChatCompletionCreateParamsBase;
++  try {
++    request = JSON.parse(requestBody) as ChatCompletionCreateParamsBase;
++  } catch (error) {
++    throw new Error(`Failed to parse request body as JSON: ${error}. Body: "${requestBody}"`);
++  }
++  
+   const response = await parseOpenAIResponse(responseBody);
+   return { request, response };
+ }

pom.xml

@@ -125,6 +125,29 @@
                             </successCodes>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>fix-test-harness-json-parsing</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>patch</executable>
+                            <workingDirectory>${copilot.sdk.clone.dir}</workingDirectory>
+                            <arguments>
+                                <argument>-p1</argument>
+                                <argument>-N</argument>  <!-- Don't apply if already applied -->
+                                <argument>-r</argument>
+                                <argument>-</argument>   <!-- Don't create reject files -->
+                                <argument>-i</argument>
+                                <argument>${project.basedir}/fix-test-harness.patch</argument>
+                            </arguments>
+                            <successCodes>
+                                <successCode>0</successCode>
+                                <successCode>1</successCode> <!-- Patch already applied -->
+                            </successCodes>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>install-harness-dependencies</id>
                         <phase>generate-test-resources</phase>