Merge remote-tracking branch 'continuedev/main' into llm-object-config-merge-main

1 files changed, 11 insertions, 3 deletions

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 44fb3b60..50a2783a 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -463,15 +463,13 @@ export async function startContinuePythonServer() {
 
     const command = `cd "${serverPath()}" && ${activateCmd} && cd .. && ${pythonCmd} -m server.run_continue_server`;
 
-    console.log("Starting Continue python server...");
-
     return new Promise(async (resolve, reject) => {
+      console.log("Starting Continue python server...");
       try {
         const child = spawn(command, {
           shell: true,
         });
         child.stderr.on("data", (data: any) => {
-          console.log(`stdout: ${data}`);
           if (
             data.includes("Uvicorn running on") || // Successfully started the server
             data.includes("only one usage of each socket address") || // [windows] The server is already running (probably a simultaneously opened VS Code window)
@@ -481,12 +479,22 @@ export async function startContinuePythonServer() {
             resolve(null);
           } else if (data.includes("ERROR") || data.includes("Traceback")) {
             console.log("Error starting Continue python server: ", data);
+          } else {
+            console.log(`stdout: ${data}`);
           }
         });
         child.on("error", (error: any) => {
           console.log(`error: ${error.message}`);
         });
 
+        child.on("close", (code: any) => {
+          console.log(`child process exited with code ${code}`);
+        });
+
+        child.stdout.on("data", (data: any) => {
+          console.log(`stdout: ${data}`);
+        });
+
         // Write the current version of vscode to a file called server_version.txt
         fs.writeFileSync(serverVersionPath(), getExtensionVersion());
       } catch (e) {