From f8bc06261464cd46c31a23cc8cbc0e76fb642d18 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 21 Jun 2023 08:47:06 -0700
Subject: purging old extension code

---
 extension/src/activation/activate.ts        |   4 +-
 extension/src/commands.ts                   |  91 +--------------
 extension/src/debugPanel.ts                 | 170 +---------------------------
 extension/src/decorations.ts                |  97 ----------------
 extension/src/lang-server/codeLens.ts       |  34 +-----
 extension/src/languages/index.d.ts          |  13 ---
 extension/src/languages/index.ts            |  19 ----
 extension/src/languages/javascript/index.ts |  16 ---
 extension/src/languages/notImplemented.ts   |  10 --
 extension/src/languages/python/index.ts     |  74 ------------
 10 files changed, 6 insertions(+), 522 deletions(-)
 delete mode 100644 extension/src/languages/index.d.ts
 delete mode 100644 extension/src/languages/index.ts
 delete mode 100644 extension/src/languages/javascript/index.ts
 delete mode 100644 extension/src/languages/notImplemented.ts
 delete mode 100644 extension/src/languages/python/index.ts

(limited to 'extension/src')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 32726c86..bfe9ab3f 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -2,12 +2,10 @@ import * as vscode from "vscode";
 import { registerAllCommands } from "../commands";
 import { registerAllCodeLensProviders } from "../lang-server/codeLens";
 import { sendTelemetryEvent, TelemetryEvent } from "../telemetry";
-import { getExtensionUri } from "../util/vscode";
-import * as path from "path";
 // import { openCapturedTerminal } from "../terminal/terminalEmulator";
 import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
