Merge pull request #4743 from continuedev/nate/blocks-front-and-center

organize the input box folder

Author: sestinj

core/index.d.ts

@@ -439,7 +439,7 @@ export interface PromptLog {
   completion: string;
 }
 
-export type MessageModes = "chat" | "edit";
+export type MessageModes = "chat" | "edit" | "agent";
 
 export type ToolStatus =
   | "generating"

extensions/intellij/src/main/kotlin/com/github/continuedev/continueintellijextension/actions/ContinuePluginActions.kt

@@ -126,12 +126,3 @@ class OpenConfigAction : AnAction() {
         continuePluginService.sendToWebview("navigateTo", params)
     }
 }
-
-class OpenMorePageAction : AnAction() {
-    override fun actionPerformed(e: AnActionEvent) {
-        val continuePluginService = getContinuePluginService(e.project) ?: return
-        continuePluginService.continuePluginWindow?.content?.components?.get(0)?.requestFocus()
-        val params = mapOf("path" to "/more", "toggle" to true)
-        continuePluginService.sendToWebview("navigateTo", params)
-    }
-}

extensions/intellij/src/main/resources/META-INF/plugin.xml

@@ -140,19 +140,10 @@
             <override-text place="GoToAction" text="Continue Config"/>
         </action>
 
-        <action id="continue.openMorePage"
-                class="com.github.continuedev.continueintellijextension.actions.OpenMorePageAction"
-                icon="AllIcons.Actions.MoreHorizontal"
-                text="More"
-                description="More">
-            <override-text place="GoToAction" text="More"/>
-        </action>
-
         <group id="ContinueSidebarActionsGroup">
             <reference ref="continue.newContinueSession"/>
             <reference ref="continue.viewHistory"/>
             <reference ref="continue.openConfigPage"/>
-            <reference ref="continue.openMorePage"/>
         </group>
 
         <action id="continue.focusContinueInput"

extensions/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "continue",
   "icon": "media/icon.png",
   "author": "Continue Dev, Inc",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "repository": {
     "type": "git",
     "url": "https://github.com/continuedev/continue"
@@ -258,13 +258,6 @@
         "title": "Navigate to a path",
         "group": "Continue"
       },
-      {
-        "command": "continue.openMorePage",
-        "category": "Continue",
-        "title": "More",
-        "icon": "$(ellipsis)",
-        "group": "Continue"
-      },
       {
         "command": "continue.writeCommentsForCode",
         "category": "Continue",
@@ -512,11 +505,6 @@
           "command": "continue.openConfigPage",
           "group": "navigation@4",
           "when": "view == continue.continueGUIView"
-        },
-        {
-          "command": "continue.openMorePage",
-          "group": "navigation@6",
-          "when": "view == continue.continueGUIView"
         }
       ],
       "editor/title": [

extensions/vscode/src/commands.ts

@@ -284,6 +284,9 @@ async function processDiff(
   }
 
   await sidebar.webviewProtocol.request("exitEditMode", undefined);
+
+  // Save the file
+  await ide.saveFile(newOrCurrentUri);
 }
 
 function waitForSidebarReady(
@@ -991,9 +994,6 @@ const getCommandsMap: (
           vscode.commands.executeCommand("continue.focusContinueInput");
         } else if (selectedOption === "$(screen-full) Open full screen chat") {
           vscode.commands.executeCommand("continue.toggleFullScreen");
-        } else if (selectedOption === "$(question) Open help center") {
-          focusGUI();
-          vscode.commands.executeCommand("continue.navigateTo", "/more", true);
         }
         quickPick.dispose();
       });
@@ -1016,9 +1016,6 @@ const getCommandsMap: (
         client.sendFeedback(feedback, lastLines);
       }
     },
