summaryrefslogtreecommitdiff
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/react-app/src/components/CheckDiv.tsx46
-rw-r--r--extension/react-app/src/pages/gui.tsx2
-rw-r--r--extension/react-app/src/pages/history.tsx21
-rw-r--r--extension/schema/ContinueConfig.d.ts7
-rw-r--r--extension/schema/FullState.d.ts6
-rw-r--r--extension/schema/SessionInfo.d.ts2
-rw-r--r--extension/src/activation/environmentSetup.ts19
7 files changed, 100 insertions, 3 deletions
diff --git a/extension/react-app/src/components/CheckDiv.tsx b/extension/react-app/src/components/CheckDiv.tsx
new file mode 100644
index 00000000..e595d70b
--- /dev/null
+++ b/extension/react-app/src/components/CheckDiv.tsx
@@ -0,0 +1,46 @@
+import { useState } from "react";
+import styled from "styled-components";
+import { defaultBorderRadius, vscBackground, vscForeground } from ".";
+import { CheckIcon } from "@heroicons/react/24/outline";
+
+interface CheckDivProps {
+ title: string;
+ checked: boolean;
+ onClick: () => void;
+}
+
+const StyledDiv = styled.div<{ checked: boolean }>`
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: center;
+ padding: 0.5rem;
+ border-radius: ${defaultBorderRadius};
+ cursor: pointer;
+ border: 1px solid ${vscForeground};
+
+ color: ${vscForeground};
+ background-color: ${vscBackground};
+
+ &:hover {
+ background-color: ${vscForeground};
+ color: ${vscBackground};
+ }
+ width: fit-content;
+
+ margin: 0.5rem;
+ height: 1.4em;
+`;
+
+function CheckDiv(props: CheckDivProps) {
+ const { title, checked, onClick } = props;
+
+ return (
+ <StyledDiv onClick={onClick} checked={checked}>
+ {checked && <CheckIcon width="1.4em" height="1.4em" />}
+ {title}
+ </StyledDiv>
+ );
+}
+
+export default CheckDiv;
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index 86cb4b9a..848fcddc 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -247,7 +247,7 @@ function GUI(props: GUIProps) {
"mainTextEntryCounter",
(currentCount + 1).toString()
);
- if (currentCount === 25) {
+ if (currentCount === 40) {
dispatch(
setDialogMessage(
<div className="text-center">
diff --git a/extension/react-app/src/pages/history.tsx b/extension/react-app/src/pages/history.tsx
index 2eb895b1..2a3070e6 100644
--- a/extension/react-app/src/pages/history.tsx
+++ b/extension/react-app/src/pages/history.tsx
@@ -7,6 +7,7 @@ import { useNavigate } from "react-router-dom";
import { secondaryDark, vscBackground } from "../components";
import styled from "styled-components";
import { ArrowLeftIcon } from "@heroicons/react/24/outline";
+import CheckDiv from "../components/CheckDiv";
const Tr = styled.tr`
&:hover {
@@ -36,6 +37,11 @@ function History() {
const [sessions, setSessions] = useState<SessionInfo[]>([]);
const client = useContext(GUIClientContext);
const apiUrl = useSelector((state: RootStore) => state.config.apiUrl);
+ const workspacePaths = useSelector(
+ (state: RootStore) => state.config.workspacePaths
+ );
+
+ const [filteringByWorkspace, setFilteringByWorkspace] = useState(false);
useEffect(() => {
const fetchSessions = async () => {
@@ -67,9 +73,24 @@ function History() {
/>
<h1 className="text-2xl font-bold m-4 inline-block">History</h1>
</div>
+ <CheckDiv
+ checked={filteringByWorkspace}
+ onClick={() => setFilteringByWorkspace((prev) => !prev)}
+ title="Filter by workspace"
+ />
<table className="w-full">
<tbody>
{sessions
+ .filter((session) => {
+ if (
+ !filteringByWorkspace ||
+ typeof workspacePaths === "undefined" ||
+ typeof session.workspace_directory === "undefined"
+ ) {
+ return true;
+ }
+ return workspacePaths.includes(session.workspace_directory);
+ })
.sort(
(a, b) =>
parseDate(b.date_created).getTime() -
diff --git a/extension/schema/ContinueConfig.d.ts b/extension/schema/ContinueConfig.d.ts
index f4c62191..5341056f 100644
--- a/extension/schema/ContinueConfig.d.ts
+++ b/extension/schema/ContinueConfig.d.ts
@@ -141,10 +141,17 @@ export interface Policy {
*/
export interface ContextProvider {
title: Title;
+ sdk?: ContinueSDK1;
selected_items?: SelectedItems;
[k: string]: unknown;
}
/**
+ * To avoid circular imports
+ */
+export interface ContinueSDK1 {
+ [k: string]: unknown;
+}
+/**
* A ContextItem is a single item that is stored in the ContextManager.
*/
export interface ContextItem {
diff --git a/extension/schema/FullState.d.ts b/extension/schema/FullState.d.ts
index a999ce95..a847a608 100644
--- a/extension/schema/FullState.d.ts
+++ b/extension/schema/FullState.d.ts
@@ -41,6 +41,7 @@ export type SelectedContextItems = ContextItem[];
export type SessionId = string;
export type Title = string;
export type DateCreated = string;
+export type WorkspaceDirectory = string;
export type SystemMessage1 = string;
export type Temperature = number;
@@ -142,11 +143,12 @@ export interface SessionInfo {
session_id: SessionId;
title: Title;
date_created: DateCreated;
+ workspace_directory?: WorkspaceDirectory;
[k: string]: unknown;
}
export interface ContinueConfig {
- system_message: SystemMessage1;
- temperature: Temperature;
+ system_message?: SystemMessage1;
+ temperature?: Temperature;
[k: string]: unknown;
}
export interface SavedContextGroups {
diff --git a/extension/schema/SessionInfo.d.ts b/extension/schema/SessionInfo.d.ts
index ac94e76d..80e3e527 100644
--- a/extension/schema/SessionInfo.d.ts
+++ b/extension/schema/SessionInfo.d.ts
@@ -9,10 +9,12 @@ export type SessionInfo = SessionInfo1;
export type SessionId = string;
export type Title = string;
export type DateCreated = string;
+export type WorkspaceDirectory = string;
export interface SessionInfo1 {
session_id: SessionId;
title: Title;
date_created: DateCreated;
+ workspace_directory?: WorkspaceDirectory;
[k: string]: unknown;
}
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 23c0d7de..2067f0fb 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -101,6 +101,25 @@ async function checkOrKillRunningServer(serverUrl: string): Promise<boolean> {
} catch (e: any) {
if (!e.message.includes("Process doesn't exist")) {
console.log("Failed to kill old server:", e);
+
+ // Try again, on Windows. This time with taskkill
+ if (os.platform() === "win32") {
+ try {
+ const exePath = path.join(
+ getExtensionUri().fsPath,
+ "server",
+ "exe",
+ "run.exe"
+ );
+
+ await runCommand(`taskkill /F /IM ${exePath}`);
+ } catch (e: any) {
+ console.log(
+ "Failed to kill old server second time on windows with taskkill:",
+ e
+ );
+ }
+ }
}
}
if (fs.existsSync(serverVersionPath())) {
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-07 16:00:05 +0000