-import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
+import { ContinueGUIWebviewViewProvider } from "../debugPanel";
 import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 22e15c43..13357c99 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -3,7 +3,6 @@ import {
   decorationManager,
   showAnswerInTextEditor,
   showGutterSpinner,
-  writeAndShowUnitTest,
 } from "./decorations";
 import {
   acceptSuggestionCommand,
@@ -12,19 +11,9 @@ import {
   suggestionUpCommand,
 } from "./suggestions";
 import * as bridge from "./bridge";
-import { debugPanelWebview, setupDebugPanel } from "./debugPanel";
-// import { openCapturedTerminal } from "./terminal/terminalEmulator";
-import { getRightViewColumn } from "./util/vscode";
-import {
-  findSuspiciousCode,
-  runPythonScript,
-  writeUnitTestForFunction,
-} from "./bridge";
+import { debugPanelWebview } from "./debugPanel";
+import { writeUnitTestForFunction } from "./bridge";
 import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
-import { getLanguageLibrary } from "./languages";
-import { SerializedDebugContext } from "./client";
-import { addFileSystemToDebugContext } from "./util/util";
-import { ideProtocolClient } from "./activation/activate";
 
 // Copy everything over from extension.ts
 const commandsMap: { [command: string]: (...args: any) => any } = {
@@ -71,68 +60,9 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
     // Happens in webview resolution function
     // openCapturedTerminal();
   },
-  "continue.findSuspiciousCode": async (
-    debugContext: SerializedDebugContext
-  ) => {
-    vscode.window.withProgress(
-      {
-        location: vscode.ProgressLocation.Notification,
-        title: "Finding suspicious code",
-        cancellable: false,
-      },
-      async (progress, token) => {
-        let suspiciousCode = await findSuspiciousCode(debugContext);
-        debugContext.rangesInFiles = suspiciousCode;
-        let { filesystem } = addFileSystemToDebugContext(debugContext);
-        debugPanelWebview?.postMessage({
-          type: "findSuspiciousCode",
-          codeLocations: suspiciousCode,
-          filesystem,
-        });
-      }
-    );
-  },
-  "continue.debugTest": async (fileAndFunctionSpecifier: string) => {
-    sendTelemetryEvent(TelemetryEvent.AutoDebugThisTest);
-    let editor = vscode.window.activeTextEditor;
-    if (editor) editor.document.save();
-    let { stdout } = await runPythonScript("run_unit_test.py", [
-      fileAndFunctionSpecifier,
-    ]);
-    let traceback = getLanguageLibrary(
-      fileAndFunctionSpecifier.split("::")[0]
-    ).parseFirstStacktrace(stdout);
-    if (!traceback) {
-      vscode.window.showInformationMessage("The test passes!");
-      return;
-    }
-    vscode.commands.executeCommand("continue.openContinueGUI").then(() => {
-      setTimeout(() => {
-        debugPanelWebview?.postMessage({
-          type: "traceback",
-          value: traceback,
-        });
-      }, 500);
-    });
-  },
 };
 
 const textEditorCommandsMap: { [command: string]: (...args: any) => {} } = {
-  "continue.writeUnitTest": async (editor: vscode.TextEditor) => {
-    let position = editor.selection.active;
-
-    let gutterSpinnerKey = showGutterSpinner(editor, position.line);
-    try {
-      let test = await writeUnitTestForFunction(
-        editor.document.fileName,
-        position
-      );
-      writeAndShowUnitTest(editor.document.fileName, test);
-    } catch {
-    } finally {
-      decorationManager.deleteDecoration(gutterSpinnerKey);
-    }
-  },
   "continue.writeDocstring": async (editor: vscode.TextEditor, _) => {
     sendTelemetryEvent(TelemetryEvent.GenerateDocstring);
     let gutterSpinnerKey = showGutterSpinner(
@@ -199,20 +129,3 @@ async function answerQuestion(
     }
   );
 }
-
-// async function suggestFixForAllWorkspaceProblems() {
-// Something like this, just figure out the loops for diagnostics vs problems
-// let problems = vscode.languages.getDiagnostics();
-// let codeSuggestions = await Promise.all(problems.map((problem) => {
-//   return bridge.suggestFixForProblem(problem[0].fsPath, problem[1]);
-// }));
-// for (const [uri, diagnostics] of problems) {
-//   for (let i = 0; i < diagnostics.length; i++) {
-//     let diagnostic = diagnostics[i];
-//     let suggestedCode = codeSuggestions[i];
-//     // If you're going to do this for a bunch of files at once, it will show the unsaved icon in the tab
-//     // BUT it would be better to have a single window to review all edits
-//     showSuggestion(uri.fsPath, diagnostic.range, suggestedCode)
-//   }
-// }
-// }
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index bb98eb46..232203b9 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -1,21 +1,11 @@
 import * as vscode from "vscode";
-import {
-  debugApi,
-  getContinueServerUrl,
-  runPythonScript,
-  unittestApi,
-} from "./bridge";
-import { writeAndShowUnitTest } from "./decorations";
-import { showSuggestion } from "./suggestions";
-import { getLanguageLibrary } from "./languages";
+import { getContinueServerUrl } from "./bridge";
 import {
   getExtensionUri,
   getNonce,
   openEditorAndRevealRange,
 } from "./util/vscode";
-import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
-import { RangeInFile, SerializedDebugContext } from "./client";
-import { addFileSystemToDebugContext } from "./util/util";
+import { RangeInFile } from "./client";
 const WebSocket = require("ws");
 
 class StreamManager {
@@ -273,71 +263,6 @@ export function setupDebugPanel(
         connection.send(data.message);
         break;
       }
-      case "listTenThings": {
-        sendTelemetryEvent(TelemetryEvent.GenerateIdeas);
-        let resp = await debugApi.listtenDebugListPost({
-          serializedDebugContext: data.debugContext,
-        });
-        panel.webview.postMessage({
-          type: "listTenThings",
-          value: resp.completion,
-        });
-        break;
-      }
-      case "suggestFix": {
-        let completion: string;
-        let codeSelection = data.debugContext.rangesInFiles?.at(0);
-        if (codeSelection) {
-          completion = (
-            await debugApi.inlineDebugInlinePost({
-              inlineBody: {
-                filecontents: await vscode.workspace.fs
-                  .readFile(vscode.Uri.file(codeSelection.filepath))
-                  .toString(),
-                startline: codeSelection.range.start.line,
-                endline: codeSelection.range.end.line,
-                traceback: data.debugContext.traceback,
-              },
-            })
-          ).completion;
-        } else if (data.debugContext.traceback) {
-          completion = (
-            await debugApi.suggestionDebugSuggestionGet({
-              traceback: data.debugContext.traceback,
-            })
-          ).completion;
-        } else {
-          break;
-        }
-        panel.webview.postMessage({
-          type: "suggestFix",
-          value: completion,
-        });
-        break;
-      }
-      case "findSuspiciousCode": {
-        let traceback = getLanguageLibrary(".py").parseFirstStacktrace(
-          data.debugContext.traceback
-        );
-        if (traceback === undefined) return;
-        vscode.commands.executeCommand(
-          "continue.findSuspiciousCode",
-          data.debugContext
-        );
-        break;
-      }
-      case "queryEmbeddings": {
-        let { results } = await runPythonScript("index.py query", [
-          data.query,
-          2,
-          vscode.workspace.workspaceFolders?.[0].uri.fsPath,
-        ]);
-        panel.webview.postMessage({
-          type: "queryEmbeddings",
-          results,
-        });
-        break;
-      }
       case "openFile": {
         openEditorAndRevealRange(data.path, undefined, vscode.ViewColumn.One);
         break;
@@ -351,20 +276,6 @@ export function setupDebugPanel(
         streamManager.closeStream();
         break;
       }
-      case "explainCode": {
-        sendTelemetryEvent(TelemetryEvent.ExplainCode);
-        let debugContext: SerializedDebugContext = addFileSystemToDebugContext(
-          data.debugContext
-        );
-        let resp = await debugApi.explainDebugExplainPost({
-          serializedDebugContext: debugContext,
-        });
-        panel.webview.postMessage({
-          type: "explainCode",
-          value: resp.completion,
-        });
-        break;
-      }
       case "withProgress": {
         // This message allows withProgress to be used in the webview
         if (data.done) {
@@ -395,83 +306,6 @@ export function setupDebugPanel(
         );
         break;
       }
-      case "makeEdit": {
-        sendTelemetryEvent(TelemetryEvent.SuggestFix);
-        let suggestedEdits = data.edits;
-
-        if (
-          typeof suggestedEdits === "undefined" ||
-          suggestedEdits.length === 0
-        ) {
-          vscode.window.showInformationMessage(
-            "Continue couldn't find a fix for this error."
-          );
-          return;
-        }
-
-        for (let i = 0; i < suggestedEdits.length; i++) {
-          let edit = suggestedEdits[i];
-          await showSuggestion(
-            edit.filepath,
-            new vscode.Range(
-              edit.range.start.line,
-              edit.range.start.character,
-              edit.range.end.line,
-              edit.range.end.character
-            ),
-            edit.replacement
-          );
-        }
-        break;
-      }
-      case "generateUnitTest": {
-        sendTelemetryEvent(TelemetryEvent.CreateTest);
-        vscode.window.withProgress(
-          {
-            location: vscode.ProgressLocation.Notification,
-            title: "Generating Unit Test...",
-            cancellable: false,
-          },
-          async () => {
-            for (let i = 0; i < data.debugContext.rangesInFiles?.length; i++) {
-              let codeSelection = data.debugContext.rangesInFiles?.at(i);
-              if (
-                codeSelection &&
-                codeSelection.filepath &&
-                codeSelection.range
-              ) {
-                try {
-                  let filecontents = (
-                    await vscode.workspace.fs.readFile(
-                      vscode.Uri.file(codeSelection.filepath)
-                    )
-                  ).toString();
-                  let resp =
-                    await unittestApi.failingtestUnittestFailingtestPost({
-                      failingTestBody: {
-                        fp: {
-                          filecontents,
-                          lineno: codeSelection.range.end.line,
-                        },
-                        description: data.debugContext.description || "",
-                      },
-                    });
-
-                  if (resp.completion) {
-                    let decorationKey = await writeAndShowUnitTest(
-                      codeSelection.filepath,
-                      resp.completion
-                    );
-                    break;
-                  }
-                } catch {}
-              }
-            }
-          }
-        );
-
-        break;
-      }
     }
   });
 
diff --git a/extension/src/decorations.ts b/extension/src/decorations.ts
index d2c94135..0587110c 100644
--- a/extension/src/decorations.ts
+++ b/extension/src/decorations.ts
@@ -1,7 +1,5 @@
 import * as vscode from "vscode";
-import { getRightViewColumn, getTestFile } from "./util/vscode";
 import * as path from "path";
-import { getLanguageLibrary } from "./languages";
 
 export function showAnswerInTextEditor(
   filename: string,
@@ -223,98 +221,3 @@ export function highlightCode(
 
   return key;
 }
-
-// Show unit test
-const pythonImportDistinguisher = (line: string): boolean => {
-  if (line.startsWith("from") || line.startsWith("import")) {
-    return true;
-  }
-  return false;
-};
-const javascriptImportDistinguisher = (line: string): boolean => {
-  if (line.startsWith("import")) {
-    return true;
-  }
-  return false;
-};
-const importDistinguishersMap: {
-  [fileExtension: string]: (line: string) => boolean;
-} = {
-  js: javascriptImportDistinguisher,
-  ts: javascriptImportDistinguisher,
-  py: pythonImportDistinguisher,
-};
-function getImportsFromFileString(
-  fileString: string,
-  importDistinguisher: (line: string) => boolean
-): Set<string> {
-  let importLines = new Set<string>();
-  for (let line of fileString.split("\n")) {
-    if (importDistinguisher(line)) {
-      importLines.add(line);
-    }
-  }
-  return importLines;
-}
-function removeRedundantLinesFrom(
-  fileContents: string,
-  linesToRemove: Set<string>
-): string {
-  let fileLines = fileContents.split("\n");
-  fileLines = fileLines.filter((line: string) => {
-    return !linesToRemove.has(line);
-  });
-  return fileLines.join("\n");
-}
-
-export async function writeAndShowUnitTest(
-  filename: string,
-  test: string
-): Promise<DecorationKey> {
-  return new Promise((resolve, reject) => {
-    let testFilename = getTestFile(filename, true);
-    vscode.workspace.openTextDocument(testFilename).then((doc) => {
-      let fileContent = doc.getText();
-      let fileEmpty = fileContent.trim() === "";
-      let existingImportLines = getImportsFromFileString(
-        fileContent,
-        importDistinguishersMap[doc.fileName.split(".").at(-1) || ".py"]
-      );
-
-      // Remove redundant imports, make sure pytest is there
-      test = removeRedundantLinesFrom(test, existingImportLines);
-      test =
-        (fileEmpty
-          ? `${getLanguageLibrary(".py").writeImport(
-              testFilename,
-              filename
-            )}\nimport pytest\n\n`
-          : "\n\n") +
-        test.trim() +
-        "\n";
-
-      vscode.window
-        .showTextDocument(doc, getRightViewColumn())
-        .then((editor) => {
-          let lastLine = editor.document.lineAt(editor.document.lineCount - 1);
-          let testRange = new vscode.Range(
-            lastLine.range.end,
-            new vscode.Position(
-              test.split("\n").length + lastLine.range.end.line,
-              0
-            )
-          );
-          editor
-            .edit((edit) => {
-              edit.insert(lastLine.range.end, test);
-              return true;
-            })
-            .then((success) => {
-              if (!success) reject("Failed to insert test");
-              let key = highlightCode(editor, testRange);
-              resolve(key);
-            });
-        });
-    });
-  });
-}
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 2a362b62..26528d96 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -1,5 +1,4 @@
 import * as vscode from "vscode";
-import { getLanguageLibrary } from "../languages";
 import { editorToSuggestions } from "../suggestions";
 
 class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
@@ -52,40 +51,9 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
   }
 }
 
