From a8c91ffaccd181a0f6c28e3d218c3c7eeb0282c3 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 10 Jul 2023 20:08:04 -0700
Subject: gifs in outside media folder

---
 extension/package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 5733c2dd..52b2e7b9 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.143",
+  "version": "0.0.146",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.143",
+      "version": "0.0.146",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
-- 
cgit v1.2.3-70-g09d2


From 68193a76211472ff5e9265f6f7aa86e2d406fa7f Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Mon, 10 Jul 2023 20:10:32 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 52b2e7b9..71f4d974 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.146",
+  "version": "0.0.147",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.146",
+      "version": "0.0.147",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 393c5d70..c41fa549 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.146",
+  "version": "0.0.147",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 84910d445f44f8de1f160ff81e06c4eaf9c17ee7 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 11 Jul 2023 11:48:43 -0700
Subject: air on the side of killing server

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 71f4d974..d778b097 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.147",
+  "version": "0.0.149",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.147",
+      "version": "0.0.149",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index d9f155df..56c49f27 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.147",
+  "version": "0.0.149",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 02118501..ff8d3158 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -366,24 +366,26 @@ export async function startContinuePythonServer() {
   setupServerPath();
 
   return await retryThenFail(async () => {
-    if (await checkServerRunning(serverUrl)) {
-      // Kill the server if it is running an old version
-      if (fs.existsSync(serverVersionPath())) {
-        const serverVersion = fs.readFileSync(serverVersionPath(), "utf8");
-        if (serverVersion === getExtensionVersion()) {
-          return;
-        }
-      }
-      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
-        );
+    // Kill the server if it is running an old version
+    if (fs.existsSync(serverVersionPath())) {
+      const serverVersion = fs.readFileSync(serverVersionPath(), "utf8");
+      if (
+        serverVersion === getExtensionVersion() &&
+        (await checkServerRunning(serverUrl))
+      ) {
+        // The current version is already up and running, no need to continue
+        return;
       }
     }
+    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
+      );
+    }
 
     // Do this after above check so we don't have to waste time setting up the env
     await setupPythonEnv();
-- 
cgit v1.2.3-70-g09d2


From f515c9179b27885a024c197f8dead0c2e311aa8e Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 11 Jul 2023 12:33:02 -0700
Subject: patch

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index d778b097..c43851a2 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.149",
+  "version": "0.0.150",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.149",
+      "version": "0.0.150",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 56c49f27..e2fe6e8e 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.149",
+  "version": "0.0.150",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index f5d825c9..8b384e1d 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -224,6 +224,9 @@ async function setupPythonEnv() {
       // First, try to run the command to install python3-venv
       let [stdout, stderr] = await runCommand(`${pythonCmd} --version`);
       if (stderr) {
+        await vscode.window.showErrorMessage(
+          "Python3 is not installed. Please install from https://www.python.org/downloads, reload VS Code, and try again."
+        );
         throw new Error(stderr);
       }
       const version = stdout.split(" ")[1].split(".")[1];
-- 
cgit v1.2.3-70-g09d2


From ea76462f971d6d235baacbb85d6e9ae6fe09d7e0 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 11 Jul 2023 12:43:15 -0700
Subject: fix bug uninstalling continuedev

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index c43851a2..b6147b2c 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.150",
+  "version": "0.0.151",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.150",
+      "version": "0.0.151",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index e2fe6e8e..a57f6065 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.150",
+  "version": "0.0.151",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 8b384e1d..881da9b5 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -156,10 +156,7 @@ async function checkRequirementsInstalled() {
         activateCmd,
         `${pipCmd} uninstall -y continuedev`,
       ].join(" ; ");
-      const [, stderr] = await runCommand(removeOldVersionCommand);
-      if (stderr) {
-        throw new Error(stderr);
-      }
+      await runCommand(removeOldVersionCommand);
       return false;
     }
   }
-- 
cgit v1.2.3-70-g09d2


From c66448f4f4cb2bf743d1943a5cff7525530392bd Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Tue, 11 Jul 2023 15:51:26 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index b6147b2c..683bf261 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.151",
+  "version": "0.0.152",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.151",
+      "version": "0.0.152",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index a57f6065..a0f970ed 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.151",
+  "version": "0.0.152",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 856d450c7277edd0302f17365322e73dc37808e0 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 09:42:25 -0700
Subject: patch, don't delete non-active steps with cmd+back

---
 extension/package-lock.json          | 4 ++--
 extension/package.json               | 2 +-
 extension/react-app/src/tabs/gui.tsx | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 683bf261..d310643b 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.152",
+  "version": "0.0.153",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.152",
+      "version": "0.0.153",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index a0f970ed..61eee205 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.152",
+  "version": "0.0.153",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/react-app/src/tabs/gui.tsx b/extension/react-app/src/tabs/gui.tsx
index 619b91e1..b6a18dc8 100644
--- a/extension/react-app/src/tabs/gui.tsx
+++ b/extension/react-app/src/tabs/gui.tsx
@@ -147,7 +147,8 @@ function GUI(props: GUIProps) {
       } else if (
         e.key === "Backspace" &&
         e.metaKey &&
-        typeof history?.current_index !== "undefined"
+        typeof history?.current_index !== "undefined" &&
+        history.timeline[history.current_index]?.active
       ) {
         client?.deleteAtIndex(history.current_index);
       }
-- 
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/package-lock.json')

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 f2af87613c26c5e6a7d11198270b1da5c8809a23 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 15:37:11 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 5d1cf395..75411bf9 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.154",
+  "version": "0.0.155",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.154",
+      "version": "0.0.155",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index ab23b0b0..69792ea2 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.154",
+  "version": "0.0.155",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 772358dcbdc848f4f513a0af49114965948624d1 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 16:11:50 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 75411bf9..01e5bc1a 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.155",
+  "version": "0.0.156",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.155",
+      "version": "0.0.156",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 6f64ee60..f3402abf 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.155",
+  "version": "0.0.156",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 9558a3602c8678dacd3087bf6512b1bc4c96bc22 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 22:01:46 -0700
Subject: patch, send state initially

---
 continuedev/src/continuedev/server/gui.py | 2 +-
 extension/package-lock.json               | 4 ++--
 extension/package.json                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py