-    "continue.openMorePage": () => {
-      vscode.commands.executeCommand("continue.navigateTo", "/more", true);
-    },
     "continue.navigateTo": (path: string, toggle: boolean) => {
       sidebar.webviewProtocol?.request("navigateTo", { path, toggle });
       focusGUI();

gui/editorInset/index.html

@@ -1,19 +1,16 @@
-import { useDispatch } from "react-redux";
 import { RouterProvider, createMemoryRouter } from "react-router-dom";
 import Layout from "./components/Layout";
+import { SubmenuContextProvidersProvider } from "./context/SubmenuContextProviders";
 import { VscThemeProvider } from "./context/VscTheme";
 import useSetup from "./hooks/useSetup";
 import { AddNewModel, ConfigureProvider } from "./pages/AddNewModel";
+import ConfigPage from "./pages/config";
 import ConfigErrorPage from "./pages/config-error";
 import ErrorPage from "./pages/error";
 import Chat from "./pages/gui";
 import History from "./pages/history";
-import MigrationPage from "./pages/migration";
-import MorePage from "./pages/More";
 import Stats from "./pages/stats";
 import { ROUTES } from "./util/navigation";
-import { SubmenuContextProvidersProvider } from "./context/SubmenuContextProviders";
-import ConfigPage from "./pages/config";
 
 const router = createMemoryRouter([
   {
@@ -45,10 +42,6 @@ const router = createMemoryRouter([
         path: "/addModel/provider/:providerName",
         element: <ConfigureProvider />,
       },
-      {
-        path: "/more",
-        element: <MorePage />,
-      },
       {
         path: ROUTES.CONFIG_ERROR,
         element: <ConfigErrorPage />,
@@ -57,10 +50,6 @@ const router = createMemoryRouter([
         path: ROUTES.CONFIG,
         element: <ConfigPage />,
       },
-      {
-        path: "/migration",
-        element: <MigrationPage />,
-      },
     ],
   },
 ]);

gui/editorInset/vite.config.ts

@@ -1,62 +1,37 @@
-import { BookmarkIcon, ChatBubbleLeftIcon } from "@heroicons/react/24/outline";
-import { BookmarkIcon as BookmarkIconSolid } from "@heroicons/react/24/solid";
+import { ChatBubbleLeftIcon } from "@heroicons/react/24/outline";
 import { SlashCommandDescription } from "core";
 import { useState } from "react";
-import { defaultBorderRadius, GhostButton, vscInputBackground } from "..";
+import { defaultBorderRadius, vscInputBackground } from "..";
 
 interface ConversationStarterCardProps {
   command: SlashCommandDescription;
   onClick: (command: SlashCommandDescription) => void;
-  onBookmark: (command: SlashCommandDescription) => void;
-  isBookmarked: boolean;
 }
 
 export function ConversationStarterCard({
   command,
   onClick,
-  onBookmark,
-  isBookmarked = false,
 }: ConversationStarterCardProps) {
   const [isHovered, setIsHovered] = useState(false);
 
   return (
     <div
-      className="mb-2 w-full shadow-md hover:brightness-110"
+      className="mb-2 w-full shadow-md hover:cursor-pointer hover:brightness-110"
       style={{
         borderRadius: defaultBorderRadius,
         backgroundColor: vscInputBackground,
       }}
       onMouseEnter={() => setIsHovered(true)}
       onMouseLeave={() => setIsHovered(false)}
+      onClick={() => onClick(command)}
     >
-      <div className="flex items-center px-3 py-1.5">
-        <div className="mr-3 flex-shrink-0">
+      <div className="flex px-3 py-1.5">
+        <div className="mr-3 flex-shrink-0 self-start pt-0.5">
           <ChatBubbleLeftIcon className="text-lightgray h-5 w-5" />
         </div>
-        <div
-          onClick={() => onClick(command)}
-          className="flex flex-1 flex-col hover:cursor-pointer"
-        >
-          <div className="font-medium">{command.name}</div>
-          <div className="text-lightgray text-sm">{command.description}</div>
-        </div>
-        <div className="flex items-center">
-          <GhostButton
-            onClick={(e) => {
-              e.stopPropagation();
-              onBookmark(command);
-            }}
-            aria-label={
-              isBookmarked ? "Remove bookmarked prompt" : "Bookmark prompt"
-            }
-            className={isHovered || isBookmarked ? "opacity-100" : "opacity-0"}
-          >
-            {isBookmarked ? (
-              <BookmarkIconSolid className="h-4 w-4" />
-            ) : (
-              <BookmarkIcon className="h-4 w-4" />
-            )}
-          </GhostButton>
+        <div className="flex flex-1 flex-col">
+          <div className="text-xs font-medium">{command.name}</div>
+          <div className="text-lightgray text-xs">{command.description}</div>
         </div>
       </div>
     </div>

gui/src/App.tsx

@@ -9,8 +9,7 @@ const NUM_CARDS_TO_RENDER = 3;
 
 export function ConversationStarterCards() {
   const dispatch = useAppDispatch();
-  const { cmdsSortedByBookmark, bookmarkStatuses, toggleBookmark } =
-    useBookmarkedSlashCommands();
+  const { cmdsSortedByBookmark } = useBookmarkedSlashCommands();
 
   function onClick(command: SlashCommandDescription) {
     if (command.prompt) {
@@ -31,8 +30,6 @@ export function ConversationStarterCards() {
           key={command.name + i}
           command={command}
           onClick={onClick}
-          onBookmark={() => toggleBookmark(command)}
-          isBookmarked={bookmarkStatuses[command.name]}
         />
       ))}
     </div>