-class PytestCodeLensProvider implements vscode.CodeLensProvider {
-  public provideCodeLenses(
-    document: vscode.TextDocument,
-    token: vscode.CancellationToken
-  ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
-    let codeLenses: vscode.CodeLens[] = [];
-    let lineno = 1;
-    let languageLibrary = getLanguageLibrary(document.fileName);
-    for (let line of document.getText().split("\n")) {
-      if (
-        languageLibrary.lineIsFunctionDef(line) &&
-        languageLibrary.parseFunctionDefForName(line).startsWith("test_")
-      ) {
-        let functionToTest = languageLibrary.parseFunctionDefForName(line);
-        let fileAndFunctionNameSpecifier =
-          document.fileName + "::" + functionToTest;
-        codeLenses.push(
-          new vscode.CodeLens(new vscode.Range(lineno, 0, lineno, 1), {
-            title: "Debug This Test",
-            command: "continue.debugTest",
-            arguments: [fileAndFunctionNameSpecifier],
-          })
-        );
-      }
-      lineno++;
-    }
-
-    return codeLenses;
-  }
-}
-
 const allCodeLensProviders: { [langauge: string]: vscode.CodeLensProvider[] } =
   {
-    python: [new SuggestionsCodeLensProvider(), new PytestCodeLensProvider()],
+    python: [new SuggestionsCodeLensProvider()],
   };
 
 export function registerAllCodeLensProviders(context: vscode.ExtensionContext) {
diff --git a/extension/src/languages/index.d.ts b/extension/src/languages/index.d.ts
deleted file mode 100644
index be7ddfbc..00000000
--- a/extension/src/languages/index.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface LanguageLibrary {
-  language: string;
-  fileExtensions: string[];
-  parseFirstStacktrace: (stdout: string) => string | undefined;
-  lineIsFunctionDef: (line: string) => boolean;
-  parseFunctionDefForName: (line: string) => string;
-  lineIsComment: (line: string) => boolean;
-  writeImport: (
-    sourcePath: string,
-    pathToImport: string,
-    namesToImport?: string[] | undefined
-  ) => string;
-}
diff --git a/extension/src/languages/index.ts b/extension/src/languages/index.ts
deleted file mode 100644
index 31d73a0b..00000000
--- a/extension/src/languages/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import pythonLanguageLibrary from "./python";
-import javascriptLanguageLibrary from "./javascript";
-import { LanguageLibrary } from "./index.d";
-
-export const languageLibraries: LanguageLibrary[] = [
-  pythonLanguageLibrary,
-  javascriptLanguageLibrary,
-];
-
-export function getLanguageLibrary(filepath: string): LanguageLibrary {
-  for (let languageLibrary of languageLibraries) {
-    for (let fileExtension of languageLibrary.fileExtensions) {
-      if (filepath.endsWith(fileExtension)) {
-        return languageLibrary;
-      }
-    }
-  }
-  throw new Error(`No language library found for file ${filepath}`);
-}
diff --git a/extension/src/languages/javascript/index.ts b/extension/src/languages/javascript/index.ts
deleted file mode 100644
index 1c21a2fc..00000000
--- a/extension/src/languages/javascript/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { LanguageLibrary } from "../index.d";
-import { notImplemented } from "../notImplemented";
-
-const NI = (propertyName: string) => notImplemented(propertyName, "javascript");
-
-const javascriptLangaugeLibrary: LanguageLibrary = {
-  language: "javascript",
-  fileExtensions: [".js", ".jsx", ".ts", ".tsx"],
-  parseFirstStacktrace: NI("parseFirstStacktrace"),
-  lineIsFunctionDef: NI("lineIsFunctionDef"),
-  parseFunctionDefForName: NI("parseFunctionDefForName"),
-  lineIsComment: NI("lineIsComment"),
-  writeImport: NI("writeImport"),
-};
-
-export default javascriptLangaugeLibrary;
diff --git a/extension/src/languages/notImplemented.ts b/extension/src/languages/notImplemented.ts
deleted file mode 100644
index bbba2382..00000000
--- a/extension/src/languages/notImplemented.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export function notImplemented(
-  propertyName: string,
-  langauge: string
-): (...args: any[]) => never {
-  return (...args: any[]) => {
-    throw new Error(
-      `Property ${propertyName} not implemented for language ${langauge}.`
-    );
-  };
-}
diff --git a/extension/src/languages/python/index.ts b/extension/src/languages/python/index.ts
deleted file mode 100644
index 50282b45..00000000
--- a/extension/src/languages/python/index.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import path = require("path");
-import { LanguageLibrary } from "../index.d";
-
-const tracebackStart = "Traceback (most recent call last):";
-const tracebackEnd = (buf: string): string | undefined => {
-  let lines = buf
-    .split("\n")
-    .filter((line: string) => line.trim() !== "~~^~~")
-    .filter((line: string) => line.trim() !== "");
-  for (let i = 0; i < lines.length; i++) {
-    if (
-      lines[i].startsWith("  File") &&
-      i + 2 < lines.length &&
-      lines[i + 2][0] !== " "
-    ) {
-      return lines.slice(0, i + 3).join("\n");
-    }
-  }
-  return undefined;
-};
-
-function parseFirstStacktrace(stdout: string): string | undefined {
-  let startIdx = stdout.indexOf(tracebackStart);
-  if (startIdx < 0) return undefined;
-  stdout = stdout.substring(startIdx);
-  return tracebackEnd(stdout);
-}
-
-function lineIsFunctionDef(line: string): boolean {
-  return line.startsWith("def ");
-}
-
-function parseFunctionDefForName(line: string): string {
-  return line.split("def ")[1].split("(")[0];
-}
-
-function lineIsComment(line: string): boolean {
-  return line.trim().startsWith("#");
-}
-
-function writeImport(
-  sourcePath: string,
-  pathToImport: string,
-  namesToImport: string[] | undefined = undefined
-): string {
-  let segs = path.relative(sourcePath, pathToImport).split(path.sep);
-  let importFrom = "";
-  for (let seg of segs) {
-    if (seg === "..") {
-      importFrom = "." + importFrom;
-    } else {
-      if (!importFrom.endsWith(".")) {
-        importFrom += ".";
-      }
-      importFrom += seg.split(".").slice(0, -1).join(".");
-    }
-  }
-
-  return `from ${importFrom} import ${
-    namesToImport ? namesToImport.join(", ") : "*"
-  }`;
-}
-
-const pythonLangaugeLibrary: LanguageLibrary = {
-  language: "python",
-  fileExtensions: [".py"],
-  parseFirstStacktrace,
-  lineIsFunctionDef,
-  parseFunctionDefForName,
-  lineIsComment,
-  writeImport,
-};
-
-export default pythonLangaugeLibrary;
-- 
cgit v1.2.3-70-g09d2


From cc7ef4631f8f1bd141788c8e3117df1aca16b308 Mon Sep 17 00:00:00 2001
From: Ty Dunn <ty@tydunn.com>
Date: Wed, 21 Jun 2023 15:02:20 -0700
Subject: removing captured terminal

---
 extension/src/activation/activate.ts | 37 +++---------------------------------
 extension/src/commands.ts            |  5 -----
 extension/src/continueIdeClient.ts   | 14 +++-----------
 3 files changed, 6 insertions(+), 50 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 32726c86..34abdff7 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -8,7 +8,7 @@ import * as path from "path";
 import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
 import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
-import { CapturedTerminal } from "../terminal/terminalEmulator";
+// import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
@@ -49,41 +49,10 @@ export function activateExtension(
   })();
 
   // All opened terminals should be replaced by our own terminal
