From 9846f4769ff33a346d76e26ad730d19770fe7e02 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 11 Jul 2023 15:14:03 -0700
Subject: check for old version of Continue, notify

---
 extension/src/activation/activate.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 18650561..2c5ba58c 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -7,9 +7,16 @@ import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
 import { CapturedTerminal } from "../terminal/terminalEmulator";
 import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
-import { startContinuePythonServer } from "./environmentSetup";
+import {
+  getExtensionVersion,
+  startContinuePythonServer,
+} from "./environmentSetup";
+import fetch from "node-fetch";
 // import { CapturedTerminal } from "../terminal/terminalEmulator";
 
+const PACKAGE_JSON_RAW_GITHUB_URL =
+  "https://raw.githubusercontent.com/continuedev/continue/main/extension/package.json";
+
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
 export let ideProtocolClient: IdeProtocolClient;
@@ -20,6 +27,19 @@ export async function activateExtension(
 ) {
   extensionContext = context;
 
+  // Before anything else, check whether this is an out-of-date version of the extension
+  // Do so by grabbing the package.json off of the GitHub respository for now.
+  fetch(PACKAGE_JSON_RAW_GITHUB_URL)
+    .then(async (res) => res.json())
+    .then((packageJson) => {
+      if (packageJson.version !== getExtensionVersion()) {
+        vscode.window.showInformationMessage(
+          `You are using an out-of-date version of the Continue extension. Please update to the latest version.`
+        );
+      }
+    })
+    .catch((e) => console.log("Error checking for extension updates: ", e));
+
   await new Promise((resolve, reject) => {
     vscode.window.withProgress(
       {
-- 
cgit v1.2.3-70-g09d2


From 5ed9aff7b888f849f1c7b0d7c150f44b56ffc67f Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 10:03:11 -0700
Subject: better onboarding

---
 extension/package-lock.json                       |  4 +-
 extension/package.json                            |  2 +-
 extension/react-app/src/components/Onboarding.tsx | 51 ++++++++++++++++++-----
 extension/src/activation/activate.ts              |  2 +-
 4 files changed, 45 insertions(+), 14 deletions(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index d310643b..5d1cf395 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.153",
+  "version": "0.0.154",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.153",
+      "version": "0.0.154",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 61eee205..ab23b0b0 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "The open-source coding autopilot",
-  "version": "0.0.153",
+  "version": "0.0.154",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/react-app/src/components/Onboarding.tsx b/extension/react-app/src/components/Onboarding.tsx
index 1b37acc4..776ad460 100644
--- a/extension/react-app/src/components/Onboarding.tsx
+++ b/extension/react-app/src/components/Onboarding.tsx
@@ -4,6 +4,7 @@ import React, { useState, useEffect } from "react";
 import styled from "styled-components";
 import { ArrowLeft, ArrowRight } from "@styled-icons/heroicons-outline";
 import { defaultBorderRadius } from ".";
+import Loader from "./Loader";
 
 const StyledDiv = styled.div`
   position: absolute;
@@ -39,13 +40,9 @@ const Onboarding = () => {
     "Let Continue build the scaffolding of Python scripts, React components, and more",
   ];
 
-  const vscMediaUrl = useSelector(
-    (state: RootStore) => state.config.vscMediaUrl
-  );
-
   useEffect(() => {
     const hasVisited = localStorage.getItem("hasVisited");
-    if (hasVisited) {
+    if (hasVisited && false) {
       setCounter(4);
     } else {
       setCounter(0);
@@ -53,6 +50,12 @@ const Onboarding = () => {
     }
   }, []);
 
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    setLoading(true);
+  }, [counter]);
+
   return (
     <StyledDiv hidden={counter >= 4}>
       <div
@@ -75,10 +78,34 @@ const Onboarding = () => {
       >
         <h1>{topMessages[counter]}</h1>
         <div style={{ display: "flex", justifyContent: "center" }}>
-          <img
-            src={`https://github.com/continuedev/continue/blob/main/media/${gifs[counter]}.gif?raw=true`}
-            alt={topMessages[counter]}
-          />
+          {loading && (
+            <div style={{ margin: "auto", position: "absolute", zIndex: 0 }}>
+              <Loader />
+            </div>
+          )}
+          {counter % 2 === 0 ? (
+            <img
+              src={`https://github.com/continuedev/continue/blob/main/media/${gifs[counter]}.gif?raw=true`}
+              width="100%"
+              key={"even-gif"}
+              alt={topMessages[counter]}
+              onLoad={() => {
+                setLoading(false);
+              }}
+              style={{ zIndex: 1 }}
+            />
+          ) : (
+            <img
+              src={`https://github.com/continuedev/continue/blob/main/media/${gifs[counter]}.gif?raw=true`}
+              width="100%"
+              key={"odd-gif"}
+              alt={topMessages[counter]}
+              onLoad={() => {
+                setLoading(false);
+              }}
+              style={{ zIndex: 1 }}
+            />
+          )}
         </div>
         <p>{bottomMessages[counter]}</p>
         <p
@@ -98,7 +125,11 @@ const Onboarding = () => {
           </StyledSpan>
           <span hidden={counter === 0}>{" | "}</span>
           <StyledSpan onClick={() => setCounter((prev) => prev + 1)}>
-            Click to {counter === 3 || "learn how to"} use Continue{" "}
+            {counter === 0
+              ? "Click to learn how to use Continue"
+              : counter === 3
+              ? "Get Started"
+              : "Next"}{" "}
             <ArrowRight width="18px" strokeWidth="2px" />
           </StyledSpan>
         </p>
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 2c5ba58c..c46d6362 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -15,7 +15,7 @@ import fetch from "node-fetch";
 // import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 const PACKAGE_JSON_RAW_GITHUB_URL =
-  "https://raw.githubusercontent.com/continuedev/continue/main/extension/package.json";
+  "https://raw.githubusercontent.com/continuedev/continue/HEAD/extension/package.json";
 
 export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
-- 
cgit v1.2.3-70-g09d2


From 51f620524cd8d658058b4a07d8e8f8e1b3be49bd Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 12:43:42 -0700
Subject: remove eventemitter from codelens classes

---
 extension/src/activation/activate.ts         |  5 +---
 extension/src/activation/environmentSetup.ts |  9 ++++---
 extension/src/extension.ts                   |  9 +++----
 extension/src/lang-server/codeLens.ts        | 36 ++--------------------------
 4 files changed, 10 insertions(+), 49 deletions(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index c46d6362..fe72eaf6 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -21,10 +21,7 @@ export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
 export let ideProtocolClient: IdeProtocolClient;
 
-export async function activateExtension(
-  context: vscode.ExtensionContext,
-  showTutorial: boolean
-) {
+export async function activateExtension(context: vscode.ExtensionContext) {
   extensionContext = context;
 
   // Before anything else, check whether this is an out-of-date version of the extension
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index c277a539..7bd08929 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -380,11 +380,10 @@ export async function startContinuePythonServer() {
     console.log("Killing old server...");
     try {
       await fkill(":65432");
-    } catch (e) {
-      console.log(
-        "Failed to kill old server, likely because it didn't exist:",
-        e
-      );
+    } catch (e: any) {
+      if (!e.message.includes("Process doesn't exist")) {
+        console.log("Failed to kill old server:", e);
+      }
     }
 
     // Do this after above check so we don't have to waste time setting up the env
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index de8f55e3..1f9f7914 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -8,12 +8,9 @@ import {
   startContinuePythonServer,
 } from "./activation/environmentSetup";
 
-async function dynamicImportAndActivate(
-  context: vscode.ExtensionContext,
-  showTutorial: boolean
-) {
+async function dynamicImportAndActivate(context: vscode.ExtensionContext) {
   const { activateExtension } = await import("./activation/activate");
-  await activateExtension(context, showTutorial);
+  await activateExtension(context);
 }
 
 export function activate(context: vscode.ExtensionContext) {
@@ -25,7 +22,7 @@ export function activate(context: vscode.ExtensionContext) {
       cancellable: false,
     },
     async () => {
-      dynamicImportAndActivate(context, true);
+      dynamicImportAndActivate(context);
     }
   );
 }
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 79126eaa..778b98dc 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -6,7 +6,7 @@ import { DIFF_DIRECTORY } from "../diffs";
 class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
   public provideCodeLenses(
     document: vscode.TextDocument,
-    token: vscode.CancellationToken
+    _: vscode.CancellationToken
   ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
     const suggestions = editorToSuggestions.get(document.uri.toString());
     if (!suggestions) {
@@ -44,28 +44,12 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
 
     return codeLenses;
   }
-
-  onDidChangeCodeLenses?: vscode.Event<void> | undefined;
-
-  constructor(emitter?: vscode.EventEmitter<void>) {
-    if (emitter) {
-      this.onDidChangeCodeLenses = emitter.event;
-      this.onDidChangeCodeLenses(() => {
-        if (vscode.window.activeTextEditor) {
-          this.provideCodeLenses(
-            vscode.window.activeTextEditor.document,
-            new vscode.CancellationTokenSource().token
-          );
-        }
-      });
-    }
-  }
 }
 
 class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
   public provideCodeLenses(
     document: vscode.TextDocument,
-    token: vscode.CancellationToken
+    _: vscode.CancellationToken
   ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
     if (path.dirname(document.uri.fsPath) === DIFF_DIRECTORY) {
       const codeLenses: vscode.CodeLens[] = [];
@@ -87,22 +71,6 @@ class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
       return [];
     }
   }
-
-  onDidChangeCodeLenses?: vscode.Event<void> | undefined;
-
-  constructor(emitter?: vscode.EventEmitter<void>) {
-    if (emitter) {
-      this.onDidChangeCodeLenses = emitter.event;
-      this.onDidChangeCodeLenses(() => {
-        if (vscode.window.activeTextEditor) {
-          this.provideCodeLenses(
-            vscode.window.activeTextEditor.document,
-            new vscode.CancellationTokenSource().token
-          );
-        }
-      });
-    }
-  }
 }
 
 let diffsCodeLensDisposable: vscode.Disposable | undefined = undefined;
-- 
cgit v1.2.3-70-g09d2


From 69a1bc9cff896f492a122d87def4632696ce59b2 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 16:10:53 -0700
Subject: catch error at top level when activating extension

---
 extension/src/activation/activate.ts | 18 ++++++------------
 extension/src/extension.ts           | 13 ++++++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index fe72eaf6..559caf44 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -2,11 +2,9 @@ import * as vscode from "vscode";
 import { registerAllCommands } from "../commands";
 import { registerAllCodeLensProviders } from "../lang-server/codeLens";
 import { sendTelemetryEvent, TelemetryEvent } from "../telemetry";
-// import { openCapturedTerminal } from "../terminal/terminalEmulator";
 import IdeProtocolClient from "../continueIdeClient";
 import { getContinueServerUrl } from "../bridge";
-import { CapturedTerminal } from "../terminal/terminalEmulator";
-import { setupDebugPanel, ContinueGUIWebviewViewProvider } from "../debugPanel";
+import { ContinueGUIWebviewViewProvider } from "../debugPanel";
 import {
   getExtensionVersion,
   startContinuePythonServer,
@@ -37,6 +35,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     })
     .catch((e) => console.log("Error checking for extension updates: ", e));
 
+  // Start the Python server
   await new Promise((resolve, reject) => {
     vscode.window.withProgress(
       {
@@ -52,19 +51,19 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     );
   });
 
+  // Register commands and providers
   sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
 
+  // Initialize IDE Protocol Client, then call "openGUI"
   const serverUrl = getContinueServerUrl();
-
   ideProtocolClient = new IdeProtocolClient(
     `${serverUrl.replace("http", "ws")}/ide/ws`,
     context
   );
 
-  // Setup the left panel
-  (async () => {
+  {
     const sessionIdPromise = await ideProtocolClient.getSessionId();
     const provider = new ContinueGUIWebviewViewProvider(sessionIdPromise);
 
@@ -77,10 +76,5 @@ export async function activateExtension(context: vscode.ExtensionContext) {
         }
       )
     );
-  })();
-  // All opened terminals should be replaced by our own terminal
-  // vscode.window.onDidOpenTerminal((terminal) => {});
-
-  // If any terminals are open to start, replace them
-  // vscode.window.terminals.forEach((terminal) => {}
+  }
 }
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index 1f9f7914..6959ec05 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -3,14 +3,17 @@
  */
 
 import * as vscode from "vscode";
-import {
-  isPythonEnvSetup,
-  startContinuePythonServer,
-} from "./activation/environmentSetup";
 
 async function dynamicImportAndActivate(context: vscode.ExtensionContext) {
   const { activateExtension } = await import("./activation/activate");
-  await activateExtension(context);
+  try {
+    await activateExtension(context);
+  } catch (e) {
+    console.log("Error activating extension: ", e);
+    vscode.window.showInformationMessage(
+      "Error activating the Continue extension."
+    );
+  }
 }
 
 export function activate(context: vscode.ExtensionContext) {
-- 
cgit v1.2.3-70-g09d2


From 391764f1371dab06af30a29e10a826a516b69bb3 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 21:53:06 -0700
Subject: persist state and reconnect automatically

---
 continuedev/src/continuedev/core/autopilot.py      |  17 +++-
 continuedev/src/continuedev/libs/constants/main.py |   6 ++
 continuedev/src/continuedev/libs/util/paths.py     |  17 ++++
 continuedev/src/continuedev/server/gui.py          |  10 +-
 continuedev/src/continuedev/server/ide.py          |  25 +++--
 continuedev/src/continuedev/server/ide_protocol.py |  10 +-
 continuedev/src/continuedev/server/main.py         |  16 ++-
 .../src/continuedev/server/session_manager.py      |  41 ++++++--
 docs/docs/concepts/ide.md                          |   4 +-
 extension/react-app/src/components/ComboBox.tsx    |   1 -
 extension/react-app/src/hooks/messenger.ts         |  10 --
 extension/react-app/src/pages/gui.tsx              |   1 -
 extension/src/activation/activate.ts               |   2 +-
 extension/src/continueIdeClient.ts                 |  62 ++++++++---
 extension/src/debugPanel.ts                        | 113 ++++-----------------
 extension/src/util/messenger.ts                    |  10 ++
 16 files changed, 192 insertions(+), 153 deletions(-)
 create mode 100644 continuedev/src/continuedev/libs/constants/main.py
 create mode 100644 continuedev/src/continuedev/libs/util/paths.py

(limited to 'extension/src/activation/activate.ts')

diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py
index 1b074435..e1c8a076 100644
--- a/continuedev/src/continuedev/core/autopilot.py
+++ b/continuedev/src/continuedev/core/autopilot.py
@@ -1,13 +1,13 @@
 from functools import cached_property
 import traceback
 import time
-from typing import Any, Callable, Coroutine, Dict, List
+from typing import Any, Callable, Coroutine, Dict, List, Union
 import os
 from aiohttp import ClientPayloadError
+from pydantic import root_validator
 
 from ..models.filesystem import RangeInFileWithContents
 from ..models.filesystem_edit import FileEditWithFullContents
-from ..libs.llm import LLM
 from .observation import Observation, InternalErrorObservation
 from ..server.ide_protocol import AbstractIdeProtocolServer
 from ..libs.util.queue import AsyncSubscriptionQueue
@@ -16,7 +16,6 @@ from .main import Context, ContinueCustomException, HighlightedRangeContext, Pol
 from ..steps.core.core import ReversibleStep, ManualEditStep, UserInputStep
 from ..libs.util.telemetry import capture_event
 from .sdk import ContinueSDK
-import asyncio
 from ..libs.util.step_name_to_steps import get_step_from_name
 from ..libs.util.traceback_parsers import get_python_traceback, get_javascript_traceback
 from openai import error as openai_errors
@@ -46,6 +45,7 @@ class Autopilot(ContinueBaseModel):
     ide: AbstractIdeProtocolServer
     history: History = History.from_empty()
     context: Context = Context()
+    full_state: Union[FullState, None] = None
     _on_update_callbacks: List[Callable[[FullState], None]] = []
 
     _active: bool = False
@@ -63,8 +63,15 @@ class Autopilot(ContinueBaseModel):
         arbitrary_types_allowed = True
         keep_untouched = (cached_property,)
 
+    @root_validator(pre=True)
+    def fill_in_values(cls, values):
+        full_state: FullState = values.get('full_state')
+        if full_state is not None:
+            values['history'] = full_state.history
+        return values
+
     def get_full_state(self) -> FullState:
-        return FullState(
+        full_state = FullState(
             history=self.history,
             active=self._active,
             user_input_queue=self._main_user_input_queue,
@@ -73,6 +80,8 @@ class Autopilot(ContinueBaseModel):
             slash_commands=self.get_available_slash_commands(),
             adding_highlighted_code=self._adding_highlighted_code,
         )
+        self.full_state = full_state
+        return full_state
 
     def get_available_slash_commands(self) -> List[Dict]:
         custom_commands = list(map(lambda x: {
diff --git a/continuedev/src/continuedev/libs/constants/main.py b/continuedev/src/continuedev/libs/constants/main.py
new file mode 100644
index 00000000..96eb6e69
--- /dev/null
+++ b/continuedev/src/continuedev/libs/constants/main.py
@@ -0,0 +1,6 @@
+## PATHS ##
+
+CONTINUE_GLOBAL_FOLDER = ".continue"
+CONTINUE_SESSIONS_FOLDER = "sessions"
+CONTINUE_SERVER_FOLDER = "server"
+
diff --git a/continuedev/src/continuedev/libs/util/paths.py b/continuedev/src/continuedev/libs/util/paths.py
new file mode 100644
index 00000000..fddef887
--- /dev/null
+++ b/continuedev/src/continuedev/libs/util/paths.py
@@ -0,0 +1,17 @@
+import os
+
+from ..constants.main import CONTINUE_SESSIONS_FOLDER, CONTINUE_GLOBAL_FOLDER, CONTINUE_SERVER_FOLDER
+
+def getGlobalFolderPath():
+    return os.path.join(os.path.expanduser("~"), CONTINUE_GLOBAL_FOLDER)
+
+
+
+def getSessionsFolderPath():
+    return os.path.join(getGlobalFolderPath(), CONTINUE_SESSIONS_FOLDER)
+
+def getServerFolderPath():
+    return os.path.join(getGlobalFolderPath(), CONTINUE_SERVER_FOLDER)
+
+def getSessionFilePath(session_id: str):
+    return os.path.join(getSessionsFolderPath(), f"{session_id}.json")
\ No newline at end of file
diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py
index 21089f30..8f6f68f6 100644
--- a/continuedev/src/continuedev/server/gui.py
+++ b/continuedev/src/continuedev/server/gui.py
@@ -31,12 +31,12 @@ class AppStatus:
 Server.handle_exit = AppStatus.handle_exit
 
 
-def session(x_continue_session_id: str = Header("anonymous")) -> Session:
-    return session_manager.get_session(x_continue_session_id)
+async def session(x_continue_session_id: str = Header("anonymous")) -> Session:
+    return await session_manager.get_session(x_continue_session_id)
 
 
-def websocket_session(session_id: str) -> Session:
-    return session_manager.get_session(session_id)
+async def websocket_session(session_id: str) -> Session:
+    return await session_manager.get_session(session_id)
 
 
 T = TypeVar("T", bound=BaseModel)
@@ -199,4 +199,6 @@ async def websocket_endpoint(websocket: WebSocket, session: Session = Depends(we
         print("Closing gui websocket")
         if websocket.client_state != WebSocketState.DISCONNECTED:
             await websocket.close()
+
+        session_manager.persist_session(session.session_id)
         session_manager.remove_session(session.session_id)
diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index 4645b49e..12a21f19 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -52,9 +52,11 @@ class FileEditsUpdate(BaseModel):
 class OpenFilesResponse(BaseModel):
     openFiles: List[str]
 
+
 class VisibleFilesResponse(BaseModel):
     visibleFiles: List[str]
 
+
 class HighlightedCodeResponse(BaseModel):
     highlightedCode: List[RangeInFile]
 
@@ -115,6 +117,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
     websocket: WebSocket
     session_manager: SessionManager
     sub_queue: AsyncSubscriptionQueue = AsyncSubscriptionQueue()
+    session_id: Union[str, None] = None
 
     def __init__(self, session_manager: SessionManager, websocket: WebSocket):
         self.websocket = websocket
@@ -132,8 +135,6 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
                 continue
             message_type = message["messageType"]
             data = message["data"]
-            # if message_type == "openGUI":
-            #     await self.openGUI()
             if message_type == "workspaceDirectory":
                 self.workspace_directory = data["workspaceDirectory"]
                 break
@@ -158,8 +159,8 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
         return resp_model.parse_obj(resp)
 
     async def handle_json(self, message_type: str, data: Any):
-        if message_type == "openGUI":
-            await self.openGUI()
+        if message_type == "getSessionId":
+            await self.getSessionId()
         elif message_type == "setFileOpen":
             await self.setFileOpen(data["filepath"], data["open"])
         elif message_type == "setSuggestionsLocked":
@@ -217,9 +218,10 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
             "locked": locked
         })
 
-    async def openGUI(self):
-        session_id = self.session_manager.new_session(self)
-        await self._send_json("openGUI", {
+    async def getSessionId(self):
+        session_id = self.session_manager.new_session(
+            self, self.session_id).session_id
+        await self._send_json("getSessionId", {
             "sessionId": session_id
         })
 
@@ -304,7 +306,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
     async def getOpenFiles(self) -> List[str]:
         resp = await self._send_and_receive_json({}, OpenFilesResponse, "openFiles")
         return resp.openFiles
-    
+
     async def getVisibleFiles(self) -> List[str]:
         resp = await self._send_and_receive_json({}, VisibleFilesResponse, "visibleFiles")
         return resp.visibleFiles
@@ -416,7 +418,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
 
 
 @router.websocket("/ws")
-async def websocket_endpoint(websocket: WebSocket):
+async def websocket_endpoint(websocket: WebSocket, session_id: str = None):
     try:
         await websocket.accept()
         print("Accepted websocket connection from, ", websocket.client)
@@ -434,6 +436,9 @@ async def websocket_endpoint(websocket: WebSocket):
                 ideProtocolServer.handle_json(message_type, data))
 
         ideProtocolServer = IdeProtocolServer(session_manager, websocket)
+        ideProtocolServer.session_id = session_id
+        if session_id is not None:
+            session_manager.registered_ides[session_id] = ideProtocolServer
         other_msgs = await ideProtocolServer.initialize()
 
         for other_msg in other_msgs:
@@ -454,3 +459,5 @@ async def websocket_endpoint(websocket: WebSocket):
     finally:
         if websocket.client_state != WebSocketState.DISCONNECTED:
             await websocket.close()
+
+        session_manager.registered_ides.pop(ideProtocolServer.session_id)
diff --git a/continuedev/src/continuedev/server/ide_protocol.py b/continuedev/src/continuedev/server/ide_protocol.py
index 2783dc61..2f78cf0e 100644
--- a/continuedev/src/continuedev/server/ide_protocol.py
+++ b/continuedev/src/continuedev/server/ide_protocol.py
@@ -1,5 +1,6 @@
-from typing import Any, List
+from typing import Any, List, Union
 from abc import ABC, abstractmethod, abstractproperty
+from fastapi import WebSocket
 
 from ..models.main import Traceback
 from ..models.filesystem_edit import FileEdit, FileSystemEdit, EditDiff
@@ -7,6 +8,9 @@ from ..models.filesystem import RangeInFile, RangeInFileWithContents
 
 
 class AbstractIdeProtocolServer(ABC):
+    websocket: WebSocket
+    session_id: Union[str, None]
+
     @abstractmethod
     async def handle_json(self, data: Any):
         """Handle a json message"""
@@ -24,8 +28,8 @@ class AbstractIdeProtocolServer(ABC):
         """Set whether suggestions are locked"""
 
     @abstractmethod
-    async def openGUI(self):
-        """Open a GUI"""
+    async def getSessionId(self):
+        """Get a new session ID"""
 
     @abstractmethod
     async def showSuggestionsAndWait(self, suggestions: List[FileEdit]) -> bool:
diff --git a/continuedev/src/continuedev/server/main.py b/continuedev/src/continuedev/server/main.py
index f4d82903..aa093853 100644
--- a/continuedev/src/continuedev/server/main.py
+++ b/continuedev/src/continuedev/server/main.py
@@ -4,7 +4,8 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from .ide import router as ide_router
 from .gui import router as gui_router
-import logging
+from .session_manager import session_manager
+import atexit
 import uvicorn
 import argparse
 
@@ -44,5 +45,16 @@ def run_server():
     uvicorn.run(app, host="0.0.0.0", port=args.port)
 
 
+def cleanup():
+    print("Cleaning up sessions")
+    for session_id in session_manager.sessions:
+        session_manager.persist_session(session_id)
+
+
+atexit.register(cleanup)
 if __name__ == "__main__":
-    run_server()
+    try:
+        run_server()
+    except Exception as e:
+        cleanup()
+        raise e
diff --git a/continuedev/src/continuedev/server/session_manager.py b/continuedev/src/continuedev/server/session_manager.py
index 7147dcfa..fb8ac386 100644
--- a/continuedev/src/continuedev/server/session_manager.py
+++ b/continuedev/src/continuedev/server/session_manager.py
@@ -1,9 +1,12 @@
-from asyncio import BaseEventLoop
+import os
 from fastapi import WebSocket
 from typing import Any, Dict, List, Union
 from uuid import uuid4
+import json
 
+from ..libs.util.paths import getSessionFilePath, getSessionsFolderPath
 from ..models.filesystem_edit import FileEditWithFullContents
+from ..libs.constants.main import CONTINUE_SESSIONS_FOLDER
 from ..core.policy import DemoPolicy
 from ..core.main import FullState
 from ..core.autopilot import Autopilot
@@ -39,17 +42,35 @@ class DemoAutopilot(Autopilot):
 
 class SessionManager:
     sessions: Dict[str, Session] = {}
+    # Mapping of session_id to IDE, where the IDE is still alive
+    registered_ides: Dict[str, AbstractIdeProtocolServer] = {}
 
-    def get_session(self, session_id: str) -> Session:
+    async def get_session(self, session_id: str) -> Session:
         if session_id not in self.sessions:
+            # Check then whether it is persisted by listing all files in the sessions folder
+            # And only if the IDE is still alive
+            sessions_folder = getSessionsFolderPath()
+            session_files = os.listdir(sessions_folder)
+            if f"{session_id}.json" in session_files and session_id in self.registered_ides:
+                if self.registered_ides[session_id].session_id is not None:
+                    return self.new_session(self.registered_ides[session_id], session_id=session_id)
+
             raise KeyError("Session ID not recognized", session_id)
         return self.sessions[session_id]
 
-    def new_session(self, ide: AbstractIdeProtocolServer) -> str:
-        autopilot = DemoAutopilot(policy=DemoPolicy(), ide=ide)
-        session_id = str(uuid4())
+    def new_session(self, ide: AbstractIdeProtocolServer, session_id: Union[str, None] = None) -> Session:
+        full_state = None
+        if session_id is not None and os.path.exists(getSessionFilePath(session_id)):
+            with open(getSessionFilePath(session_id), "r") as f:
+                full_state = FullState(**json.load(f))
+
+        autopilot = DemoAutopilot(
+            policy=DemoPolicy(), ide=ide, full_state=full_state)
+        session_id = session_id or str(uuid4())
+        ide.session_id = session_id
         session = Session(session_id=session_id, autopilot=autopilot)
         self.sessions[session_id] = session
+        self.registered_ides[session_id] = ide
 
         async def on_update(state: FullState):
             await session_manager.send_ws_data(session_id, "state_update", {
@@ -58,11 +79,19 @@ class SessionManager:
 
         autopilot.on_update(on_update)
         create_async_task(autopilot.run_policy())
-        return session_id
+        return session
 
     def remove_session(self, session_id: str):
         del self.sessions[session_id]
 
+    def persist_session(self, session_id: str):
+        """Save the session's FullState as a json file"""
+        full_state = self.sessions[session_id].autopilot.get_full_state()
+        if not os.path.exists(getSessionsFolderPath()):
+            os.mkdir(getSessionsFolderPath())
+        with open(getSessionFilePath(session_id), "w") as f:
+            json.dump(full_state.dict(), f)
+
     def register_websocket(self, session_id: str, ws: WebSocket):
         self.sessions[session_id].ws = ws
         print("Registered websocket for session", session_id)
diff --git a/docs/docs/concepts/ide.md b/docs/docs/concepts/ide.md
index dc7b9e23..bd31481b 100644
--- a/docs/docs/concepts/ide.md
+++ b/docs/docs/concepts/ide.md
@@ -41,9 +41,9 @@ Get the workspace directory
 
 Set whether a file is open
 
-### openGUI
+### getSessionId
 
-Open a gui
+Get a new session ID
 
 ### showSuggestionsAndWait
 
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index ac994b0a..7d6541c7 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -331,7 +331,6 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
               ) {
                 (event.nativeEvent as any).preventDownshiftDefault = true;
               } else if (event.key === "ArrowUp") {
-                console.log("OWJFOIJO");
                 if (positionInHistory == 0) return;
                 else if (
                   positionInHistory == history.length &&
diff --git a/extension/react-app/src/hooks/messenger.ts b/extension/react-app/src/hooks/messenger.ts
index e2a0bab8..00ce1fbb 100644
--- a/extension/react-app/src/hooks/messenger.ts
+++ b/extension/react-app/src/hooks/messenger.ts
@@ -1,6 +1,3 @@
-// console.log("Websocket import");
-// const WebSocket = require("ws");
-
 export abstract class Messenger {
   abstract send(messageType: string, data: object): void;
 
@@ -28,13 +25,6 @@ export class WebsocketMessenger extends Messenger {
   private serverUrl: string;
 
   _newWebsocket(): WebSocket {
-    // // Dynamic import, because WebSocket is builtin with browser, but not with node. And can't use require in browser.
-    // if (typeof process === "object") {
-    //   console.log("Using node");
-    //   // process is only available in Node
-    //   var WebSocket = require("ws");
-    // }
-
     const newWebsocket = new WebSocket(this.serverUrl);
     for (const listener of this.onOpenListeners) {
       this.onOpen(listener);
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index b9382bd1..4ff260fa 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -262,7 +262,6 @@ function GUI(props: GUIProps) {
 
   const onStepUserInput = (input: string, index: number) => {
     if (!client) return;
-    console.log("Sending step user input", input, index);
     client.sendStepUserInput(input, index);
   };
 
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 559caf44..cd885b12 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -56,7 +56,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
 
-  // Initialize IDE Protocol Client, then call "openGUI"
+  // Initialize IDE Protocol Client
   const serverUrl = getContinueServerUrl();
   ideProtocolClient = new IdeProtocolClient(
     `${serverUrl.replace("http", "ws")}/ide/ws`,
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index b728833f..4c1fdf1e 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -1,10 +1,9 @@
-// import { ShowSuggestionRequest } from "../schema/ShowSuggestionRequest";
 import {
   editorSuggestionsLocked,
   showSuggestion as showSuggestionInEditor,
   SuggestionRanges,
 } from "./suggestions";
-import { openEditorAndRevealRange, getRightViewColumn } from "./util/vscode";
+import { openEditorAndRevealRange } from "./util/vscode";
 import { FileEdit } from "../schema/FileEdit";
 import { RangeInFile } from "../schema/RangeInFile";
 import * as vscode from "vscode";
@@ -15,8 +14,6 @@ import {
 import { FileEditWithFullContents } from "../schema/FileEditWithFullContents";
 import fs = require("fs");
 import { WebsocketMessenger } from "./util/messenger";
-import * as path from "path";
-import * as os from "os";
 import { diffManager } from "./diffs";
 
 class IdeProtocolClient {
@@ -27,17 +24,54 @@ class IdeProtocolClient {
 
   private _highlightDebounce: NodeJS.Timeout | null = null;
 
-  constructor(serverUrl: string, context: vscode.ExtensionContext) {
-    this.context = context;
+  private _lastReloadTime: number = 16;
+  private _reconnectionTimeouts: NodeJS.Timeout[] = [];
+
+  private _sessionId: string | null = null;
+  private _serverUrl: string;
 
-    let messenger = new WebsocketMessenger(serverUrl);
+  private _newWebsocketMessenger() {
+    const requestUrl =
+      this._serverUrl +
+      (this._sessionId ? `?session_id=${this._sessionId}` : "");
+    const messenger = new WebsocketMessenger(requestUrl);
     this.messenger = messenger;
-    messenger.onClose(() => {
+
+    const reconnect = () => {
+      console.log("Trying to reconnect IDE protocol websocket...");
       this.messenger = null;
+
+      // Exponential backoff to reconnect
+      this._reconnectionTimeouts.forEach((to) => clearTimeout(to));
+
+      const timeout = setTimeout(() => {
+        if (this.messenger?.websocket?.readyState === 1) {
+          return;
+        }
+        this._newWebsocketMessenger();
+      }, this._lastReloadTime);
+
+      this._reconnectionTimeouts.push(timeout);
+      this._lastReloadTime = Math.min(2 * this._lastReloadTime, 5000);
+    };
+    messenger.onOpen(() => {
+      this._reconnectionTimeouts.forEach((to) => clearTimeout(to));
+    });
+    messenger.onClose(() => {
+      reconnect();
+    });
+    messenger.onError(() => {
+      reconnect();
     });
     messenger.onMessage((messageType, data, messenger) => {
       this.handleMessage(messageType, data, messenger);
     });
+  }
+
+  constructor(serverUrl: string, context: vscode.ExtensionContext) {
+    this.context = context;
+    this._serverUrl = serverUrl;
+    this._newWebsocketMessenger();
 
     // Setup listeners for any file changes in open editors
     // vscode.workspace.onDidChangeTextDocument((event) => {
@@ -171,7 +205,7 @@ class IdeProtocolClient {
       case "showDiff":
         this.showDiff(data.filepath, data.replacement, data.step_index);
         break;
-      case "openGUI":
+      case "getSessionId":
       case "connected":
         break;
       default:
@@ -284,10 +318,6 @@ class IdeProtocolClient {
   // ------------------------------------ //
   // Initiate Request
 
-  async openGUI(asRightWebviewPanel: boolean = false) {
-    // Open the webview panel
-  }
-
   async getSessionId(): Promise<string> {
     await new Promise((resolve, reject) => {
       // Repeatedly try to connect to the server
@@ -303,10 +333,10 @@ class IdeProtocolClient {
         }
       }, 1000);
     });
-    const resp = await this.messenger?.sendAndReceive("openGUI", {});
-    const sessionId = resp.sessionId;
+    const resp = await this.messenger?.sendAndReceive("getSessionId", {});
     // console.log("New Continue session with ID: ", sessionId);
-    return sessionId;
+    this._sessionId = resp.sessionId;
+    return resp.sessionId;
   }
 
   acceptRejectSuggestion(accept: boolean, key: SuggestionRanges) {
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index 487bbedf..5e1689d1 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -8,76 +8,6 @@ import {
 import { RangeInFile } from "./client";
 const WebSocket = require("ws");
 
-class StreamManager {
-  private _fullText: string = "";
-  private _insertionPoint: vscode.Position | undefined;
-
-  private _addToEditor(update: string) {
-    let editor =
-      vscode.window.activeTextEditor || vscode.window.visibleTextEditors[0];
-
-    if (typeof this._insertionPoint === "undefined") {
-      if (editor?.selection.isEmpty) {
-        this._insertionPoint = editor?.selection.active;
-      } else {
-        this._insertionPoint = editor?.selection.end;
-      }
-    }
-    editor?.edit((editBuilder) => {
-      if (this._insertionPoint) {
-        editBuilder.insert(this._insertionPoint, update);
-        this._insertionPoint = this._insertionPoint.translate(
-          Array.from(update.matchAll(/\n/g)).length,
-          update.length
-        );
-      }
-    });
-  }
-
-  public closeStream() {
-    this._fullText = "";
-    this._insertionPoint = undefined;
-    this._codeBlockStatus = "closed";
-    this._pendingBackticks = 0;
-  }
-
-  private _codeBlockStatus: "open" | "closed" | "language-descriptor" =
-    "closed";
-  private _pendingBackticks: number = 0;
-  public onStreamUpdate(update: string) {
-    let textToInsert = "";
-    for (let i = 0; i < update.length; i++) {
-      switch (this._codeBlockStatus) {
-        case "closed":
-          if (update[i] === "`" && this._fullText.endsWith("``")) {
-            this._codeBlockStatus = "language-descriptor";
-          }
-          break;
-        case "language-descriptor":
-          if (update[i] === " " || update[i] === "\n") {
-            this._codeBlockStatus = "open";
-          }
-          break;
-        case "open":
-          if (update[i] === "`") {
-            if (this._fullText.endsWith("``")) {
-              this._codeBlockStatus = "closed";
-              this._pendingBackticks = 0;
-            } else {
-              this._pendingBackticks += 1;
-            }
-          } else {
-            textToInsert += "`".repeat(this._pendingBackticks) + update[i];
-            this._pendingBackticks = 0;
-          }
-          break;
-      }
-      this._fullText += update[i];
-    }
-    this._addToEditor(textToInsert);
-  }
-}
-
 let websocketConnections: { [url: string]: WebsocketConnection | undefined } =
   {};
 
@@ -127,8 +57,6 @@ class WebsocketConnection {
   }
 }
 
-let streamManager = new StreamManager();
-
 export let debugPanelWebview: vscode.Webview | undefined;
 export function setupDebugPanel(
   panel: vscode.WebviewPanel | vscode.WebviewView,
@@ -147,10 +75,7 @@ export function setupDebugPanel(
     .toString();
 
   const isProduction = true; // context?.extensionMode === vscode.ExtensionMode.Development;
-  if (!isProduction) {
-    scriptUri = "http://localhost:5173/src/main.tsx";
-    styleMainUri = "http://localhost:5173/src/main.css";
-  } else {
+  if (isProduction) {
     scriptUri = debugPanelWebview
       .asWebviewUri(
         vscode.Uri.joinPath(extensionUri, "react-app/dist/assets/index.js")
@@ -161,6 +86,9 @@ export function setupDebugPanel(
         vscode.Uri.joinPath(extensionUri, "react-app/dist/assets/index.css")
       )
       .toString();
+  } else {
+    scriptUri = "http://localhost:5173/src/main.tsx";
+    styleMainUri = "http://localhost:5173/src/main.css";
   }
 
   panel.webview.options = {
@@ -175,11 +103,11 @@ export function setupDebugPanel(
       return;
     }
 
-    let rangeInFile: RangeInFile = {
+    const rangeInFile: RangeInFile = {
       range: e.selections[0],
       filepath: e.textEditor.document.fileName,
     };
-    let filesystem = {
+    const filesystem = {
       [rangeInFile.filepath]: e.textEditor.document.getText(),
     };
     panel.webview.postMessage({
@@ -217,13 +145,19 @@ export function setupDebugPanel(
           url,
         });
       };
-      const connection = new WebsocketConnection(
-        url,
-        onMessage,
-        onOpen,
-        onClose
-      );
-      websocketConnections[url] = connection;
+      try {
+        const connection = new WebsocketConnection(
+          url,
+          onMessage,
+          onOpen,
+          onClose
+        );
+        websocketConnections[url] = connection;
+        resolve(null);
+      } catch (e) {
+        console.log("Caught it!: ", e);
+        reject(e);
+      }
     });
   }
 
@@ -292,15 +226,6 @@ export function setupDebugPanel(
         openEditorAndRevealRange(data.path, undefined, vscode.ViewColumn.One);
         break;
       }
-      case "streamUpdate": {
-        // Write code at the position of the cursor
-        streamManager.onStreamUpdate(data.update);
-        break;
-      }
-      case "closeStream": {
-        streamManager.closeStream();
-        break;
-      }
       case "withProgress": {
         // This message allows withProgress to be used in the webview
         if (data.done) {
diff --git a/extension/src/util/messenger.ts b/extension/src/util/messenger.ts
index b1df161b..7fd71ddd 100644
--- a/extension/src/util/messenger.ts
+++ b/extension/src/util/messenger.ts
@@ -15,6 +15,8 @@ export abstract class Messenger {
   abstract onOpen(callback: () => void): void;
 
   abstract onClose(callback: () => void): void;
+  
+  abstract onError(callback: () => void): void;
 
   abstract sendAndReceive(messageType: string, data: any): Promise<any>;
 }
@@ -26,6 +28,7 @@ export class WebsocketMessenger extends Messenger {
   } = {};
   private onOpenListeners: (() => void)[] = [];
   private onCloseListeners: (() => void)[] = [];
+  private onErrorListeners: (() => void)[] = [];
   private serverUrl: string;
 
   _newWebsocket(): WebSocket {
@@ -43,6 +46,9 @@ export class WebsocketMessenger extends Messenger {
     for (const listener of this.onCloseListeners) {
       this.onClose(listener);
     }
+    for (const listener of this.onErrorListeners) {
+      this.onError(listener);
+    }
     for (const messageType in this.onMessageListeners) {
       for (const listener of this.onMessageListeners[messageType]) {
         this.onMessageType(messageType, listener);
@@ -151,4 +157,8 @@ export class WebsocketMessenger extends Messenger {
   onClose(callback: () => void): void {
     this.websocket.addEventListener("close", callback);
   }
+
+  onError(callback: () => void): void {
+    this.websocket.addEventListener("error", callback);
+  }
 }
-- 
cgit v1.2.3-70-g09d2


From 52cd93ad73f7df6a5140b7d629e4f6e473dc0380 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sun, 16 Jul 2023 12:49:47 -0700
Subject: feat: :sparkles: Continue Quick Fix

---
 extension/package.json                   |  5 +++
 extension/src/activation/activate.ts     |  2 ++
 extension/src/commands.ts                |  7 +++++
 extension/src/lang-server/codeActions.ts | 53 ++++++++++++++++++++++++++++++++
 4 files changed, 67 insertions(+)
 create mode 100644 extension/src/lang-server/codeActions.ts

(limited to 'extension/src/activation/activate.ts')

diff --git a/extension/package.json b/extension/package.json
index 9fe38f7f..ccc3a679 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -106,6 +106,11 @@
         "command": "continue.quickTextEntry",
         "category": "Continue",
         "title": "Quick Text Entry"
+      },
+      {
+        "command": "continue.quickFix",
+        "category": "Continue",
+        "title": "Quick Fix"
       }
     ],
     "keybindings": [
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index cd885b12..5c6ffa02 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -10,6 +10,7 @@ import {
   startContinuePythonServer,
 } from "./environmentSetup";
 import fetch from "node-fetch";
+import registerQuickFixProvider from "../lang-server/codeActions";
 // import { CapturedTerminal } from "../terminal/terminalEmulator";
 
 const PACKAGE_JSON_RAW_GITHUB_URL =
@@ -55,6 +56,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
   sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
   registerAllCommands(context);
+  registerQuickFixProvider();
 
   // Initialize IDE Protocol Client
   const serverUrl = getContinueServerUrl();
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 888f01ed..2b7f4c0c 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -34,6 +34,13 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
   "continue.rejectDiff": rejectDiffCommand,
   "continue.acceptAllSuggestions": acceptAllSuggestionsCommand,
   "continue.rejectAllSuggestions": rejectAllSuggestionsCommand,
+  "continue.quickFix": async (message: string, code: string, edit: boolean) => {
+    ideProtocolClient.sendMainUserInput(
+      `${
+        edit ? "/edit " : ""
+      }${code}\n\nHow do I fix this problem in the above code?: ${message}`
+    );
+  },
   "continue.focusContinueInput": async () => {
     if (focusedOnContinueInput) {
       vscode.commands.executeCommand("workbench.action.focusActiveEditorGroup");
diff --git a/extension/src/lang-server/codeActions.ts b/extension/src/lang-server/codeActions.ts
new file mode 100644
index 00000000..07cf5f4e
--- /dev/null
+++ b/extension/src/lang-server/codeActions.ts
@@ -0,0 +1,53 @@
+import * as vscode from "vscode";
+
+class ContinueQuickFixProvider implements vscode.CodeActionProvider {
+  public static readonly providedCodeActionKinds = [
+    vscode.CodeActionKind.QuickFix,
+  ];
+
+  provideCodeActions(
+    document: vscode.TextDocument,
+    range: vscode.Range | vscode.Selection,
+    context: vscode.CodeActionContext,
+    token: vscode.CancellationToken
+  ): vscode.ProviderResult<(vscode.Command | vscode.CodeAction)[]> {
+    if (context.diagnostics.length === 0) {
+      return [];
+    }
+
+    const createQuickFix = (edit: boolean) => {
+      const diagnostic = context.diagnostics[0];
+      const quickFix = new vscode.CodeAction(
+        edit ? "Fix with Continue" : "Ask Continue",
+        vscode.CodeActionKind.QuickFix
+      );
+      quickFix.isPreferred = false;
+      const surroundingRange = new vscode.Range(
+        range.start.translate(-3, 0),
+        range.end.translate(3, 0)
+      );
+      quickFix.command = {
+        command: "continue.quickFix",
+        title: "Continue Quick Fix",
+        arguments: [
+          diagnostic.message,
+          document.getText(surroundingRange),
+          edit,
+        ],
+      };
+      return quickFix;
+    };
+    return [createQuickFix(true), createQuickFix(false)];
+  }
+}
+
+export default function registerQuickFixProvider() {
+  // In your extension's activate function:
+  vscode.languages.registerCodeActionsProvider(
+    { language: "*" },
+    new ContinueQuickFixProvider(),
+    {
+      providedCodeActionKinds: ContinueQuickFixProvider.providedCodeActionKinds,
+    }
+  );
+}
-- 
cgit v1.2.3-70-g09d2


From 53ac7b93f456b471eaa7f03e015e2d8c0ef393e5 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 18 Jul 2023 14:02:03 -0700
Subject: error handle on invalid config file, don't immediately show loading
 message

---
 continuedev/src/continuedev/core/sdk.py      | 19 ++++++++++-
 extension/package-lock.json                  |  4 +--
 extension/package.json                       |  2 +-
 extension/schema/FullState.d.ts              |  2 ++
 extension/schema/History.d.ts                |  2 ++
 extension/schema/HistoryNode.d.ts            |  2 ++
 extension/src/activation/activate.ts         | 48 ++++++++++++++++++++--------
 extension/src/activation/environmentSetup.ts |  2 +-
 extension/src/extension.ts                   | 12 +------
 schema/json/FullState.json                   |  8 +++++
 schema/json/History.json                     |  8 +++++
 schema/json/HistoryNode.json                 |  8 +++++
 12 files changed, 88 insertions(+), 29 deletions(-)

(limited to 'extension/src/activation/activate.ts')

diff --git a/continuedev/src/continuedev/core/sdk.py b/continuedev/src/continuedev/core/sdk.py
index 53214384..37a51efa 100644
--- a/continuedev/src/continuedev/core/sdk.py
+++ b/continuedev/src/continuedev/core/sdk.py
@@ -15,7 +15,7 @@ from ..libs.llm.anthropic import AnthropicLLM
 from ..libs.llm.ggml import GGML
 from .observation import Observation
 from ..server.ide_protocol import AbstractIdeProtocolServer
-from .main import Context, ContinueCustomException, History, Step, ChatMessage
+from .main import Context, ContinueCustomException, History, HistoryNode, Step, ChatMessage
 from ..steps.core.core import *
 from ..libs.llm.proxy_server import ProxyServer
 
@@ -155,6 +155,23 @@ class ContinueSDK(AbstractContinueSDK):
     @classmethod
     async def create(cls, autopilot: Autopilot) -> "ContinueSDK":
         sdk = ContinueSDK(autopilot)
+
+        try:
+            config = sdk._load_config()
+            sdk.config = config
+        except Exception as e:
+            print(e)
+            sdk.config = ContinueConfig()
+            msg_step = MessageStep(
+                name="Invalid Continue Config File", message=e.__repr__())
+            msg_step.description = e.__repr__()
+            sdk.history.add_node(HistoryNode(
+                step=msg_step,
+                observation=None,
+                depth=0,
+                active=False
+            ))
+
         sdk.models = await Models.create(sdk)
         return sdk
 
diff --git a/extension/package-lock.json b/extension/package-lock.json
index 107a7001..6818857b 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.179",
+      "version": "0.0.181",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 89c6daf5..b37bb1b6 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
   "displayName": "Continue",
   "pricing": "Free",
   "description": "The open-source coding autopilot",
-  "version": "0.0.179",
+  "version": "0.0.181",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/schema/FullState.d.ts b/extension/schema/FullState.d.ts
index abb0832d..1b7b1f3b 100644
--- a/extension/schema/FullState.d.ts
+++ b/extension/schema/FullState.d.ts
@@ -21,6 +21,7 @@ export type ManageOwnChatContext = boolean;
 export type Depth = number;
 export type Deleted = boolean;
 export type Active = boolean;
+export type Logs = string[];
 export type Timeline = HistoryNode[];
 export type CurrentIndex = number;
 export type Active1 = boolean;
@@ -69,6 +70,7 @@ export interface HistoryNode {
   depth: Depth;
   deleted?: Deleted;
   active?: Active;
+  logs?: Logs;
   [k: string]: unknown;
 }
 export interface Step {
diff --git a/extension/schema/History.d.ts b/extension/schema/History.d.ts
index 6eb8ad81..90124f4a 100644
--- a/extension/schema/History.d.ts
+++ b/extension/schema/History.d.ts
@@ -21,6 +21,7 @@ export type ManageOwnChatContext = boolean;
 export type Depth = number;
 export type Deleted = boolean;
 export type Active = boolean;
+export type Logs = string[];
 export type Timeline = HistoryNode[];
 export type CurrentIndex = number;
 
@@ -41,6 +42,7 @@ export interface HistoryNode {
   depth: Depth;
   deleted?: Deleted;
   active?: Active;
+  logs?: Logs;
   [k: string]: unknown;
 }
 export interface Step {
diff --git a/extension/schema/HistoryNode.d.ts b/extension/schema/HistoryNode.d.ts
index bc77be89..5ad32061 100644
--- a/extension/schema/HistoryNode.d.ts
+++ b/extension/schema/HistoryNode.d.ts
@@ -21,6 +21,7 @@ export type ManageOwnChatContext = boolean;
 export type Depth = number;
 export type Deleted = boolean;
 export type Active = boolean;
+export type Logs = string[];
 
 /**
  * A point in history, a list of which make up History
@@ -31,6 +32,7 @@ export interface HistoryNode1 {
   depth: Depth;
   deleted?: Deleted;
   active?: Active;
+  logs?: Logs;
   [k: string]: unknown;
 }
 export interface Step {
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 5c6ffa02..8ea08e89 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -36,22 +36,44 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     })
     .catch((e) => console.log("Error checking for extension updates: ", e));
 
-  // Start the Python server
-  await new Promise((resolve, reject) => {
-    vscode.window.withProgress(
-      {
-        location: vscode.ProgressLocation.Notification,
-        title:
-          "Starting Continue Server... (it may take a minute to download Python packages)",
-        cancellable: false,
-      },
-      async (progress, token) => {
-        await startContinuePythonServer();
-        resolve(null);
+  // Wrap the server start logic in a new Promise
+  const serverStartPromise = new Promise((resolve, reject) => {
+    let serverStarted = false;
+
+    // Start the server and set serverStarted to true when done
+    startContinuePythonServer().then(() => {
+      serverStarted = true;
+      resolve(null);
+    });
+
+    // Wait for 2 seconds
+    setTimeout(() => {
+      // If the server hasn't started after 2 seconds, show the notification
+      if (!serverStarted) {
+        vscode.window.withProgress(
+          {
+            location: vscode.ProgressLocation.Notification,
+            title:
+              "Starting Continue Server... (it may take a minute to download Python packages)",
+            cancellable: false,
+          },
+          async (progress, token) => {
+            // Wait for the server to start
+            while (!serverStarted) {
+              await new Promise((innerResolve) =>
+                setTimeout(innerResolve, 1000)
+              );
+            }
+            return Promise.resolve();
+          }
+        );
       }
-    );
+    }, 2000);
   });
 
+  // Await the server start promise
+  await serverStartPromise;
+
   // Register commands and providers
   sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
   registerAllCodeLensProviders(context);
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 69a3b75a..c341db39 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -39,7 +39,7 @@ async function retryThenFail(
 
     // Show corresponding error message depending on the platform
     let msg =
-      "Failed to set up Continue extension. Please email nate@continue.dev and we'll get this fixed ASAP!";
+      "Failed to set up Continue extension. Please email hi@continue.dev and we'll get this fixed ASAP!";
     try {
       switch (process.platform) {
         case "win32":
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index 6959ec05..f2e580a1 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -17,15 +17,5 @@ async function dynamicImportAndActivate(context: vscode.ExtensionContext) {
 }
 
 export function activate(context: vscode.ExtensionContext) {
-  // Only show progress if we have to setup
-  vscode.window.withProgress(
-    {
-      location: vscode.ProgressLocation.Notification,
-      title: "Setting up Continue extension...",
-      cancellable: false,
-    },
-    async () => {
-      dynamicImportAndActivate(context);
-    }
-  );
+  dynamicImportAndActivate(context);
 }
diff --git a/schema/json/FullState.json b/schema/json/FullState.json
index 5a7e9d10..62ed337b 100644
--- a/schema/json/FullState.json
+++ b/schema/json/FullState.json
@@ -120,6 +120,14 @@
           "title": "Active",
           "default": true,
           "type": "boolean"
+        },
+        "logs": {
+          "title": "Logs",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "required": [
diff --git a/schema/json/History.json b/schema/json/History.json
index ee797412..56415520 100644
--- a/schema/json/History.json
+++ b/schema/json/History.json
@@ -120,6 +120,14 @@
           "title": "Active",
           "default": true,
           "type": "boolean"
+        },
+        "logs": {
+          "title": "Logs",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "required": [
diff --git a/schema/json/HistoryNode.json b/schema/json/HistoryNode.json
index d0e12ac5..81e239b3 100644
--- a/schema/json/HistoryNode.json
+++ b/schema/json/HistoryNode.json
@@ -120,6 +120,14 @@
           "title": "Active",
           "default": true,
           "type": "boolean"
+        },
+        "logs": {
+          "title": "Logs",
+          "default": [],
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       },
       "required": [
-- 
cgit v1.2.3-70-g09d2


From 627f260cee108476e5335584e81f5e36f3e248cb Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 18 Jul 2023 16:31:39 -0700
Subject: CONTRIBUTING.md

---
 CONTRIBUTING.md                                    | 94 +++++++++++++++++++++
 continuedev/src/continuedev/core/main.py           |  6 +-
 extension/react-app/src/App.tsx                    |  8 +-
 .../src/hooks/AbstractContinueGUIClientProtocol.ts | 35 ++++++++
 .../src/hooks/ContinueGUIClientProtocol.ts         | 93 +++++++++++++++++----
 .../react-app/src/hooks/useContinueGUIProtocol.ts  | 95 ----------------------
 extension/react-app/src/hooks/useWebsocket.ts      |  2 +-
 extension/src/activation/activate.ts               | 14 +---
 extension/src/continueIdeClient.ts                 | 10 +++
 9 files changed, 222 insertions(+), 135 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 extension/react-app/src/hooks/AbstractContinueGUIClientProtocol.ts
 delete mode 100644 extension/react-app/src/hooks/useContinueGUIProtocol.ts

(limited to 'extension/src/activation/activate.ts')

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..7e49dc2d
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,94 @@
+# Contributing to Continue
+
+## Table of Contents
+
+- [Continue Architecture](#continue-architecture)
+- [Core Concepts](#core-concepts)
+  - [Step](#step)
+- [Continue VS Code Client](#continue-vs-code-client)
+- [Continue IDE Websockets Protocol](#continue-ide-websockets-protocol)
+- [Continue GUI Websockets Protocol](#continue-gui-websockets-protocol)
+- [Ways to Contribute](#ways-to-contribute)
+  - [Report Bugs](#report-bugs)
+  - [Suggest Enhancements](#suggest-enhancements)
+  - [Updating / Improving Documentation](#updating--improving-documentation)
+
+## Continue Architecture
+
+Continue consists of 3 components, designed so that Continue can easily be extended to work in any IDE:
+
+1. **Continue Server** - The Continue Server is responsible for keeping state, running the autopilot loop which takes actions, and communicating between the IDE and GUI.
+
+2. **Continue IDE Client** - The Continue IDE Client is a plugin for the IDE which implements the Continue IDE Protocol. This allows the server to request actions to be taken within the IDE, for example if `sdk.ide.setFileOpen("main.py")` is called on the server, it will communicate over websocketes with the IDE, which will open the file `main.py`. The first IDE Client we have built is for VS Code, but we plan to build clients for other IDEs in the future. The IDE Client must 1. implement the websockets protocol, as is done [here](./extension/src/continueIdeClient.ts) for VS Code and 2. launch the Continue Server, like [here](./extension/src/activation/environmentSetup.ts), and 3. display the Continue GUI in a sidebar, like [here](./extension/src/debugPanel.ts).
+
+3. **Continue GUI** - The Continue GUI is a React application that gives the user control over Continue. It displays the history of Steps, shows what context is included in the current Step, and lets the users enter natural language or slash commands to initiate new Steps. The GUI communicates with the Continue Server over its own websocket connection
+
+It is important that the IDE Client and GUI never communicate except when the IDE Client initially sets up the GUI. This ensures that the server is the source-of-truth for state, and that we can easily extend Continue to work in other IDEs.
+
+![Continue Architecture](https://continue.dev/docs/assets/images/continue-architecture-146a90742e25f6524452c74fe44fa2a0.png)
+
+## Core Concepts
+
+All of Continue's logic happens inside of the server, and it is built around a few core concepts. Most of these are Pydantic Models defined in [core/main.py](./continuedev/src/continuedev/core/main.py).
+
+### `Step`
+
+Everything in Continue is a "Step". The `Step` class defines 2 methods:
+
+1. `async def run(self, sdk: ContinueSDK) -> Coroutine[Observation, None, None]` - This method defines what happens when the Step is run. It has access to the Continue SDK, which lets you take actions in the IDE, call LLMs, run nested Steps, and more. Optionally, a Step can return an `Observation` object, which a `Policy` can use to make decisions about what to do next.
+
+2. `async def describe(self, models: Models) -> Coroutine[str, None, None]` - After each Step is run, this method is called to asynchronously generate a summary title for the step. A `Models` object is passed so that you have access to LLMs to summarize for you.
+
+Steps are designed to be composable, so that you can easily build new Steps by combining existing ones. And because they are Pydantic models, they can instantly be used as tools useable by an LLM, for example with OpenAI's function-calling functionality (see [ChatWithFunctions](./continuedev/src/continuedev/steps/chat.py) for an example of this).
+
+Some of the most commonly used Steps are:
+
+- [`SimpleChatStep`](./continuedev/src/continuedev/steps/chat.py) - This is the default Step that is run when the user enters natural language input. It takes the user's input and runs it through the default LLM, then displays the result in the GUI.
+
+- [`EditHighlightedCodeStep`](./continuedev/src/continuedev/steps/core/core.py) - This is the Step run when a user highlights code, enters natural language, and presses CMD/CTRL+ENTER, or uses the slash command '/edit'. It opens a side-by-side diff editor, where updated code is streamed to fulfil the user's request.
+
+### `Autopilot`
+
+### `Observation`
+
+### `Policy`
+
+### Continue VS Code Client
+
+The starting point for the VS Code extension is [activate.ts](./extension/src/activation/activate.ts). The `activateExtension` function here will:
+
+1. Check whether the current version of the extension is up-to-date and, if not, display a notification
+
+2. Initialize the Continue IDE Client and establish a connection with the Continue Server
+
+3. Load the Continue GUI in the sidebar of the IDE and begin a new session
+
+### Continue IDE Websockets Protocol
+
+On the IDE side, this is implemented in [continueIdeClient.ts](./extension/src/continueIdeClient.ts). On the server side, this is implemented in [ide.py](./continuedev/src/continuedev/server/ide.py). You can see [ide_protocol.py](./continuedev/src/continuedev/server/ide_protocol.py) for the protocol definition.
+
+### Continue GUI Websockets Protocol
+
+On the GUI side, this is implemented in [ContinueGUIClientProtocol.ts](./extension/react-app/src/hooks/ContinueGUIClientProtocol.ts). On the server side, this is implemented in [gui.py](./continuedev/src/continuedev/server/gui.py). You can see [gui_protocol.py](./continuedev/src/continuedev/server/gui_protocol.py) or [AbstractContinueGUIClientProtocol.ts](./extension/react-app/src/hooks/AbstractContinueGUIClientProtocol.ts) for the protocol definition.
+
+When state is updated on the server, we currently send the entirety of the object over websockets to the GUI. This will of course have to be improved soon. The state object, `FullState`, is defined in [core/main.py](./continuedev/src/continuedev/core/main.py) and includes:
+
+- `history`, a record of previously run Steps. Displayed in order in the sidebar.
+- `active`, whether the autopilot is currently running a step. Displayed as a loader while step is running.
+- `user_input_queue`, the queue of user inputs that have not yet been processed due to waiting for previous Steps to complete. Displayed below the `active` loader until popped from the queue.
+- `default_model`, the default model used for completions. Displayed as a toggleable button on the bottom of the GUI.
+- `highlighted_ranges`, the ranges of code that have been selected to include as context. Displayed just above the main text input.
+- `slash_commands`, the list of available slash commands. Displayed in the main text input dropdown.
+- `adding_highlighted_code`, whether highlighting of new code for context is locked. Displayed as a button adjacent to `highlighted_ranges`.
+
+Updates are sent with `await sdk.update_ui()` when needed explicitly or `await autopilot.update_subscribers()` automatically between each Step. The GUI can listen for state updates with `ContinueGUIClientProtocol.onStateUpdate()`.
+
+## Ways to Contribute
+
+### Report Bugs
+
+### Suggest Enhancements
+
+### Updating / Improving Documentation
+
+Continue is continuously improving, but a feature isn't complete until it is reflected in the documentation!
diff --git a/continuedev/src/continuedev/core/main.py b/continuedev/src/continuedev/core/main.py
index 5931d978..50d01f8d 100644
--- a/continuedev/src/continuedev/core/main.py
+++ b/continuedev/src/continuedev/core/main.py
@@ -259,10 +259,8 @@ class Step(ContinueBaseModel):
 
     def dict(self, *args, **kwargs):
         d = super().dict(*args, **kwargs)
-        if self.description is not None:
-            d["description"] = self.description
-        else:
-            d["description"] = ""
+        # Make sure description is always a string
+        d["description"] = self.description or ""
         return d
 
     @validator("name", pre=True, always=True)
diff --git a/extension/react-app/src/App.tsx b/extension/react-app/src/App.tsx
index c9bd42e0..aa462171 100644
--- a/extension/react-app/src/App.tsx
+++ b/extension/react-app/src/App.tsx
@@ -2,7 +2,7 @@ import DebugPanel from "./components/DebugPanel";
 import GUI from "./pages/gui";
 import { createContext } from "react";
 import useContinueGUIProtocol from "./hooks/useWebsocket";
-import ContinueGUIClientProtocol from "./hooks/useContinueGUIProtocol";
+import ContinueGUIClientProtocol from "./hooks/ContinueGUIClientProtocol";
 
 export const GUIClientContext = createContext<
   ContinueGUIClientProtocol | undefined
@@ -13,11 +13,7 @@ function App() {
 
   return (
     <GUIClientContext.Provider value={client}>
-      <DebugPanel
-        tabs={[
-          { element: <GUI />, title: "GUI" }
-        ]}
-      />
+      <DebugPanel tabs={[{ element: <GUI />, title: "GUI" }]} />
     </GUIClientContext.Provider>
   );
 }
diff --git a/extension/react-app/src/hooks/AbstractContinueGUIClientProtocol.ts b/extension/react-app/src/hooks/AbstractContinueGUIClientProtocol.ts
new file mode 100644
index 00000000..6c0df8fc
--- /dev/null
+++ b/extension/react-app/src/hooks/AbstractContinueGUIClientProtocol.ts
@@ -0,0 +1,35 @@
+abstract class AbstractContinueGUIClientProtocol {
+  abstract sendMainInput(input: string): void;
+
+  abstract reverseToIndex(index: number): void;
+
+  abstract sendRefinementInput(input: string, index: number): void;
+
+  abstract sendStepUserInput(input: string, index: number): void;
+
+  abstract onStateUpdate(state: any): void;
+
+  abstract onAvailableSlashCommands(
+    callback: (commands: { name: string; description: string }[]) => void
+  ): void;
+
+  abstract changeDefaultModel(model: string): void;
+
+  abstract sendClear(): void;
+
+  abstract retryAtIndex(index: number): void;
+
+  abstract deleteAtIndex(index: number): void;
+
+  abstract deleteContextAtIndices(indices: number[]): void;
+
+  abstract setEditingAtIndices(indices: number[]): void;
+
+  abstract setPinnedAtIndices(indices: number[]): void;
+
+  abstract toggleAddingHighlightedCode(): void;
+
+  abstract showLogsAtIndex(index: number): void;
+}
+
+export default AbstractContinueGUIClientProtocol;
diff --git a/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
index 6c0df8fc..7d6c2a71 100644
--- a/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
+++ b/extension/react-app/src/hooks/ContinueGUIClientProtocol.ts
@@ -1,35 +1,92 @@
-abstract class AbstractContinueGUIClientProtocol {
-  abstract sendMainInput(input: string): void;
+import AbstractContinueGUIClientProtocol from "./AbstractContinueGUIClientProtocol";
+import { Messenger, WebsocketMessenger } from "./messenger";
+import { VscodeMessenger } from "./vscodeMessenger";
 
-  abstract reverseToIndex(index: number): void;
+class ContinueGUIClientProtocol extends AbstractContinueGUIClientProtocol {
+  messenger: Messenger;
+  // Server URL must contain the session ID param
+  serverUrlWithSessionId: string;
 
-  abstract sendRefinementInput(input: string, index: number): void;
+  constructor(
+    serverUrlWithSessionId: string,
+    useVscodeMessagePassing: boolean
+  ) {
+    super();
+    this.serverUrlWithSessionId = serverUrlWithSessionId;
+    this.messenger = useVscodeMessagePassing
+      ? new VscodeMessenger(serverUrlWithSessionId)
+      : new WebsocketMessenger(serverUrlWithSessionId);
+  }
 
-  abstract sendStepUserInput(input: string, index: number): void;
+  sendMainInput(input: string) {
+    this.messenger.send("main_input", { input });
+  }
 
-  abstract onStateUpdate(state: any): void;
+  reverseToIndex(index: number) {
+    this.messenger.send("reverse_to_index", { index });
+  }
 
-  abstract onAvailableSlashCommands(
+  sendRefinementInput(input: string, index: number) {
+    this.messenger.send("refinement_input", { input, index });
+  }
+
+  sendStepUserInput(input: string, index: number) {
+    this.messenger.send("step_user_input", { input, index });
+  }
+
+  onStateUpdate(callback: (state: any) => void) {
+    this.messenger.onMessageType("state_update", (data: any) => {
+      if (data.state) {
+        callback(data.state);
+      }
+    });
+  }
+
+  onAvailableSlashCommands(
     callback: (commands: { name: string; description: string }[]) => void
-  ): void;
+  ) {
+    this.messenger.onMessageType("available_slash_commands", (data: any) => {
+      if (data.commands) {
+        callback(data.commands);
+      }
+    });
+  }
 
-  abstract changeDefaultModel(model: string): void;
+  changeDefaultModel(model: string) {
+    this.messenger.send("change_default_model", { model });
+  }
 
-  abstract sendClear(): void;
+  sendClear() {
+    this.messenger.send("clear_history", {});
+  }
 
-  abstract retryAtIndex(index: number): void;
+  retryAtIndex(index: number) {
+    this.messenger.send("retry_at_index", { index });
+  }
 
-  abstract deleteAtIndex(index: number): void;
+  deleteAtIndex(index: number) {
+    this.messenger.send("delete_at_index", { index });
+  }
 
-  abstract deleteContextAtIndices(indices: number[]): void;
+  deleteContextAtIndices(indices: number[]) {
+    this.messenger.send("delete_context_at_indices", { indices });
+  }
 
-  abstract setEditingAtIndices(indices: number[]): void;
+  setEditingAtIndices(indices: number[]) {
+    this.messenger.send("set_editing_at_indices", { indices });
+  }
 
-  abstract setPinnedAtIndices(indices: number[]): void;
+  setPinnedAtIndices(indices: number[]) {
+    this.messenger.send("set_pinned_at_indices", { indices });
+  }
 
-  abstract toggleAddingHighlightedCode(): void;
+  toggleAddingHighlightedCode(): void {
+    this.messenger.send("toggle_adding_highlighted_code", {});
+  }
 
-  abstract showLogsAtIndex(index: number): void;
+  showLogsAtIndex(index: number): void {
+    this.messenger.send("show_logs_at_index", { index });
+  }
 }
 
-export default AbstractContinueGUIClientProtocol;
+export default ContinueGUIClientProtocol;
diff --git a/extension/react-app/src/hooks/useContinueGUIProtocol.ts b/extension/react-app/src/hooks/useContinueGUIProtocol.ts
deleted file mode 100644
index fef5b2e1..00000000
--- a/extension/react-app/src/hooks/useContinueGUIProtocol.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import AbstractContinueGUIClientProtocol from "./ContinueGUIClientProtocol";
-// import { Messenger, WebsocketMessenger } from "../../../src/util/messenger";
-import { Messenger, WebsocketMessenger } from "./messenger";
-import { VscodeMessenger } from "./vscodeMessenger";
-
-class ContinueGUIClientProtocol extends AbstractContinueGUIClientProtocol {
-  messenger: Messenger;
-  // Server URL must contain the session ID param
-  serverUrlWithSessionId: string;
-
-  constructor(
-    serverUrlWithSessionId: string,
-    useVscodeMessagePassing: boolean
-  ) {
-    super();
-    this.serverUrlWithSessionId = serverUrlWithSessionId;
-    if (useVscodeMessagePassing) {
-      this.messenger = new VscodeMessenger(serverUrlWithSessionId);
-    } else {
-      this.messenger = new WebsocketMessenger(serverUrlWithSessionId);
-    }
-  }
-
-  sendMainInput(input: string) {
-    this.messenger.send("main_input", { input });
-  }
-
-  reverseToIndex(index: number) {
-    this.messenger.send("reverse_to_index", { index });
-  }
-
-  sendRefinementInput(input: string, index: number) {
-    this.messenger.send("refinement_input", { input, index });
-  }
-
-  sendStepUserInput(input: string, index: number) {
-    this.messenger.send("step_user_input", { input, index });
-  }
-
-  onStateUpdate(callback: (state: any) => void) {
-    this.messenger.onMessageType("state_update", (data: any) => {
-      if (data.state) {
-        callback(data.state);
-      }
-    });
-  }
-
-  onAvailableSlashCommands(
-    callback: (commands: { name: string; description: string }[]) => void
-  ) {
-    this.messenger.onMessageType("available_slash_commands", (data: any) => {
-      if (data.commands) {
-        callback(data.commands);
-      }
-    });
-  }
-
-  changeDefaultModel(model: string) {
-    this.messenger.send("change_default_model", { model });
-  }
-
-  sendClear() {
-    this.messenger.send("clear_history", {});
-  }
-
-  retryAtIndex(index: number) {
-    this.messenger.send("retry_at_index", { index });
-  }
-
-  deleteAtIndex(index: number) {
-    this.messenger.send("delete_at_index", { index });
-  }
-
-  deleteContextAtIndices(indices: number[]) {
-    this.messenger.send("delete_context_at_indices", { indices });
-  }
-
-  setEditingAtIndices(indices: number[]) {
-    this.messenger.send("set_editing_at_indices", { indices });
-  }
-
-  setPinnedAtIndices(indices: number[]) {
-    this.messenger.send("set_pinned_at_indices", { indices });
-  }
-
-  toggleAddingHighlightedCode(): void {
-    this.messenger.send("toggle_adding_highlighted_code", {});
-  }
-
-  showLogsAtIndex(index: number): void {
-    this.messenger.send("show_logs_at_index", { index });
-  }
-}
-
-export default ContinueGUIClientProtocol;
diff --git a/extension/react-app/src/hooks/useWebsocket.ts b/extension/react-app/src/hooks/useWebsocket.ts
index e762666f..6b36be97 100644
--- a/extension/react-app/src/hooks/useWebsocket.ts
+++ b/extension/react-app/src/hooks/useWebsocket.ts
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react";
 import { RootStore } from "../redux/store";
 import { useSelector } from "react-redux";
-import ContinueGUIClientProtocol from "./useContinueGUIProtocol";
+import ContinueGUIClientProtocol from "./ContinueGUIClientProtocol";
 import { postVscMessage } from "../vscode";
 
 function useContinueGUIProtocol(useVscodeMessagePassing: boolean = true) {
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index 8ea08e89..a7f6c55b 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -36,8 +36,8 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     })
     .catch((e) => console.log("Error checking for extension updates: ", e));
 
-  // Wrap the server start logic in a new Promise
-  const serverStartPromise = new Promise((resolve, reject) => {
+  // Start the server and display loader if taking > 2 seconds
+  await new Promise((resolve) => {
     let serverStarted = false;
 
     // Start the server and set serverStarted to true when done
@@ -71,15 +71,6 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     }, 2000);
   });
 
-  // Await the server start promise
-  await serverStartPromise;
-
-  // Register commands and providers
-  sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
-  registerAllCodeLensProviders(context);
-  registerAllCommands(context);
-  registerQuickFixProvider();
-
   // Initialize IDE Protocol Client
   const serverUrl = getContinueServerUrl();
   ideProtocolClient = new IdeProtocolClient(
@@ -87,6 +78,7 @@ export async function activateExtension(context: vscode.ExtensionContext) {
     context
   );
 
+  // Register Continue GUI as sidebar webview, and beging a new session
   {
     const sessionIdPromise = await ideProtocolClient.getSessionId();
     const provider = new ContinueGUIWebviewViewProvider(sessionIdPromise);
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 14a8df72..a1370a01 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -16,6 +16,10 @@ import fs = require("fs");
 import { WebsocketMessenger } from "./util/messenger";
 import { diffManager } from "./diffs";
 import path = require("path");
+import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
+import { registerAllCodeLensProviders } from "./lang-server/codeLens";
+import { registerAllCommands } from "./commands";
+import registerQuickFixProvider from "./lang-server/codeActions";
 
 const continueVirtualDocumentScheme = "continue";
 
@@ -76,6 +80,12 @@ class IdeProtocolClient {
     this._serverUrl = serverUrl;
     this._newWebsocketMessenger();
 
+    // Register commands and providers
+    sendTelemetryEvent(TelemetryEvent.ExtensionActivated);
+    registerAllCodeLensProviders(context);
+    registerAllCommands(context);
+    registerQuickFixProvider();
+
     // Setup listeners for any file changes in open editors
     // vscode.workspace.onDidChangeTextDocument((event) => {
     //   if (this._makingEdit === 0) {
-- 
cgit v1.2.3-70-g09d2