index 8f6f68f6..238273b2 100644
--- a/continuedev/src/continuedev/server/gui.py
+++ b/continuedev/src/continuedev/server/gui.py
@@ -174,7 +174,7 @@ async def websocket_endpoint(websocket: WebSocket, session: Session = Depends(we
         protocol.websocket = websocket
 
         # Update any history that may have happened before connection
-        # await protocol.send_state_update()
+        await protocol.send_state_update()
 
         while AppStatus.should_exit is False:
             message = await websocket.receive_text()
diff --git a/extension/package-lock.json b/extension/package-lock.json
index 01e5bc1a..ea853fae 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.156",
+  "version": "0.0.157",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.156",
+      "version": "0.0.157",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index f3402abf..b3ff0b52 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.156",
+  "version": "0.0.157",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From f0ce0ad4537aadb8252cebd1b5ce25a91c60e392 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 12 Jul 2023 22:56:06 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index ea853fae..a235aa81 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.157",
+  "version": "0.0.158",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.157",
+      "version": "0.0.158",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index b3ff0b52..6bb6b720 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.157",
+  "version": "0.0.158",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 8a4acec505b01404f0582320f255d56b533c9145 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Thu, 13 Jul 2023 14:54:59 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index a235aa81..d84be971 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.158",
+  "version": "0.0.159",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.158",
+      "version": "0.0.159",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 6bb6b720..bdc67cc9 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.158",
+  "version": "0.0.159",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 7ba66d847d2c5b2d813ce93d343ab10bca4e83d5 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Thu, 13 Jul 2023 22:15:27 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index d84be971..169d1eea 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.159",
+  "version": "0.0.160",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.159",
+      "version": "0.0.160",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index bdc67cc9..f985607d 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.159",
+  "version": "0.0.160",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From bf89cc3edc1e9a95404d20283afaea76872e5972 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Thu, 13 Jul 2023 22:37:08 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 169d1eea..98e1d560 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.160",
+  "version": "0.0.161",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.160",
+      "version": "0.0.161",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index f985607d..3636686b 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.160",
+  "version": "0.0.161",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From f4d546c6ccddf8b6dca7c360f799e08f152bdf96 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 14 Jul 2023 02:02:20 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 98e1d560..65fdab12 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.161",
+  "version": "0.0.162",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.161",
+      "version": "0.0.162",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 3636686b..ef39582b 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.161",
+  "version": "0.0.162",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 5c6d2f1be8474d26124506e0c2a640fa68efe52d Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 14 Jul 2023 02:30:45 -0700
Subject: fixed unique_id being asyncio.run property

---
 continuedev/src/continuedev/server/ide.py          | 22 +++++++++++-----------
 continuedev/src/continuedev/server/ide_protocol.py |  5 +----
 continuedev/src/continuedev/steps/help.py          |  8 +++++---
 extension/package-lock.json                        |  4 ++--
 extension/package.json                             |  2 +-
 extension/react-app/src/components/ComboBox.tsx    | 17 ++---------------
 extension/react-app/src/components/Onboarding.tsx  |  1 +
 7 files changed, 23 insertions(+), 36 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index 12a21f19..73cce201 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -123,10 +123,12 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
         self.websocket = websocket
         self.session_manager = session_manager
 
-    workspace_directory: str
+    workspace_directory: str = None
+    unique_id: str = None
 
     async def initialize(self) -> List[str]:
         await self._send_json("workspaceDirectory", {})
+        await self._send_json("uniqueId", {})
         other_msgs = []
         while True:
             msg_string = await self.websocket.receive_text()
@@ -137,9 +139,13 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
             data = message["data"]
             if message_type == "workspaceDirectory":
                 self.workspace_directory = data["workspaceDirectory"]
-                break
+            elif message_type == "uniqueId":
+                self.unique_id = data["uniqueId"]
             else:
                 other_msgs.append(msg_string)
+
+            if self.workspace_directory is not None and self.unique_id is not None:
+                break
         return other_msgs
 
     async def _send_json(self, message_type: str, data: Any):
@@ -183,10 +189,12 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
             self.onMainUserInput(data["input"])
         elif message_type == "deleteAtIndex":
             self.onDeleteAtIndex(data["index"])
-        elif message_type in ["highlightedCode", "openFiles", "visibleFiles", "readFile", "editFile", "getUserSecret", "runCommand", "uniqueId"]:
+        elif message_type in ["highlightedCode", "openFiles", "visibleFiles", "readFile", "editFile", "getUserSecret", "runCommand"]:
             self.sub_queue.post(message_type, data)
         elif message_type == "workspaceDirectory":
             self.workspace_directory = data["workspaceDirectory"]
+        elif message_type == "uniqueId":
+            self.unique_id = data["uniqueId"]
         else:
             raise ValueError("Unknown message type", message_type)
 
@@ -311,14 +319,6 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
         resp = await self._send_and_receive_json({}, VisibleFilesResponse, "visibleFiles")
         return resp.visibleFiles
 
-    async def get_unique_id(self) -> str:
-        resp = await self._send_and_receive_json({}, UniqueIdResponse, "uniqueId")
-        return resp.uniqueId
-
-    @cached_property_no_none
-    def unique_id(self) -> str:
-        return asyncio.run(self.get_unique_id())
-
     async def getHighlightedCode(self) -> List[RangeInFile]:
         resp = await self._send_and_receive_json({}, HighlightedCodeResponse, "highlightedCode")
         return resp.highlightedCode
diff --git a/continuedev/src/continuedev/server/ide_protocol.py b/continuedev/src/continuedev/server/ide_protocol.py
index 2f78cf0e..d0fb0bf8 100644
--- a/continuedev/src/continuedev/server/ide_protocol.py
+++ b/continuedev/src/continuedev/server/ide_protocol.py
@@ -108,7 +108,4 @@ class AbstractIdeProtocolServer(ABC):
         """Show a diff"""
 
     workspace_directory: str
-
-    @abstractproperty
-    def unique_id(self) -> str:
-        """Get a unique ID for this IDE"""
+    unique_id: str
diff --git a/continuedev/src/continuedev/steps/help.py b/continuedev/src/continuedev/steps/help.py
index fdfb986f..2dc3647c 100644
--- a/continuedev/src/continuedev/steps/help.py
+++ b/continuedev/src/continuedev/steps/help.py
@@ -6,7 +6,7 @@ from ..libs.util.telemetry import capture_event
 help = dedent("""\
         Continue is an open-source coding autopilot. It is a VS Code extension that brings the power of ChatGPT to your IDE.
               
-        It gathers context for you and stores your interactions automatically, so that you can avoid copy/paste now and benefit from a customized LLM later.
+        It gathers context for you and stores your interactions automatically, so that you can avoid copy/paste now and benefit from a customized Large Language Model (LLM) later.
 
         Continue can be used to...
         1. Edit chunks of code with specific instructions (e.g. "/edit migrate this digital ocean terraform file into one that works for GCP")
@@ -25,6 +25,7 @@ help = dedent("""\
 
         If you have feedback, please use /feedback to let us know how you would like to use Continue. We are excited to hear from you!""")
 
+
 class HelpStep(Step):
 
     name: str = "Help"
@@ -41,7 +42,7 @@ class HelpStep(Step):
                     Information:
 
                     {help}""")
-        
+
         self.chat_context.append(ChatMessage(
             role="user",
             content=prompt,
@@ -54,4 +55,5 @@ class HelpStep(Step):
                 self.description += chunk["content"]
                 await sdk.update_ui()
 
-        capture_event(sdk.ide.unique_id, "help", {"question": question, "answer": self.description})
\ No newline at end of file
+        capture_event(sdk.ide.unique_id, "help", {
+                      "question": question, "answer": self.description})
diff --git a/extension/package-lock.json b/extension/package-lock.json
index 65fdab12..9d5c73e1 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.162",
+  "version": "0.0.163",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.162",
+      "version": "0.0.163",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index ef39582b..2b0f6b94 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.162",
+  "version": "0.0.163",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 7d6541c7..73db33ca 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -1,29 +1,16 @@
-import React, {
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useState,
-} from "react";
+import React, { useEffect, useImperativeHandle, useState } from "react";
 import { useCombobox } from "downshift";
 import styled from "styled-components";
 import {
-  buttonColor,
   defaultBorderRadius,
   lightGray,
   secondaryDark,
   vscBackground,
 } from ".";
 import CodeBlock from "./CodeBlock";
-import { RangeInFile } from "../../../src/client";
 import PillButton from "./PillButton";
 import HeaderButtonWithText from "./HeaderButtonWithText";
-import {
-  Trash,
-  LockClosed,
-  LockOpen,
-  Plus,
-  DocumentPlus,
-} from "@styled-icons/heroicons-outline";
+import { DocumentPlus } from "@styled-icons/heroicons-outline";
 import { HighlightedRangeContext } from "../../../schema/FullState";
 
 // #region styled components
diff --git a/extension/react-app/src/components/Onboarding.tsx b/extension/react-app/src/components/Onboarding.tsx
index e2dd6f57..6bfb0ccd 100644
--- a/extension/react-app/src/components/Onboarding.tsx
+++ b/extension/react-app/src/components/Onboarding.tsx
@@ -22,6 +22,7 @@ const StyledSpan = styled.span`
   &:hover {
     background-color: #ffffff33;
   }
+  white-space: nowrap;
 `;
 
 const Onboarding = () => {
-- 
cgit v1.2.3-70-g09d2


From 39cd2ef27d6ed439b00a9edec4a487343ff1c2c9 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 14 Jul 2023 03:24:46 -0700
Subject: warn of large highlighted ranges, cmd+k->m

---
 continuedev/src/continuedev/core/policy.py        |   2 +-
 continuedev/src/continuedev/steps/help.py         |   2 +-
 extension/package-lock.json                       |   4 +-
 extension/package.json                            |   6 +-
 extension/react-app/src/components/ComboBox.tsx   |   5 +
 extension/react-app/src/components/Onboarding.tsx |   1 +
 extension/react-app/src/components/PillButton.tsx | 167 +++++++++++++---------
 extension/react-app/src/pages/gui.tsx             |  27 ++--
 extension/src/commands.ts                         |  17 ++-
 extension/src/lang-server/codeLens.ts             |   4 +-
 10 files changed, 141 insertions(+), 94 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/continuedev/src/continuedev/core/policy.py b/continuedev/src/continuedev/core/policy.py
index 59ea78b1..bc897357 100644
--- a/continuedev/src/continuedev/core/policy.py
+++ b/continuedev/src/continuedev/core/policy.py
@@ -59,7 +59,7 @@ class DemoPolicy(Policy):
             return (
                 MessageStep(name="Welcome to Continue", message=dedent("""\
                     - Highlight code and ask a question or give instructions
-                    - Use `cmd+k` (Mac) / `ctrl+k` (Windows) to open Continue
+                    - Use `cmd+m` (Mac) / `ctrl+m` (Windows) to open Continue
                     - Use `/help` to ask questions about how to use Continue""")) >>
                 WelcomeStep() >>
                 # SetupContinueWorkspaceStep() >>
diff --git a/continuedev/src/continuedev/steps/help.py b/continuedev/src/continuedev/steps/help.py
index 2dc3647c..ba1e6087 100644
--- a/continuedev/src/continuedev/steps/help.py
+++ b/continuedev/src/continuedev/steps/help.py
@@ -19,7 +19,7 @@ help = dedent("""\
 
         Continue passes all of the sections of code you highlight, the code above and below the to-be edited highlighted code section, and all previous steps above input box as context to the LLM.
 
-        You can use cmd+k (Mac) / ctrl+k (Windows) to open Continue. You can use cmd+shift+e / ctrl+shift+e to open file Explorer. You can add your own OpenAI API key to VS Code Settings with `cmd+,`
+        You can use cmd+m (Mac) / ctrl+m (Windows) to open Continue. You can use cmd+shift+e / ctrl+shift+e to open file Explorer. You can add your own OpenAI API key to VS Code Settings with `cmd+,`
 
         If Continue is stuck loading, try using `cmd+shift+p` to open the command palette, search "Reload Window", and then select it. This will reload VS Code and Continue and often fixes issues.
 
diff --git a/extension/package-lock.json b/extension/package-lock.json
index 9d5c73e1..a79dd6b4 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.163",
+  "version": "0.0.164",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.163",
+      "version": "0.0.164",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 2b0f6b94..de1f395d 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.163",
+  "version": "0.0.164",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
@@ -111,8 +111,8 @@
     "keybindings": [
       {
         "command": "continue.focusContinueInput",
-        "mac": "cmd+k",
-        "key": "ctrl+k"
+        "mac": "cmd+m",
+        "key": "ctrl+m"
       },
       {
         "command": "continue.suggestionDown",
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index 73db33ca..bd0d59b5 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -228,6 +228,11 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
         )} */}
         {highlightedCodeSections.map((section, idx) => (
           <PillButton
+            warning={
+              section.range.contents.length > 4000 && section.editing
+                ? "Editing such a large range may be slow"
+                : undefined
+            }
             editing={section.editing}
             pinned={section.pinned}
             index={idx}
diff --git a/extension/react-app/src/components/Onboarding.tsx b/extension/react-app/src/components/Onboarding.tsx
index 6bfb0ccd..231c1e93 100644
--- a/extension/react-app/src/components/Onboarding.tsx
+++ b/extension/react-app/src/components/Onboarding.tsx
@@ -109,6 +109,7 @@ const Onboarding = () => {
             paddingBottom: "50px",
             textAlign: "center",
             cursor: "pointer",
+            whiteSpace: "nowrap",
           }}
         >
           <StyledSpan
diff --git a/extension/react-app/src/components/PillButton.tsx b/extension/react-app/src/components/PillButton.tsx
index 31d98c0f..d9d779d1 100644
--- a/extension/react-app/src/components/PillButton.tsx
+++ b/extension/react-app/src/components/PillButton.tsx
@@ -1,12 +1,11 @@
 import { useContext, useState } from "react";
 import styled from "styled-components";
+import { StyledTooltip, defaultBorderRadius, secondaryDark } from ".";
 import {
-  StyledTooltip,
-  defaultBorderRadius,
-  lightGray,
-  secondaryDark,
-} from ".";
-import { Trash, PaintBrush, MapPin } from "@styled-icons/heroicons-outline";
+  Trash,
+  PaintBrush,
+  ExclamationTriangle,
+} from "@styled-icons/heroicons-outline";
 import { GUIClientContext } from "../App";
 
 const Button = styled.button`
@@ -31,7 +30,6 @@ const GridDiv = styled.div`
   grid-template-columns: 1fr 1fr;
   align-items: center;
   border-radius: ${defaultBorderRadius};
-  overflow: hidden;
 
   background-color: ${secondaryDark};
 `;
@@ -48,6 +46,21 @@ const ButtonDiv = styled.div<{ backgroundColor: string }>`
   }
 `;
 
+const CircleDiv = styled.div`
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: red;
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2px;
+`;
+
 interface PillButtonProps {
   onHover?: (arg0: boolean) => void;
   onDelete?: () => void;
@@ -55,6 +68,7 @@ interface PillButtonProps {
   index: number;
   editing: boolean;
   pinned: boolean;
+  warning?: string;
 }
 
 const PillButton = (props: PillButtonProps) => {
@@ -63,75 +77,96 @@ const PillButton = (props: PillButtonProps) => {
 
   return (
     <>
-      <Button
-        style={{
-          position: "relative",
-          borderColor: props.editing
-            ? "#8800aa"
-            : props.pinned
-            ? "#ffff0099"
-            : "transparent",
-          borderWidth: "1px",
-          borderStyle: "solid",
-        }}
-        onMouseEnter={() => {
-          setIsHovered(true);
-          if (props.onHover) {
-            props.onHover(true);
-          }
-        }}
-        onMouseLeave={() => {
-          setIsHovered(false);
-          if (props.onHover) {
-            props.onHover(false);
-          }
-        }}
-      >
-        {isHovered && (
-          <GridDiv>
-            <ButtonDiv
-              data-tooltip-id={`edit-${props.index}`}
-              backgroundColor={"#8800aa55"}
-              onClick={() => {
-                client?.setEditingAtIndices([props.index]);
-              }}
-            >
-              <PaintBrush style={{ margin: "auto" }} width="1.6em"></PaintBrush>
-            </ButtonDiv>
+      <div style={{ position: "relative" }}>
+        <Button
+          style={{
+            position: "relative",
+            borderColor: props.warning
+              ? "red"
+              : props.editing
+              ? "#8800aa"
+              : props.pinned
+              ? "#ffff0099"
+              : "transparent",
+            borderWidth: "1px",
+            borderStyle: "solid",
+          }}
+          onMouseEnter={() => {
+            setIsHovered(true);
+            if (props.onHover) {
+              props.onHover(true);
+            }
+          }}
+          onMouseLeave={() => {
+            setIsHovered(false);
+            if (props.onHover) {
+              props.onHover(false);
+            }
+          }}
+        >
+          {isHovered && (
+            <GridDiv>
+              <ButtonDiv
+                data-tooltip-id={`edit-${props.index}`}
+                backgroundColor={"#8800aa55"}
+                onClick={() => {
+                  client?.setEditingAtIndices([props.index]);
+                }}
+              >
+                <PaintBrush
+                  style={{ margin: "auto" }}
+                  width="1.6em"
+                ></PaintBrush>
+              </ButtonDiv>
 
-            {/* <ButtonDiv
+              {/* <ButtonDiv
             data-tooltip-id={`pin-${props.index}`}
             backgroundColor={"#ffff0055"}
             onClick={() => {
               client?.setPinnedAtIndices([props.index]);
             }}
-          >
+            >
             <MapPin style={{ margin: "auto" }} width="1.6em"></MapPin>
           </ButtonDiv> */}
-            <StyledTooltip id={`pin-${props.index}`}>
-              Edit this range
+              <StyledTooltip id={`pin-${props.index}`}>
+                Edit this range
+              </StyledTooltip>
+              <ButtonDiv
+                data-tooltip-id={`delete-${props.index}`}
+                backgroundColor={"#cc000055"}
+                onClick={() => {
+                  if (props.onDelete) {
+                    props.onDelete();
+                  }
+                }}
+              >
+                <Trash style={{ margin: "auto" }} width="1.6em"></Trash>
+              </ButtonDiv>
+            </GridDiv>
+          )}
+          {props.title}
+        </Button>
+        <StyledTooltip id={`edit-${props.index}`}>
+          {props.editing
+            ? "Editing this range (with rest of file as context)"
+            : "Edit this range"}
+        </StyledTooltip>
+        <StyledTooltip id={`delete-${props.index}`}>Delete</StyledTooltip>
+        {props.warning && (
+          <>
+            <CircleDiv data-tooltip-id={`circle-div-${props.title}`}>
+              <ExclamationTriangle
+                style={{ margin: "auto" }}
+                width="1.0em"
+                strokeWidth={2}
+              />
+            </CircleDiv>
+            <StyledTooltip id={`circle-div-${props.title}`}>
+              {props.warning}
             </StyledTooltip>
-            <ButtonDiv
-              data-tooltip-id={`delete-${props.index}`}
-              backgroundColor={"#cc000055"}
-              onClick={() => {
-                if (props.onDelete) {
-                  props.onDelete();
-                }
-              }}
-            >
-              <Trash style={{ margin: "auto" }} width="1.6em"></Trash>
-            </ButtonDiv>
-          </GridDiv>
+          </>
         )}
-        {props.title}
-      </Button>
-      <StyledTooltip id={`edit-${props.index}`}>
-        {props.editing
-          ? "Editing this range (with rest of file as context)"
-          : "Edit this range"}
-      </StyledTooltip>
-      <StyledTooltip id={`delete-${props.index}`}>Delete</StyledTooltip>
+      </div>
     </>
   );
 };
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index 4ff260fa..57cebac3 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -95,11 +95,8 @@ function GUI(props: GUIProps) {
           name: "Welcome to Continue",
           hide: false,
           description: `- Highlight code and ask a question or give instructions
-- Use \`cmd+k\` (Mac) / \`ctrl+k\` (Windows) to open Continue
-- Use \`cmd+shift+e\` / \`ctrl+shift+e\` to open file Explorer
-- Add your own OpenAI API key to VS Code Settings with \`cmd+,\`
-- Use slash commands when you want fine-grained control
-- Past steps are included as part of the context by default`,
+          - Use \`cmd+m\` (Mac) / \`ctrl+m\` (Windows) to open Continue
+          - Use \`/help\` to ask questions about how to use Continue`,
           system_message: null,
           chat_context: [],
           manage_own_chat_context: false,
@@ -269,15 +266,17 @@ function GUI(props: GUIProps) {
   return (
     <>
       <Onboarding />
-      <TextDialog showDialog={showFeedbackDialog}
-      onEnter={(text) => {
-        client?.sendMainInput(`/feedback ${text}`);
-        setShowFeedbackDialog(false);
-      }}
-      onClose={() => {
-        setShowFeedbackDialog(false);
-      }}
-      message={feedbackDialogMessage} />
+      <TextDialog
+        showDialog={showFeedbackDialog}
+        onEnter={(text) => {
+          client?.sendMainInput(`/feedback ${text}`);
+          setShowFeedbackDialog(false);
+        }}
+        onClose={() => {
+          setShowFeedbackDialog(false);
+        }}
+        message={feedbackDialogMessage}
+      />
 
       <TopGUIDiv
         ref={topGuiDivRef}
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 0b002549..0025340a 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -19,6 +19,8 @@ import { debugPanelWebview } from "./debugPanel";
 import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
 import { ideProtocolClient } from "./activation/activate";
 
+let focusedOnContinueInput = false;
+
 // Copy everything over from extension.ts
 const commandsMap: { [command: string]: (...args: any) => any } = {
   "continue.suggestionDown": suggestionDownCommand,
@@ -30,10 +32,15 @@ const commandsMap: { [command: string]: (...args: any) => any } = {
   "continue.acceptAllSuggestions": acceptAllSuggestionsCommand,
   "continue.rejectAllSuggestions": rejectAllSuggestionsCommand,
   "continue.focusContinueInput": async () => {
-    vscode.commands.executeCommand("continue.continueGUIView.focus");
-    debugPanelWebview?.postMessage({
-      type: "focusContinueInput",
-    });
+    if (focusedOnContinueInput) {
+      vscode.commands.executeCommand("workbench.action.focusActiveEditorGroup");
+    } else {
+      vscode.commands.executeCommand("continue.continueGUIView.focus");
+      debugPanelWebview?.postMessage({
+        type: "focusContinueInput",
+      });
+    }
+    focusedOnContinueInput = !focusedOnContinueInput;
   },
   "continue.quickTextEntry": async () => {
     const text = await vscode.window.showInputBox({
@@ -53,4 +60,4 @@ export function registerAllCommands(context: vscode.ExtensionContext) {
       vscode.commands.registerCommand(command, callback)
     );
   }
-}
\ No newline at end of file
+}
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 5800a00e..1cfef5d5 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -60,12 +60,12 @@ class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
       }
       codeLenses.push(
         new vscode.CodeLens(range, {
-          title: "Accept ✅ (⌘⇧↩)",
+          title: "Accept All ✅ (⌘⇧↩)",
           command: "continue.acceptDiff",
           arguments: [document.uri.fsPath],
         }),
         new vscode.CodeLens(range, {
-          title: "Reject ❌ (⌘⇧⌫)",
+          title: "Reject All ❌ (⌘⇧⌫)",
           command: "continue.rejectDiff",
           arguments: [document.uri.fsPath],
         })
-- 
cgit v1.2.3-70-g09d2


From b19076ddb6d11acb5ffd54046d9e5cad549c00c1 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 14 Jul 2023 11:01:06 -0700
Subject: command m reliable toggle

---
 extension/package-lock.json                     |  4 ++--
 extension/package.json                          |  2 +-
 extension/react-app/src/components/ComboBox.tsx |  4 ++++
 extension/src/commands.ts                       |  5 ++++-
 extension/src/debugPanel.ts                     |  5 +++++
 extension/src/diffs.ts                          | 21 ++++++++++++---------
 6 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index a79dd6b4..12aa27c9 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.164",
+  "version": "0.0.165",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.164",
+      "version": "0.0.165",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index de1f395d..05bd4d84 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.164",
+  "version": "0.0.165",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx
index bd0d59b5..5d9b5109 100644
--- a/extension/react-app/src/components/ComboBox.tsx
+++ b/extension/react-app/src/components/ComboBox.tsx
@@ -12,6 +12,7 @@ import PillButton from "./PillButton";
 import HeaderButtonWithText from "./HeaderButtonWithText";
 import { DocumentPlus } from "@styled-icons/heroicons-outline";
 import { HighlightedRangeContext } from "../../../schema/FullState";
+import { postVscMessage } from "../vscode";
 
 // #region styled components
 const mainInputFontSize = 13;
@@ -297,6 +298,9 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => {
 
               // setShowContextDropdown(target.value.endsWith("@"));
             },
+            onBlur: (e) => {
+              postVscMessage("blurContinueInput", {});
+            },
             onKeyDown: (event) => {
               if (event.key === "Enter" && event.shiftKey) {
                 // Prevent Downshift's default 'Enter' behavior.
diff --git a/extension/src/commands.ts b/extension/src/commands.ts
index 0025340a..888f01ed 100644
--- a/extension/src/commands.ts
+++ b/extension/src/commands.ts
@@ -16,11 +16,14 @@ import {
 import { acceptDiffCommand, rejectDiffCommand } from "./diffs";
 import * as bridge from "./bridge";
 import { debugPanelWebview } from "./debugPanel";
-import { sendTelemetryEvent, TelemetryEvent } from "./telemetry";
 import { ideProtocolClient } from "./activation/activate";
 
 let focusedOnContinueInput = false;
 
+export const setFocusedOnContinueInput = (value: boolean) => {
+  focusedOnContinueInput = value;
+};
+
 // Copy everything over from extension.ts
 const commandsMap: { [command: string]: (...args: any) => any } = {
   "continue.suggestionDown": suggestionDownCommand,
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index 5e1689d1..dd24a8d8 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -6,6 +6,7 @@ import {
   openEditorAndRevealRange,
 } from "./util/vscode";
 import { RangeInFile } from "./client";
+import { setFocusedOnContinueInput } from "./commands";
 const WebSocket = require("ws");
 
 let websocketConnections: { [url: string]: WebsocketConnection | undefined } =
@@ -226,6 +227,10 @@ export function setupDebugPanel(
         openEditorAndRevealRange(data.path, undefined, vscode.ViewColumn.One);
         break;
       }
+      case "blurContinueInput": {
+        setFocusedOnContinueInput(false);
+        break;
+      }
       case "withProgress": {
         // This message allows withProgress to be used in the webview
         if (data.done) {
diff --git a/extension/src/diffs.ts b/extension/src/diffs.ts
index 910c30f2..37943de4 100644
--- a/extension/src/diffs.ts
+++ b/extension/src/diffs.ts
@@ -104,6 +104,17 @@ class DiffManager {
     return editor;
   }
 
+  private _findFirstDifferentLine(contentA: string, contentB: string): number {
+    const linesA = contentA.split("\n");
+    const linesB = contentB.split("\n");
+    for (let i = 0; i < linesA.length && i < linesB.length; i++) {
+      if (linesA[i] !== linesB[i]) {
+        return i;
+      }
+    }
+    return 0;
+  }
+
   writeDiff(
     originalFilepath: string,
     newContent: string,
@@ -119,15 +130,7 @@ class DiffManager {
     if (!this.diffs.has(newFilepath)) {
       // Figure out the first line that is different
       const oldContent = fs.readFileSync(originalFilepath).toString("utf-8");
-      let line = 0;
-      const newLines = newContent.split("\n");
-      const oldLines = oldContent.split("\n");
-      for (let i = 0; i < newLines.length && i < oldLines.length; i++) {
-        if (newLines[i] !== oldLines[i]) {
-          line = i;
-          break;
-        }
-      }
+      const line = this._findFirstDifferentLine(oldContent, newContent);
 
       const diffInfo: DiffInfo = {
         originalFilepath,
-- 
cgit v1.2.3-70-g09d2


From 6baa3fe2f83971b92f6617c3caa2c6c0351a8e8c Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Fri, 14 Jul 2023 13:47:38 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 12aa27c9..0edd4885 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.165",
+  "version": "0.0.166",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.165",
+      "version": "0.0.166",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 05bd4d84..7cd7b793 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.165",
+  "version": "0.0.166",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 3a39b979c55b005d9bb18b88b43ca7293ee5410d Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 16:32:56 -0700
Subject: patch

---
 extension/package-lock.json                       |  4 ++--
 extension/package.json                            |  2 +-
 extension/react-app/src/components/TextDialog.tsx |  1 +
 extension/react-app/src/pages/gui.tsx             |  1 +
 extension/src/activation/environmentSetup.ts      | 19 ++++++++-----------
 5 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 0edd4885..e77bfac2 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.166",
+  "version": "0.0.167",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.166",
+      "version": "0.0.167",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 7cd7b793..bbd18b12 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.166",
+  "version": "0.0.167",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/react-app/src/components/TextDialog.tsx b/extension/react-app/src/components/TextDialog.tsx
index c724697d..646d6846 100644
--- a/extension/react-app/src/components/TextDialog.tsx
+++ b/extension/react-app/src/components/TextDialog.tsx
@@ -2,6 +2,7 @@
 import React, { useEffect, useState } from "react";
 import styled from "styled-components";
 import { Button, buttonColor, secondaryDark, vscBackground } from ".";
+import { isMetaEquivalentKeyPressed } from "../util";
 
 const ScreenCover = styled.div`
   position: absolute;
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index cb0404ab..64207487 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -23,6 +23,7 @@ import { RootStore } from "../redux/store";
 import { postVscMessage } from "../vscode";
 import UserInputContainer from "../components/UserInputContainer";
 import Onboarding from "../components/Onboarding";
+import { isMetaEquivalentKeyPressed } from "../util";
 
 const TopGUIDiv = styled.div`
   overflow: hidden;
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 374c38c0..6a66532e 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -11,7 +11,8 @@ import * as os from "os";
 import fkill from "fkill";
 import { sendTelemetryEvent, TelemetryEvent } from "../telemetry";
 
-const WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR = "A Python virtual enviroment cannot be activated because running scripts is disabled for this user. Please enable signed scripts to run with this command in PowerShell: `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`, reload VS Code, and then try again.";
+const WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR =
+  "A Python virtual enviroment cannot be activated because running scripts is disabled for this user. In order to use Continue, please enable signed scripts to run with this command in PowerShell: `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser`, reload VS Code, and then try again.";
 
 const MAX_RETRIES = 3;
 async function retryThenFail(
@@ -26,7 +27,8 @@ 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!";
+    let msg =
+      "Failed to set up Continue extension. Please email nate@continue.dev and we'll get this fixed ASAP!";
     try {
       switch (process.platform) {
         case "win32":
@@ -35,14 +37,14 @@ async function retryThenFail(
         case "darwin":
           break;
         case "linux":
-          const [pythonCmd,] = await getPythonPipCommands();
+          const [pythonCmd] = await getPythonPipCommands();
           msg = await getLinuxAptInstallError(pythonCmd);
           break;
       }
     } finally {
       vscode.window.showErrorMessage(msg);
     }
-    
+
     sendTelemetryEvent(TelemetryEvent.ExtensionSetupError, {
       error: e.message,
     });
@@ -216,10 +218,7 @@ async function getLinuxAptInstallError(pythonCmd: string) {
   const version = stdout.split(" ")[1].split(".")[1];
   const installVenvCommand = `apt-get install python3.${version}-venv`;
   await runCommand("apt-get update");
-  // Ask the user to run the command to install python3-venv (requires sudo, so we can't)
-  // First, get the python version
-  const msg = `[Important] Continue needs to create a Python virtual environment, but python3.${version}-venv is not installed. Please run this command in your terminal: \`${installVenvCommand}\`, reload VS Code, and then try again.`;
-  return msg;
+  return `[Important] Continue needs to create a Python virtual environment, but python3.${version}-venv is not installed. Please run this command in your terminal: \`${installVenvCommand}\`, reload VS Code, and then try again.`;
 }
 
 async function setupPythonEnv() {
@@ -246,9 +245,7 @@ async function setupPythonEnv() {
       stderr &&
       stderr.includes("running scripts is disabled on this system")
     ) {
-      await vscode.window.showErrorMessage(
-        WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR
-      );
+      await vscode.window.showErrorMessage(WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR);
       throw new Error(stderr);
     } else if (
       stderr?.includes("On Debian/Ubuntu systems") ||
-- 
cgit v1.2.3-70-g09d2


From 26e8d5df03d516cb2a6d6ee53144def595c47ff5 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 16:49:59 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index e77bfac2..ba455540 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.167",
+  "version": "0.0.168",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.167",
+      "version": "0.0.168",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index bbd18b12..0c8e2037 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.167",
+  "version": "0.0.168",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2


From 21dc20871347165a8526bbbea1d351e2f10f4d93 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 17:46:03 -0700
Subject: patch

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index ba455540..edd0f0d0 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.168",
+  "version": "0.0.169",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.168",
+      "version": "0.0.169",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 0c8e2037..91a863ff 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.168",
+  "version": "0.0.169",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 43e7832c..b4ada632 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -21,7 +21,11 @@ async function retryThenFail(
 ): Promise<any> {
   try {
     if (retries < MAX_RETRIES && process.platform === "win32") {
-      const [stdout, stderr] = await runCommand("Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser");
+      const [stdout, stderr] = await runCommand(
+        "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
+      );
+      console.log("Execution policy stdout: ", stdout);
+      console.log("Execution policy stderr: ", stderr);
     }
 
     return await fn();
-- 
cgit v1.2.3-70-g09d2


From 1c41fb0a803c886841dbea9fa5e4129059a32e5d Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 17:57:51 -0700
Subject: patch

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index edd0f0d0..f793abae 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.169",
+  "version": "0.0.171",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.169",
+      "version": "0.0.171",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 91a863ff..38dc4542 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.169",
+  "version": "0.0.171",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index b4ada632..be1c220c 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -21,11 +21,16 @@ async function retryThenFail(
 ): Promise<any> {
   try {
     if (retries < MAX_RETRIES && process.platform === "win32") {
-      const [stdout, stderr] = await runCommand(
-        "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
-      );
-      console.log("Execution policy stdout: ", stdout);
-      console.log("Execution policy stderr: ", stderr);
+      let [stdout, stderr] = await runCommand("Get-ExecutionPolicy");
+      if (!stdout.includes("RemoteSigned")) {
+        [stdout, stderr] = await runCommand(
+          "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
+        );
+        console.log("Execution policy stdout: ", stdout);
+        console.log("Execution policy stderr: ", stderr);
+        // Then reload the window for this to take effect
+        await vscode.commands.executeCommand("workbench.action.reloadWindow");
+      }
     }
 
     return await fn();
@@ -238,45 +243,50 @@ async function setupPythonEnv() {
     pipCmd
   );
 
-  // First, create the virtual environment
-  if (checkEnvExists()) {
-    console.log("Python env already exists, skipping...");
-  } else {
-    // Assemble the command to create the env
-    const createEnvCommand = [
-      `cd "${serverPath()}"`,
-      `${pythonCmd} -m venv env`,
-    ].join(" ; ");
-
-    const [stdout, stderr] = await runCommand(createEnvCommand);
-    if (
-      stderr &&
-      stderr.includes("running scripts is disabled on this system")
-    ) {
-      await vscode.window.showErrorMessage(WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR);
-      throw new Error(stderr);
-    } else if (
-      stderr?.includes("On Debian/Ubuntu systems") ||
-      stdout?.includes("On Debian/Ubuntu systems")
-    ) {
-      const msg = await getLinuxAptInstallError(pythonCmd);
-      console.log(msg);
-      await vscode.window.showErrorMessage(msg);
-    } else if (checkEnvExists()) {
-      console.log("Successfully set up python env at ", `${serverPath()}/env`);
+  await retryThenFail(async () => {
+    // First, create the virtual environment
+    if (checkEnvExists()) {
+      console.log("Python env already exists, skipping...");
     } else {
-      const msg = [
-        "Python environment not successfully created. Trying again. Here was the stdout + stderr: ",
-        `stdout: ${stdout}`,
-        `stderr: ${stderr}`,
-      ].join("\n\n");
-      console.log(msg);
-      throw new Error(msg);
+      // Assemble the command to create the env
+      const createEnvCommand = [
+        `cd "${serverPath()}"`,
+        `${pythonCmd} -m venv env`,
+      ].join(" ; ");
+
+      const [stdout, stderr] = await runCommand(createEnvCommand);
+      if (
+        stderr &&
+        stderr.includes("running scripts is disabled on this system")
+      ) {
+        await vscode.window.showErrorMessage(
+          WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR
+        );
+        throw new Error(stderr);
+      } else if (
+        stderr?.includes("On Debian/Ubuntu systems") ||
+        stdout?.includes("On Debian/Ubuntu systems")
+      ) {
+        const msg = await getLinuxAptInstallError(pythonCmd);
+        console.log(msg);
+        await vscode.window.showErrorMessage(msg);
+      } else if (checkEnvExists()) {
+        console.log(
+          "Successfully set up python env at ",
+          `${serverPath()}/env`
+        );
+      } else {
+        const msg = [
+          "Python environment not successfully created. Trying again. Here was the stdout + stderr: ",
+          `stdout: ${stdout}`,
+          `stderr: ${stderr}`,
+        ].join("\n\n");
+        console.log(msg);
+        throw new Error(msg);
+      }
     }
-  }
 
-  // Install the requirements
-  await retryThenFail(async () => {
+    // Install the requirements
     if (await checkRequirementsInstalled()) {
       console.log("Python requirements already installed, skipping...");
     } else {
-- 
cgit v1.2.3-70-g09d2


From 07809c6717856e854d9005f77d51d274dec0fcc4 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 18:47:28 -0700
Subject: 5s timeout on websocket connections

---
 continuedev/src/continuedev/server/gui.py    | 9 +++++++--
 continuedev/src/continuedev/server/ide.py    | 8 ++++++--
 extension/package-lock.json                  | 4 ++--
 extension/package.json                       | 2 +-
 extension/src/activation/environmentSetup.ts | 5 ++---
 5 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py
index 9a411fbe..4201353e 100644
--- a/continuedev/src/continuedev/server/gui.py
+++ b/continuedev/src/continuedev/server/gui.py
@@ -1,3 +1,4 @@
+import asyncio
 import json
 from fastapi import Depends, Header, WebSocket, APIRouter
 from starlette.websockets import WebSocketState, WebSocketDisconnect
@@ -60,8 +61,12 @@ class GUIProtocolServer(AbstractGUIProtocolServer):
             "data": data
         })
 
-    async def _receive_json(self, message_type: str) -> Any:
-        return await self.sub_queue.get(message_type)
+    async def _receive_json(self, message_type: str, timeout: int = 5) -> Any:
+        try:
+            return await asyncio.wait_for(self.sub_queue.get(message_type), timeout=timeout)
+        except asyncio.TimeoutError:
+            raise Exception(
+                "GUI Protocol _receive_json timed out after 5 seconds")
 
     async def _send_and_receive_json(self, data: Any, resp_model: Type[T], message_type: str) -> T:
         await self._send_json(message_type, data)
diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index 77b13483..e5e8de02 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -156,8 +156,12 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
             "data": data
         })
 
-    async def _receive_json(self, message_type: str) -> Any:
-        return await self.sub_queue.get(message_type)
+    async def _receive_json(self, message_type: str, timeout: int = 5) -> Any:
+        try:
+            return await asyncio.wait_for(self.sub_queue.get(message_type), timeout=timeout)
+        except asyncio.TimeoutError:
+            raise Exception(
+                "IDE Protocol _receive_json timed out after 5 seconds")
 
     async def _send_and_receive_json(self, data: Any, resp_model: Type[T], message_type: str) -> T:
         await self._send_json(message_type, data)
diff --git a/extension/package-lock.json b/extension/package-lock.json
index f793abae..b86cb10e 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.171",
+  "version": "0.0.172",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.171",
+      "version": "0.0.172",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 38dc4542..6b719723 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.171",
+  "version": "0.0.172",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index be1c220c..7a0d24d4 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -28,8 +28,6 @@ async function retryThenFail(
         );
         console.log("Execution policy stdout: ", stdout);
         console.log("Execution policy stderr: ", stderr);
-        // Then reload the window for this to take effect
-        await vscode.commands.executeCommand("workbench.action.reloadWindow");
       }
     }
 
@@ -447,7 +445,8 @@ export async function startContinuePythonServer() {
           console.log(`stdout: ${data}`);
           if (
             data.includes("Uvicorn running on") || // Successfully started the server
-            data.includes("address already in use") // The server is already running (probably a simultaneously opened VS Code window)
+            data.includes("only one usage of each socket address") || // [windows] The server is already running (probably a simultaneously opened VS Code window)
+            data.includes("address already in use") // [mac/linux] The server is already running (probably a simultaneously opened VS Code window)
           ) {
             console.log("Successfully started Continue python server");
             resolve(null);
-- 
cgit v1.2.3-70-g09d2


From 1cc788de843169400d70f26e533417f3a0a95b29 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 19:14:01 -0700
Subject: one window wait for other to create venv

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

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index b86cb10e..f1423041 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.172",
+  "version": "0.0.173",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.172",
+      "version": "0.0.173",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 6b719723..0638e768 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.172",
+  "version": "0.0.173",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 7a0d24d4..928fe04b 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -53,6 +53,7 @@ async function retryThenFail(
           break;
       }
     } finally {
+      console.log("After retries, failed to set up Continue extension", msg);
       vscode.window.showErrorMessage(msg);
     }
 
@@ -232,57 +233,77 @@ async function getLinuxAptInstallError(pythonCmd: string) {
   return `[Important] Continue needs to create a Python virtual environment, but python3.${version}-venv is not installed. Please run this command in your terminal: \`${installVenvCommand}\`, reload VS Code, and then try again.`;
 }
 
-async function setupPythonEnv() {
-  console.log("Setting up python env for Continue extension...");
-
-  const [pythonCmd, pipCmd] = await getPythonPipCommands();
-  const [activateCmd, pipUpgradeCmd] = getActivateUpgradeCommands(
-    pythonCmd,
-    pipCmd
-  );
+async function createPythonVenv(pythonCmd: string) {
+  if (checkEnvExists()) {
+    console.log("Python env already exists, skipping...");
+  } else {
+    // Assemble the command to create the env
+    const createEnvCommand = [
+      `cd "${serverPath()}"`,
+      `${pythonCmd} -m venv env`,
+    ].join(" ; ");
 
-  await retryThenFail(async () => {
-    // First, create the virtual environment
-    if (checkEnvExists()) {
-      console.log("Python env already exists, skipping...");
+    const [stdout, stderr] = await runCommand(createEnvCommand);
+    if (
+      stderr &&
+      stderr.includes("running scripts is disabled on this system")
+    ) {
+      console.log("Scripts disabled error when trying to create env");
+      await vscode.window.showErrorMessage(WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR);
+      throw new Error(stderr);
+    } else if (
+      stderr?.includes("On Debian/Ubuntu systems") ||
+      stdout?.includes("On Debian/Ubuntu systems")
+    ) {
+      const msg = await getLinuxAptInstallError(pythonCmd);
+      console.log(msg);
+      await vscode.window.showErrorMessage(msg);
+    } else if (checkEnvExists()) {
+      console.log("Successfully set up python env at ", `${serverPath()}/env`);
     } else {
-      // Assemble the command to create the env
-      const createEnvCommand = [
-        `cd "${serverPath()}"`,
-        `${pythonCmd} -m venv env`,
-      ].join(" ; ");
-
-      const [stdout, stderr] = await runCommand(createEnvCommand);
-      if (
-        stderr &&
-        stderr.includes("running scripts is disabled on this system")
-      ) {
-        await vscode.window.showErrorMessage(
-          WINDOWS_REMOTE_SIGNED_SCRIPTS_ERROR
-        );
-        throw new Error(stderr);
-      } else if (
-        stderr?.includes("On Debian/Ubuntu systems") ||
-        stdout?.includes("On Debian/Ubuntu systems")
-      ) {
-        const msg = await getLinuxAptInstallError(pythonCmd);
-        console.log(msg);
-        await vscode.window.showErrorMessage(msg);
-      } else if (checkEnvExists()) {
-        console.log(
-          "Successfully set up python env at ",
-          `${serverPath()}/env`
+      try {
+        // This might mean that another window is currently using the python.exe file to install requirements
+        // So we want to wait and try again
+        let i = 0;
+        await new Promise((resolve, reject) =>
+          setInterval(() => {
+            if (i > 5) {
+              reject();
+            }
+            if (checkEnvExists()) {
+              resolve(null);
+            } else {
+              console.log("Waiting for other window to create env...");
+            }
+            i++;
+          }, 5000)
         );
-      } else {
+      } catch (e) {
         const msg = [
           "Python environment not successfully created. Trying again. Here was the stdout + stderr: ",
           `stdout: ${stdout}`,
           `stderr: ${stderr}`,
+          `e: ${e}`,
         ].join("\n\n");
         console.log(msg);
         throw new Error(msg);
       }
     }
+  }
+}
+
+async function setupPythonEnv() {
+  console.log("Setting up python env for Continue extension...");
+
+  const [pythonCmd, pipCmd] = await getPythonPipCommands();
+  const [activateCmd, pipUpgradeCmd] = getActivateUpgradeCommands(
+    pythonCmd,
+    pipCmd
+  );
+
+  await retryThenFail(async () => {
+    // First, create the virtual environment
+    await createPythonVenv(pythonCmd);
 
     // Install the requirements
     if (await checkRequirementsInstalled()) {
-- 
cgit v1.2.3-70-g09d2


From 53536dce999f2858102b7bf969824141140c5fc7 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sat, 15 Jul 2023 21:55:47 -0700
Subject: fixed reading of terminal and other vscode windows

---
 continuedev/src/continuedev/server/ide.py    | 34 ++++++---------
 extension/package-lock.json                  |  4 +-
 extension/package.json                       |  2 +-
 extension/src/activation/environmentSetup.ts | 54 ++++++++++++------------
 extension/src/continueIdeClient.ts           | 63 ++++++++++++++++------------
 5 files changed, 79 insertions(+), 78 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index e5e8de02..a8868a9a 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -126,7 +126,8 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
     workspace_directory: str = None
     unique_id: str = None
 
-    async def initialize(self) -> List[str]:
+    async def initialize(self, session_id: str) -> List[str]:
+        self.session_id = session_id
         await self._send_json("workspaceDirectory", {})
         await self._send_json("uniqueId", {})
         other_msgs = []
@@ -287,32 +288,24 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
         pass
 
     def onFileEdits(self, edits: List[FileEditWithFullContents]):
-        # Send the file edits to ALL autopilots.
-        # Maybe not ideal behavior
-        for _, session in self.session_manager.sessions.items():
-            session.autopilot.handle_manual_edits(edits)
+        session_manager.sessions[self.session_id].autopilot.handle_manual_edits(
+            edits)
 
     def onDeleteAtIndex(self, index: int):
-        for _, session in self.session_manager.sessions.items():
-            create_async_task(
-                session.autopilot.delete_at_index(index), self.unique_id)
+        create_async_task(
+            session_manager.sessions[self.session_id].autopilot.delete_at_index(index), self.unique_id)
 
     def onCommandOutput(self, output: str):
-        # Send the output to ALL autopilots.
-        # Maybe not ideal behavior
-        for _, session in self.session_manager.sessions.items():
-            create_async_task(
-                session.autopilot.handle_command_output(output), self.unique_id)
+        create_async_task(
+            self.session_manager.sessions[self.session_id].autopilot.handle_command_output(output), self.unique_id)
 
     def onHighlightedCodeUpdate(self, range_in_files: List[RangeInFileWithContents]):
-        for _, session in self.session_manager.sessions.items():
-            create_async_task(
-                session.autopilot.handle_highlighted_code(range_in_files), self.unique_id)
+        create_async_task(
+            self.session_manager.sessions[self.session_id].autopilot.handle_highlighted_code(range_in_files), self.unique_id)
 
     def onMainUserInput(self, input: str):
-        for _, session in self.session_manager.sessions.items():
-            create_async_task(
-                session.autopilot.accept_user_input(input), self.unique_id)
+        create_async_task(
+            self.session_manager.sessions[self.session_id].autopilot.accept_user_input(input), self.unique_id)
 
     # Request information. Session doesn't matter.
     async def getOpenFiles(self) -> List[str]:
@@ -440,10 +433,9 @@ async def websocket_endpoint(websocket: WebSocket, session_id: str = None):
                 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()
+        other_msgs = await ideProtocolServer.initialize(session_id)
 
         for other_msg in other_msgs:
             handle_msg(other_msg)
diff --git a/extension/package-lock.json b/extension/package-lock.json
index f1423041..6f777c72 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.173",
+  "version": "0.0.174",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.173",
+      "version": "0.0.174",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 0638e768..9fe38f7f 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.173",
+  "version": "0.0.174",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 928fe04b..df609a34 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -260,34 +260,34 @@ async function createPythonVenv(pythonCmd: string) {
       await vscode.window.showErrorMessage(msg);
     } else if (checkEnvExists()) {
       console.log("Successfully set up python env at ", `${serverPath()}/env`);
+    } else if (
+      stderr?.includes("Permission denied") &&
+      stderr?.includes("python.exe")
+    ) {
+      // This might mean that another window is currently using the python.exe file to install requirements
+      // So we want to wait and try again
+      let i = 0;
+      await new Promise((resolve, reject) =>
+        setInterval(() => {
+          if (i > 5) {
+            reject("Timed out waiting for other window to create env...");
+          }
+          if (checkEnvExists()) {
+            resolve(null);
+          } else {
+            console.log("Waiting for other window to create env...");
+          }
+          i++;
+        }, 5000)
+      );
     } else {
-      try {
-        // This might mean that another window is currently using the python.exe file to install requirements
-        // So we want to wait and try again
-        let i = 0;
-        await new Promise((resolve, reject) =>
-          setInterval(() => {
-            if (i > 5) {
-              reject();
-            }
-            if (checkEnvExists()) {
-              resolve(null);
-            } else {
-              console.log("Waiting for other window to create env...");
-            }
-            i++;
-          }, 5000)
-        );
-      } catch (e) {
-        const msg = [
-          "Python environment not successfully created. Trying again. Here was the stdout + stderr: ",
-          `stdout: ${stdout}`,
-          `stderr: ${stderr}`,
-          `e: ${e}`,
-        ].join("\n\n");
-        console.log(msg);
-        throw new Error(msg);
-      }
+      const msg = [
+        "Python environment not successfully created. Trying again. Here was the stdout + stderr: ",
+        `stdout: ${stdout}`,
+        `stderr: ${stderr}`,
+      ].join("\n\n");
+      console.log(msg);
+      throw new Error(msg);
     }
   }
 }
diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts
index 2c96763d..fac0a227 100644
--- a/extension/src/continueIdeClient.ts
+++ b/extension/src/continueIdeClient.ts
@@ -104,8 +104,11 @@ class IdeProtocolClient {
     //   }
     // });
 
-    // Setup listeners for any file changes in open editors
+    // Setup listeners for any selection changes in open editors
     vscode.window.onDidChangeTextEditorSelection((event) => {
+      if (this.editorIsTerminal(event.textEditor)) {
+        return;
+      }
       if (this._highlightDebounce) {
         clearTimeout(this._highlightDebounce);
       }
@@ -376,20 +379,24 @@ class IdeProtocolClient {
   }
 
   saveFile(filepath: string) {
-    vscode.window.visibleTextEditors.forEach((editor) => {
-      if (editor.document.uri.fsPath === filepath) {
-        editor.document.save();
-      }
-    });
+    vscode.window.visibleTextEditors
+      .filter((editor) => !this.editorIsTerminal(editor))
+      .forEach((editor) => {
+        if (editor.document.uri.fsPath === filepath) {
+          editor.document.save();
+        }
+      });
   }
 
   readFile(filepath: string): string {
     let contents: string | undefined;
-    vscode.window.visibleTextEditors.forEach((editor) => {
-      if (editor.document.uri.fsPath === filepath) {
-        contents = editor.document.getText();
-      }
-    });
+    vscode.window.visibleTextEditors
+      .filter((editor) => !this.editorIsTerminal(editor))
+      .forEach((editor) => {
+        if (editor.document.uri.fsPath === filepath) {
+          contents = editor.document.getText();
+        }
+      });
     if (typeof contents === "undefined") {
       if (fs.existsSync(filepath)) {
         contents = fs.readFileSync(filepath, "utf-8");
@@ -429,25 +436,27 @@ class IdeProtocolClient {
   getHighlightedCode(): RangeInFile[] {
     // TODO
     let rangeInFiles: RangeInFile[] = [];
-    vscode.window.visibleTextEditors.forEach((editor) => {
-      editor.selections.forEach((selection) => {
-        // if (!selection.isEmpty) {
-        rangeInFiles.push({
-          filepath: editor.document.uri.fsPath,
-          range: {
-            start: {
-              line: selection.start.line,
-              character: selection.start.character,
-            },
-            end: {
-              line: selection.end.line,
-              character: selection.end.character,
+    vscode.window.visibleTextEditors
+      .filter((editor) => !this.editorIsTerminal(editor))
+      .forEach((editor) => {
+        editor.selections.forEach((selection) => {
+          // if (!selection.isEmpty) {
+          rangeInFiles.push({
+            filepath: editor.document.uri.fsPath,
+            range: {
+              start: {
+                line: selection.start.line,
+                character: selection.start.character,
+              },
+              end: {
+                line: selection.end.line,
+                character: selection.end.character,
+              },
             },
-          },
+          });
+          // }
         });
-        // }
       });
-    });
     return rangeInFiles;
   }
 
-- 
cgit v1.2.3-70-g09d2


From fcfbbf562ac4b576bc80259fa9665b6067ccdcaa Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Sun, 16 Jul 2023 12:51:38 -0700
Subject: patch

---
 extension/package-lock.json | 4 ++--
 extension/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extension/package-lock.json')

diff --git a/extension/package-lock.json b/extension/package-lock.json
index 6f777c72..fbd3d92d 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "continue",
-  "version": "0.0.174",
+  "version": "0.0.175",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "continue",
-      "version": "0.0.174",
+      "version": "0.0.175",
       "license": "Apache-2.0",
       "dependencies": {
         "@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index ccc3a679..02a2ec1a 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.174",
+  "version": "0.0.175",
   "publisher": "Continue",
   "engines": {
     "vscode": "^1.67.0"
-- 
cgit v1.2.3-70-g09d2