-  vscode.window.onDidOpenTerminal((terminal) => {
-    if (terminal.name === "Continue") {
-      return;
-    }
-    const options = terminal.creationOptions;
-    const capturedTerminal = new CapturedTerminal({
-      ...options,
-      name: "Continue",
-    });
-    terminal.dispose();
-    if (!ideProtocolClient.continueTerminal) {
-      ideProtocolClient.continueTerminal = capturedTerminal;
-    }
-  });
+  // vscode.window.onDidOpenTerminal((terminal) => {});
 
   // If any terminals are open to start, replace them
-  vscode.window.terminals.forEach((terminal) => {
-    if (terminal.name === "Continue") {
-      return;
-    }
-    const options = terminal.creationOptions;
-    const capturedTerminal = new CapturedTerminal(
-      {
-        ...options,
-        name: "Continue",
-      },
-      (commandOutput: string) => {
-        ideProtocolClient.sendCommandOutput(commandOutput);
-      }
-    );
-    terminal.dispose();
-    if (!ideProtocolClient.continueTerminal) {
-      ideProtocolClient.continueTerminal = capturedTerminal;
-    }
-  });
+  // vscode.window.terminals.forEach((terminal) => {}
 
   extensionContext = context;
 }
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 22e15c43..291a3ceb 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -13,7 +13,6 @@ import {
 } from "./suggestions";
 import * as bridge from "./bridge";
 import { debugPanelWebview, setupDebugPanel } from "./debugPanel";
-// import { openCapturedTerminal } from "./terminal/terminalEmulator";
 import { getRightViewColumn } from "./util/vscode";
 import {
   findSuspiciousCode,
@@ -67,10 +66,6 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
       type: "focusContinueInput",
     });
   },
-  "continue.openCapturedTerminal": () => {
-    // Happens in webview resolution function
-    // openCapturedTerminal();
-  },
   "continue.findSuspiciousCode": async (
     debugContext: SerializedDebugContext
   ) => {
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index fbad5f5d..202077de 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -12,7 +12,6 @@ import { debugPanelWebview, setupDebugPanel } from "./debugPanel";
 import { FileEditWithFullContents } from "../schema/FileEditWithFullContents";
 import fs = require("fs");
 import { WebsocketMessenger } from "./util/messenger";
-import { CapturedTerminal } from "./terminal/terminalEmulator";
 import { decorationManager } from "./decorations";
 
 class IdeProtocolClient {
@@ -326,17 +325,10 @@ class IdeProtocolClient {
     return rangeInFiles;
   }
 
-  public continueTerminal: CapturedTerminal | undefined;
-
   async runCommand(command: string) {
-    if (!this.continueTerminal || this.continueTerminal.isClosed()) {
-      this.continueTerminal = new CapturedTerminal({
-        name: "Continue",
-      });
-    }
-
-    this.continueTerminal.show();
-    return await this.continueTerminal.runCommand(command);
+    const terminal = vscode.window.createTerminal();
+    terminal.show();
+    terminal.sendText(command);
   }
 
   sendCommandOutput(output: string) {
-- 
cgit v1.2.3-70-g09d2


From 24198f9724fbc42b128d93fcb612bcd60f1837e1 Mon Sep 17 00:00:00 2001
From: Ty Dunn <ty@tydunn.com>
Date: Wed, 21 Jun 2023 21:36:24 -0700
Subject: run existing terminal if possible

---
 extension/src/continueIdeClient.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 202077de..3a77e348 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -326,9 +326,13 @@ class IdeProtocolClient {
   }
 
   async runCommand(command: string) {
-    const terminal = vscode.window.createTerminal();
-    terminal.show();
-    terminal.sendText(command);
+    if (vscode.window.terminals.length) {
+      vscode.window.terminals[0].sendText(command);
+    } else {
+        const terminal = vscode.window.createTerminal();
+        terminal.show();
+        terminal.sendText(command);
+    }
   }
 
   sendCommandOutput(output: string) {
-- 
cgit v1.2.3-70-g09d2


From cfee19c8faad0eb5216e49f174e27aeb388e7830 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Thu, 22 Jun 2023 17:02:50 -0700
Subject: added continue retro button icon

---
 extension/react-app/src/components/ContinueButton.tsx | 13 +++++++++++--
 extension/react-app/src/components/DebugPanel.tsx     |  2 ++
 extension/react-app/src/redux/slices/configSlice.ts   | 16 ++++++++++++++--
 extension/react-app/src/redux/store.ts                |  1 +
 extension/src/debugPanel.ts                           |  4 ++++
 5 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'extension/src')

diff --git a/extension/react-app/src/components/ContinueButton.tsx b/extension/react-app/src/components/ContinueButton.tsx
index c6117bf9..ef6719b7 100644
--- a/extension/react-app/src/components/ContinueButton.tsx
+++ b/extension/react-app/src/components/ContinueButton.tsx
@@ -1,6 +1,8 @@
 import styled, { keyframes } from "styled-components";
 import { Button } from ".";
 import { Play } from "@styled-icons/heroicons-outline";
+import { useSelector } from "react-redux";
+import { RootStore } from "../redux/store";
 
 let StyledButton = styled(Button)`
   margin: auto;
@@ -25,14 +27,21 @@ let StyledButton = styled(Button)`
 `;
 
 function ContinueButton(props: { onClick?: () => void; hidden?: boolean }) {
+  const vscMediaUrl = useSelector(
+    (state: RootStore) => state.config.vscMediaUrl
+  );
+
   return (
     <StyledButton
       hidden={props.hidden}
       className="m-auto"
       onClick={props.onClick}
     >
-      <Play />
-      {/* <img src={"/continue_arrow.png"} width="16px"></img> */}
+      {vscMediaUrl ? (
+        <img src={`${vscMediaUrl}/play_button.png`} width="22px" />
+      ) : (
+        <Play />
+      )}
       Continue
     </StyledButton>
   );
diff --git a/extension/react-app/src/components/DebugPanel.tsx b/extension/react-app/src/components/DebugPanel.tsx
index 30f38779..94dbac9e 100644
--- a/extension/react-app/src/components/DebugPanel.tsx
+++ b/extension/react-app/src/components/DebugPanel.tsx
@@ -6,6 +6,7 @@ import {
   setApiUrl,
   setVscMachineId,
   setSessionId,
+  setVscMediaUrl,
 } from "../redux/slices/configSlice";
 import { setHighlightedCode } from "../redux/slices/miscSlice";
 import { updateFileSystem } from "../redux/slices/debugContexSlice";
@@ -37,6 +38,7 @@ function DebugPanel(props: DebugPanelProps) {
           dispatch(setApiUrl(event.data.apiUrl));
           dispatch(setVscMachineId(event.data.vscMachineId));
           dispatch(setSessionId(event.data.sessionId));
+          dispatch(setVscMediaUrl(event.data.vscMediaUrl));
           break;
         case "highlightedCode":
           dispatch(setHighlightedCode(event.data.rangeInFile));
diff --git a/extension/react-app/src/redux/slices/configSlice.ts b/extension/react-app/src/redux/slices/configSlice.ts
index a6a641e6..1b107bed 100644
--- a/extension/react-app/src/redux/slices/configSlice.ts
+++ b/extension/react-app/src/redux/slices/configSlice.ts
@@ -37,9 +37,21 @@ export const configSlice = createSlice({
       ...state,
       sessionId: action.payload,
     }),
+    setVscMediaUrl: (
+      state: RootStore["config"],
+      action: { type: string; payload: string }
+    ) => ({
+      ...state,
+      vscMediaUrl: action.payload,
+    }),
   },
 });
 
-export const { setVscMachineId, setApiUrl, setWorkspacePath, setSessionId } =
-  configSlice.actions;
+export const {
+  setVscMachineId,
+  setApiUrl,
+  setWorkspacePath,
+  setSessionId,
+  setVscMediaUrl,
+} = configSlice.actions;
 export default configSlice.reducer;
diff --git a/extension/react-app/src/redux/store.ts b/extension/react-app/src/redux/store.ts
index f9eb0517..a5eef4ba 100644
--- a/extension/react-app/src/redux/store.ts
+++ b/extension/react-app/src/redux/store.ts
@@ -21,6 +21,7 @@ export interface RootStore {
     vscMachineId: string | undefined;
     sessionId: string | undefined;
     sessionStarted: number | undefined;
+    vscMediaUrl: string | undefined;
   };
   chat: {
     messages: ChatMessage[];
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index 232203b9..b0db590a 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -136,6 +136,9 @@ export function setupDebugPanel(
   let extensionUri = getExtensionUri();
   let scriptUri: string;
   let styleMainUri: string;
+  let vscMediaUrl: string = debugPanelWebview
+    .asWebviewUri(vscode.Uri.joinPath(extensionUri, "react-app/dist"))
+    .toString();
 
   const isProduction = true; // context?.extensionMode === vscode.ExtensionMode.Development;
   if (!isProduction) {
@@ -226,6 +229,7 @@ export function setupDebugPanel(
           vscMachineId: vscode.env.machineId,
           apiUrl: getContinueServerUrl(),
           sessionId,
+          vscMediaUrl,
         });
 
         // // Listen for changes to server URL in settings
-- 
cgit v1.2.3-70-g09d2


From 2d37d2bd1ee8022aa4eb5db1285c50feced14771 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sun, 25 Jun 2023 14:19:07 -0700
Subject: run locally without interference

---
 extension/src/activation/activate.ts         | 12 ++++++------
 extension/src/activation/environmentSetup.ts |  2 +-
 extension/src/extension.ts                   |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index c4bdbaa9..0c92f095 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -7,24 +7,26 @@ import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
 import { CapturedTerminal } from "../terminal/terminalEmulator";
 import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
+import { startContinuePythonServer } from "./environmentSetup";
 // import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
 export let ideProtocolClient: IdeProtocolClient;
 
-export function activateExtension(
+export async function activateExtension(
   context: vscode.ExtensionContext,
   showTutorial: boolean
 ) {
-  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
+  extensionContext = context;
 
+  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
 
   // vscode.window.registerWebviewViewProvider("continue.continueGUIView", setupDebugPanel);
-
-  let serverUrl = getContinueServerUrl();
+  await startContinuePythonServer();
+  const serverUrl = getContinueServerUrl();
 
   ideProtocolClient = new IdeProtocolClient(
     `${serverUrl.replace("http", "ws")}/ide/ws`,
@@ -52,6 +54,4 @@ export function activateExtension(
 
   // If any terminals are open to start, replace them
   // vscode.window.terminals.forEach((terminal) => {}
-
-  extensionContext = context;
 }
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 593b727e..54c263bd 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -180,7 +180,7 @@ export async function startContinuePythonServer() {
   await setupPythonEnv();
 
   // Check vscode settings
-  let serverUrl = getContinueServerUrl();
+  const serverUrl = getContinueServerUrl();
   if (serverUrl !== "http://localhost:8000") {
     return;
   }
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index 88af0d19..de8f55e3 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -13,7 +13,7 @@ async function dynamicImportAndActivate(
   showTutorial: boolean
 ) {
   const { activateExtension } = await import("./activation/activate");
-  activateExtension(context, showTutorial);
+  await activateExtension(context, showTutorial);
 }
 
 export function activate(context: vscode.ExtensionContext) {
@@ -25,7 +25,6 @@ export function activate(context: vscode.ExtensionContext) {
       cancellable: false,
     },
     async () => {
-      await startContinuePythonServer();
       dynamicImportAndActivate(context, true);
     }
   );
-- 
cgit v1.2.3-70-g09d2


From cc96a49bc576bd25ccf338108d29540df3204de3 Mon Sep 17 00:00:00 2001
From: Ty Dunn <ty@tydunn.com>
Date: Sun, 25 Jun 2023 21:33:01 -0700
Subject: && -> ;

---
 extension/src/activation/environmentSetup.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 54c263bd..66e1c722 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -121,7 +121,7 @@ async function setupPythonEnv() {
     activateCmd,
     pipUpgradeCmd,
     `${pipCmd} install -r requirements.txt`,
-  ].join(" && ");
+  ].join(" ; ");
   const [, stderr] = await runCommand(installRequirementsCommand);
   if (stderr) {
     throw new Error(stderr);
@@ -199,7 +199,7 @@ export async function startContinuePythonServer() {
   let command = `cd ${path.join(
     getExtensionUri().fsPath,
     "scripts"
-  )} && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`;
+  )} ; ${activateCmd} ; cd .. ; ${pythonCmd} -m scripts.run_continue_server`;
 
   return new Promise(async (resolve, reject) => {
     try {
@@ -255,10 +255,10 @@ export async function downloadPython3() {
     throw new Error("python3 not found");
   } else if (os === "linux") {
     command =
-      "sudo apt update && upgrade && sudo apt install python3 python3-pip";
+      "sudo apt update ; upgrade ; sudo apt install python3 python3-pip";
   } else if (os === "win32") {
     command =
-      "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe && python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0";
+      "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe ; python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0";
     pythonCmd = "python";
   }
 
-- 
cgit v1.2.3-70-g09d2


From 45601fdd7cdcb4c7a229c11f7d9b381b86927856 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 26 Jun 2023 13:27:56 -0700
Subject: check for requirements installed separately of env

---
 extension/src/activation/environmentSetup.ts | 85 ++++++++++++++++------------
 1 file changed, 49 insertions(+), 36 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 66e1c722..364b6af2 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -77,54 +77,67 @@ function checkEnvExists() {
   );
 }
 
+function checkRequirementsInstalled() {
+  return fs.existsSync(
+    path.join(getExtensionUri().fsPath, "scripts", ".continue_env_installed")
+  );
+}
+
 async function setupPythonEnv() {
   console.log("Setting up python env for Continue extension...");
 
-  if (checkEnvExists()) return;
-
-  // Assemble the command to create the env
   const [pythonCmd, pipCmd] = await getPythonPipCommands();
   const [activateCmd, pipUpgradeCmd] = getActivateUpgradeCommands(
     pythonCmd,
     pipCmd
   );
-  const createEnvCommand = [
-    `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
-    `${pythonCmd} -m venv env`,
-  ].join("; ");
+  if (checkEnvExists()) {
+    console.log("Python env already exists, skipping...");
+  } else {
+    // Assemble the command to create the env
+    const createEnvCommand = [
+      `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
+      `${pythonCmd} -m venv env`,
+    ].join("; ");
 
-  // Repeat until it is successfully created (sometimes it fails to generate the bin, need to try again)
-  while (true) {
-    const [, stderr] = await runCommand(createEnvCommand);
-    if (stderr) {
-      throw new Error(stderr);
-    }
-    if (checkEnvExists()) {
-      break;
-    } else {
-      // Remove the env and try again
-      const removeCommand = `rm -rf ${path.join(
-        getExtensionUri().fsPath,
-        "scripts",
-        "env"
-      )}`;
-      await runCommand(removeCommand);
+    // Repeat until it is successfully created (sometimes it fails to generate the bin, need to try again)
+    while (true) {
+      const [, stderr] = await runCommand(createEnvCommand);
+      if (stderr) {
+        throw new Error(stderr);
+      }
+      if (checkEnvExists()) {
+        break;
+      } else {
+        // Remove the env and try again
+        const removeCommand = `rm -rf ${path.join(
+          getExtensionUri().fsPath,
+          "scripts",
+          "env"
+        )}`;
+        await runCommand(removeCommand);
+      }
     }
+    console.log(
+      "Successfully set up python env at ",
+      getExtensionUri().fsPath + "/scripts/env"
+    );
   }
-  console.log(
-    "Successfully set up python env at ",
-    getExtensionUri().fsPath + "/scripts/env"
-  );
 
-  const installRequirementsCommand = [
-    `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
-    activateCmd,
-    pipUpgradeCmd,
-    `${pipCmd} install -r requirements.txt`,
-  ].join(" ; ");
-  const [, stderr] = await runCommand(installRequirementsCommand);
-  if (stderr) {
-    throw new Error(stderr);
+  if (checkRequirementsInstalled()) {
+    console.log("Python requirements already installed, skipping...");
+  } else {
+    const installRequirementsCommand = [
+      `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
+      activateCmd,
+      pipUpgradeCmd,
+      `${pipCmd} install -r requirements.txt`,
+      "touch .continue_env_installed",
+    ].join(" ; ");
+    const [, stderr] = await runCommand(installRequirementsCommand);
+    if (stderr) {
+      throw new Error(stderr);
+    }
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 292d4d10ce28d720d61f97918c490b0d9cdae9e7 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 26 Jun 2023 14:50:04 -0700
Subject: retry setup patch

---
 extension/package-lock.json                        |   4 +-
 extension/package.json                             |   2 +-
 extension/react-app/src/tabs/gui.tsx               |   4 +-
 extension/scripts/.continue_env_installed          |   0
 extension/scripts/.gitignore                       |   4 +-
 .../scripts/continuedev-0.1.1-py3-none-any.whl     | Bin 89627 -> 0 bytes
 extension/src/activation/environmentSetup.ts       | 108 +++++++++++++--------
 7 files changed, 73 insertions(+), 49 deletions(-)
 delete mode 100644 extension/scripts/.continue_env_installed
 delete mode 100644 extension/scripts/continuedev-0.1.1-py3-none-any.whl

(limited to 'extension/src')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 98dfc223..fcd4c755 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.67",
+  "version": "0.0.70",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.67",
+      "version": "0.0.70",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index a51bb6d0..b56c60f4 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "Accelerating software development with language models",
-  "version": "0.0.67",
+  "version": "0.0.70",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.74.0"
diff --git a/extension/react-app/src/tabs/gui.tsx b/extension/react-app/src/tabs/gui.tsx
index 445d5700..13b74423 100644
--- a/extension/react-app/src/tabs/gui.tsx
+++ b/extension/react-app/src/tabs/gui.tsx
@@ -352,9 +352,7 @@ function GUI(props: GUIProps) {
         {typeof client === "undefined" && (
           <>
             <Loader></Loader>
-            <p style={{ textAlign: "center" }}>
-              Trying to reconnect with server...
-            </p>
+            <p style={{ textAlign: "center" }}>Loading Continue server...</p>
           </>
         )}
         {history?.timeline.map((node: HistoryNode, index: number) => {
diff --git a/extension/scripts/.continue_env_installed b/extension/scripts/.continue_env_installed
deleted file mode 100644
index e69de29b..00000000
diff --git a/extension/scripts/.gitignore b/extension/scripts/.gitignore
index 7af27c08..fbb3bf9f 100644
--- a/extension/scripts/.gitignore
+++ b/extension/scripts/.gitignore
@@ -1,3 +1,5 @@
 testdb
 env
-stdout.txt
\ No newline at end of file
+stdout.txt
+.continue_env_installed
+**.whl
\ No newline at end of file
diff --git a/extension/scripts/continuedev-0.1.1-py3-none-any.whl b/extension/scripts/continuedev-0.1.1-py3-none-any.whl
deleted file mode 100644
index 4d1c8fb2..00000000
Binary files a/extension/scripts/continuedev-0.1.1-py3-none-any.whl and /dev/null differ
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 364b6af2..25b6f643 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -7,6 +7,25 @@ import * as fs from "fs";
 import rebuild from "@electron/rebuild";
 import { getContinueServerUrl } from "../bridge";
 import fetch from "node-fetch";
+import * as vscode from "vscode";
+
+const MAX_RETRIES = 5;
+async function retryThenFail(
+  fn: () => Promise<any>,
+  retries: number = MAX_RETRIES
+): Promise<any> {
+  try {
+    return await fn();
+  } catch (e) {
+    if (retries > 0) {
+      return await retryThenFail(fn, retries - 1);
+    }
+    vscode.window.showErrorMessage(
+      "Failed to set up Continue extension. Please email nate@continue.dev and we'll get this fixed ASAP!"
+    );
+    throw e;
+  }
+}
 
 async function runCommand(cmd: string): Promise<[string, string | undefined]> {
   console.log("Running command: ", cmd);
@@ -91,6 +110,7 @@ async function setupPythonEnv() {
     pythonCmd,
     pipCmd
   );
+
   if (checkEnvExists()) {
     console.log("Python env already exists, skipping...");
   } else {
@@ -124,21 +144,23 @@ async function setupPythonEnv() {
     );
   }
 
-  if (checkRequirementsInstalled()) {
-    console.log("Python requirements already installed, skipping...");
-  } else {
-    const installRequirementsCommand = [
-      `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
-      activateCmd,
-      pipUpgradeCmd,
-      `${pipCmd} install -r requirements.txt`,
-      "touch .continue_env_installed",
-    ].join(" ; ");
-    const [, stderr] = await runCommand(installRequirementsCommand);
-    if (stderr) {
-      throw new Error(stderr);
+  await retryThenFail(async () => {
+    if (checkRequirementsInstalled()) {
+      console.log("Python requirements already installed, skipping...");
+    } else {
+      const installRequirementsCommand = [
+        `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
+        activateCmd,
+        pipUpgradeCmd,
+        `${pipCmd} install -r requirements.txt`,
+        "touch .continue_env_installed",
+      ].join(" ; ");
+      const [, stderr] = await runCommand(installRequirementsCommand);
+      if (stderr) {
+        throw new Error(stderr);
+      }
     }
-  }
+  });
 }
 
 function readEnvFile(path: string) {
@@ -198,10 +220,6 @@ export async function startContinuePythonServer() {
     return;
   }
 
-  console.log("Starting Continue python server...");
-
-  if (await checkServerRunning(serverUrl)) return;
-
   let activateCmd = ". env/bin/activate";
   let pythonCmd = "python3";
   if (process.platform == "win32") {
@@ -214,33 +232,39 @@ export async function startContinuePythonServer() {
     "scripts"
   )} ; ${activateCmd} ; cd .. ; ${pythonCmd} -m scripts.run_continue_server`;
 
-  return new Promise(async (resolve, reject) => {
-    try {
-      const child = spawn(command, {
-        shell: true,
-      });
-      child.stdout.on("data", (data: any) => {
-        console.log(`stdout: ${data}`);
-      });
-      child.stderr.on("data", (data: any) => {
-        console.log(`stderr: ${data}`);
-        if (data.includes("Uvicorn running on")) {
-          console.log("Successfully started Continue python server");
+  return await retryThenFail(async () => {
+    console.log("Starting Continue python server...");
+
+    if (await checkServerRunning(serverUrl)) return;
+
+    return new Promise(async (resolve, reject) => {
+      try {
+        const child = spawn(command, {
+          shell: true,
+        });
+        child.stdout.on("data", (data: any) => {
+          console.log(`stdout: ${data}`);
+        });
+        child.stderr.on("data", (data: any) => {
+          console.log(`stderr: ${data}`);
+          if (data.includes("Uvicorn running on")) {
+            console.log("Successfully started Continue python server");
+            resolve(null);
+          }
+        });
+        child.on("error", (error: any) => {
+          console.log(`error: ${error.message}`);
+        });
+      } catch (e) {
+        console.log("Failed to start Continue python server", e);
+        // If failed, check if it's because the server is already running (might have happened just after we checked above)
+        if (await checkServerRunning(serverUrl)) {
           resolve(null);
+        } else {
+          reject();
         }
-      });
-      child.on("error", (error: any) => {
-        console.log(`error: ${error.message}`);
-      });
-    } catch (e) {
-      console.log("Failed to start Continue python server", e);
-      // If failed, check if it's because the server is already running (might have happened just after we checked above)
-      if (await checkServerRunning(serverUrl)) {
-        resolve(null);
-      } else {
-        reject();
       }
-    }
+    });
   });
 }
 
-- 
cgit v1.2.3-70-g09d2


From 17a7374251b064fa78bb8973dda0aa806c05d0fa Mon Sep 17 00:00:00 2001
From: Ty Dunn <ty@tydunn.com>
Date: Mon, 26 Jun 2023 21:42:14 -0700
Subject: fixing on windows

---
 extension/src/activation/environmentSetup.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'extension/src')

diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 25b6f643..6138dc64 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -71,14 +71,16 @@ async function getPythonPipCommands() {
   return [pythonCmd, pipCmd];
 }
 
-function getActivateUpgradeCommands(pythonCmd: string, pipCmd: string) {
+function getActivateUpgradeTouchCommands(pythonCmd: string, pipCmd: string) {
   let activateCmd = ". env/bin/activate";
   let pipUpgradeCmd = `${pipCmd} install --upgrade pip`;
+  let touchCmd = "touch .continue_env_installed";
   if (process.platform == "win32") {
     activateCmd = ".\\env\\Scripts\\activate";
     pipUpgradeCmd = `${pythonCmd} -m pip install --upgrade pip`;
+    touchCmd = "ni .continue_env_installed -type file";
   }
-  return [activateCmd, pipUpgradeCmd];
+  return [activateCmd, pipUpgradeCmd, touchCmd];
 }
 
 function checkEnvExists() {
@@ -106,7 +108,7 @@ async function setupPythonEnv() {
   console.log("Setting up python env for Continue extension...");
 
   const [pythonCmd, pipCmd] = await getPythonPipCommands();
-  const [activateCmd, pipUpgradeCmd] = getActivateUpgradeCommands(
+  const [activateCmd, pipUpgradeCmd, touchCmd] = getActivateUpgradeTouchCommands(
     pythonCmd,
     pipCmd
   );
@@ -153,7 +155,7 @@ async function setupPythonEnv() {
         activateCmd,
         pipUpgradeCmd,
         `${pipCmd} install -r requirements.txt`,
-        "touch .continue_env_installed",
+        touchCmd,
       ].join(" ; ");
       const [, stderr] = await runCommand(installRequirementsCommand);
       if (stderr) {
@@ -230,7 +232,7 @@ export async function startContinuePythonServer() {
   let command = `cd ${path.join(
     getExtensionUri().fsPath,
     "scripts"
-  )} ; ${activateCmd} ; cd .. ; ${pythonCmd} -m scripts.run_continue_server`;
+  )} && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`;
 
   return await retryThenFail(async () => {
     console.log("Starting Continue python server...");
-- 
cgit v1.2.3-70-g09d2


From 19db6b37e742e398807e4b63fd7806a4260f067e Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 26 Jun 2023 22:00:03 -0700
Subject: quotes around paths

---
 extension/package-lock.json                  |  4 ++--
 extension/package.json                       |  2 +-
 extension/src/activation/environmentSetup.ts | 18 ++++++++----------
 extension/src/continueIdeClient.ts           |  6 +++---
 4 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'extension/src')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index fcd4c755..0359ad49 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.70",
+      "version": "0.0.71",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index b56c60f4..96ffbd98 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "Accelerating software development with language models",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.74.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 6138dc64..c99ed1dd 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -108,17 +108,15 @@ async function setupPythonEnv() {
   console.log("Setting up python env for Continue extension...");
 
   const [pythonCmd, pipCmd] = await getPythonPipCommands();
-  const [activateCmd, pipUpgradeCmd, touchCmd] = getActivateUpgradeTouchCommands(
-    pythonCmd,
-    pipCmd
-  );
+  const [activateCmd, pipUpgradeCmd, touchCmd] =
+    getActivateUpgradeTouchCommands(pythonCmd, pipCmd);
 
   if (checkEnvExists()) {
     console.log("Python env already exists, skipping...");
   } else {
     // Assemble the command to create the env
     const createEnvCommand = [
-      `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
+      `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`,
       `${pythonCmd} -m venv env`,
     ].join("; ");
 
@@ -132,11 +130,11 @@ async function setupPythonEnv() {
         break;
       } else {
         // Remove the env and try again
-        const removeCommand = `rm -rf ${path.join(
+        const removeCommand = `rm -rf "${path.join(
           getExtensionUri().fsPath,
           "scripts",
           "env"
-        )}`;
+        )}"`;
         await runCommand(removeCommand);
       }
     }
@@ -151,7 +149,7 @@ async function setupPythonEnv() {
       console.log("Python requirements already installed, skipping...");
     } else {
       const installRequirementsCommand = [
-        `cd ${path.join(getExtensionUri().fsPath, "scripts")}`,
+        `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`,
         activateCmd,
         pipUpgradeCmd,
         `${pipCmd} install -r requirements.txt`,
@@ -229,10 +227,10 @@ export async function startContinuePythonServer() {
     pythonCmd = "python";
   }
 
-  let command = `cd ${path.join(
+  let command = `cd "${path.join(
     getExtensionUri().fsPath,
     "scripts"
-  )} && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`;
+  )}" && ${activateCmd} && cd .. && ${pythonCmd} -m scripts.run_continue_server`;
 
   return await retryThenFail(async () => {
     console.log("Starting Continue python server...");
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 3a77e348..08a0b74d 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -329,9 +329,9 @@ class IdeProtocolClient {
     if (vscode.window.terminals.length) {
       vscode.window.terminals[0].sendText(command);
     } else {
-        const terminal = vscode.window.createTerminal();
-        terminal.show();
-        terminal.sendText(command);
+      const terminal = vscode.window.createTerminal();
+      terminal.show();
+      terminal.sendText(command);
     }
   }
 
-- 
cgit v1.2.3-70-g09d2


From 5bb0eed611e73f17a4f4188e5c1e4d82be8a3c30 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 26 Jun 2023 22:05:54 -0700
Subject: ampersands instead of semi-colons

---
 extension/package-lock.json                  | 4 ++--
 extension/package.json                       | 2 +-
 extension/src/activation/environmentSetup.ts | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'extension/src')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 0359ad49..61222648 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.71",
+      "version": "0.0.72",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 96ffbd98..78b09d35 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "Accelerating software development with language models",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.74.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index c99ed1dd..4e6e5786 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -118,7 +118,7 @@ async function setupPythonEnv() {
     const createEnvCommand = [
       `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`,
       `${pythonCmd} -m venv env`,
-    ].join("; ");
+    ].join(" && ");
 
     // Repeat until it is successfully created (sometimes it fails to generate the bin, need to try again)
     while (true) {
@@ -154,7 +154,7 @@ async function setupPythonEnv() {
         pipUpgradeCmd,
         `${pipCmd} install -r requirements.txt`,
         touchCmd,
-      ].join(" ; ");
+      ].join(" && ");
       const [, stderr] = await runCommand(installRequirementsCommand);
       if (stderr) {
         throw new Error(stderr);
@@ -292,7 +292,7 @@ export async function downloadPython3() {
     throw new Error("python3 not found");
   } else if (os === "linux") {
     command =
-      "sudo apt update ; upgrade ; sudo apt install python3 python3-pip";
+      "sudo apt update && upgrade && sudo apt install python3 python3-pip";
   } else if (os === "win32") {
     command =
       "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe ; python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0";
-- 
cgit v1.2.3-70-g09d2


From 3a39f7029f7faf5c77d4678ce6d796e4c99b558b Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 26 Jun 2023 22:26:17 -0700
Subject: back to ampersands except for in spawn

---
 extension/package-lock.json                  | 4 ++--
 extension/package.json                       | 2 +-
 extension/src/activation/environmentSetup.ts | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'extension/src')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 61222648..88cad6c6 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.72",
+      "version": "0.0.73",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 78b09d35..ae55a96b 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "Accelerating software development with language models",
-  "version": "0.0.72",
+  "version": "0.0.73",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.74.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 4e6e5786..ec0e228d 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -118,7 +118,7 @@ async function setupPythonEnv() {
     const createEnvCommand = [
       `cd "${path.join(getExtensionUri().fsPath, "scripts")}"`,
       `${pythonCmd} -m venv env`,
-    ].join(" && ");
+    ].join(" ; ");
 
     // Repeat until it is successfully created (sometimes it fails to generate the bin, need to try again)
     while (true) {
@@ -154,7 +154,7 @@ async function setupPythonEnv() {
         pipUpgradeCmd,
         `${pipCmd} install -r requirements.txt`,
         touchCmd,
-      ].join(" && ");
+      ].join(" ; ");
       const [, stderr] = await runCommand(installRequirementsCommand);
       if (stderr) {
         throw new Error(stderr);
@@ -292,7 +292,7 @@ export async function downloadPython3() {
     throw new Error("python3 not found");
   } else if (os === "linux") {
     command =
-      "sudo apt update && upgrade && sudo apt install python3 python3-pip";
+      "sudo apt update ; upgrade ; sudo apt install python3 python3-pip";
   } else if (os === "win32") {
     command =
       "wget -O python_installer.exe https://www.python.org/ftp/python/3.11.3/python-3.11.3-amd64.exe ; python_installer.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0";
-- 
cgit v1.2.3-70-g09d2