Merge pull request #3217 from continuedev/nate/quick-edit-9690

items-center on last session button

Author: sestinj

extensions/vscode/package-lock.json

@@ -7,6 +7,7 @@ import {
 import { Editor, JSONContent } from "@tiptap/react";
 import { InputModifiers, RangeInFileWithContents, ToolCallState } from "core";
 import { streamResponse } from "core/llm/stream";
+import { stripImages } from "core/util/messageContent";
 import { usePostHog } from "posthog-js/react";
 import { useCallback, useContext, useEffect, useRef, useState } from "react";
 import { ErrorBoundary } from "react-error-boundary";
@@ -19,59 +20,57 @@ import {
   vscBackground,
 } from "../../components";
 import { ChatScrollAnchor } from "../../components/ChatScrollAnchor";
+import CodeToEditCard from "../../components/CodeToEditCard";
+import FeedbackDialog from "../../components/dialogs/FeedbackDialog";
 import { useFindWidget } from "../../components/find/FindWidget";
 import TimelineItem from "../../components/gui/TimelineItem";
 import ChatIndexingPeeks from "../../components/indexing/ChatIndexingPeeks";
 import ContinueInputBox from "../../components/mainInput/ContinueInputBox";
 import { NewSessionButton } from "../../components/mainInput/NewSessionButton";
+import resolveEditorContent from "../../components/mainInput/resolveInput";
 import { TutorialCard } from "../../components/mainInput/TutorialCard";
 import {
   OnboardingCard,
   useOnboardingCard,
 } from "../../components/OnboardingCard";
+import PageHeader from "../../components/PageHeader";
 import StepContainer from "../../components/StepContainer";
+import AcceptRejectAllButtons from "../../components/StepContainer/AcceptRejectAllButtons";
 import { IdeMessengerContext } from "../../context/IdeMessenger";
 import useHistory from "../../hooks/useHistory";
 import { useTutorialCard } from "../../hooks/useTutorialCard";
 import { useWebviewListener } from "../../hooks/useWebviewListener";
+import { useAppDispatch, useAppSelector } from "../../redux/hooks";
 import { selectCurrentToolCall } from "../../redux/selectors/selectCurrentToolCall";
+import { selectDefaultModel } from "../../redux/slices/configSlice";
+import { submitEdit } from "../../redux/slices/editModeState";
 import {
   clearLastEmptyResponse,
   newSession,
   selectIsInEditMode,
   selectIsSingleRangeEditOrInsertion,
   setInactive,
 } from "../../redux/slices/sessionSlice";
+import {
+  setDialogEntryOn,
+  setDialogMessage,
+  setShowDialog,
+} from "../../redux/slices/uiSlice";
+import { RootState } from "../../redux/store";
+import { exitEditMode } from "../../redux/thunks/exitEditMode";
 import { streamResponseThunk } from "../../redux/thunks/streamResponse";
 import {
   getFontSize,
   getMetaKeyLabel,
   isMetaEquivalentKeyPressed,
 } from "../../util";
 import { FREE_TRIAL_LIMIT_REQUESTS } from "../../util/freeTrial";
+import getMultifileEditPrompt from "../../util/getMultifileEditPrompt";
 import { getLocalStorage, setLocalStorage } from "../../util/localStorage";
 import ConfigErrorIndicator from "./ConfigError";
 import { ToolCallDiv } from "./ToolCallDiv";
 import { ToolCallButtons } from "./ToolCallDiv/ToolCallButtonsDiv";
 import ToolOutput from "./ToolCallDiv/ToolOutput";
-import { useAppDispatch, useAppSelector } from "../../redux/hooks";
-import { selectDefaultModel } from "../../redux/slices/configSlice";
-import {
-  setDialogMessage,
-  setDialogEntryOn,
-  setShowDialog,
-} from "../../redux/slices/uiSlice";
-import { RootState } from "../../redux/store";
-import FeedbackDialog from "../../components/dialogs/FeedbackDialog";
-import getMultifileEditPrompt from "../../util/getMultifileEditPrompt";
-import { submitEdit } from "../../redux/slices/editModeState";
-import { stripImages } from "core/util/messageContent";
-import resolveEditorContent from "../../components/mainInput/resolveInput";
-import AcceptRejectAllButtons from "../../components/StepContainer/AcceptRejectAllButtons";
-import CodeToEditCard from "../../components/CodeToEditCard";
-import { exitEditMode } from "../../redux/thunks/exitEditMode";
-import PageHeader from "../../components/PageHeader";
-import Spinner from "../../components/gui/Spinner";
 
 const StopButton = styled.div`
   background-color: ${vscBackground};
@@ -496,19 +495,23 @@ export function Chat() {
           }}
         >
           <div className="flex flex-row items-center justify-between pb-1 pl-0.5 pr-2">
-            {history.length === 0 && getLastSessionId() && !isInEditMode && (
-              <NewSessionButton
-                onClick={() =>
-                  loadLastSession().catch((e) =>
-                    console.error(`Failed to load last session: ${e}`),
-                  )
-                }
-                className="xs:inline flex hidden items-center gap-2"
-              >
-                <ArrowLeftIcon className="h-3 w-3" />
-                Last Session
-              </NewSessionButton>
-            )}
+            <div className="xs:inline hidden">
+              {history.length === 0 && getLastSessionId() && !isInEditMode && (
+                <div className="xs:inline hidden">
+                  <NewSessionButton
+                    onClick={() =>
+                      loadLastSession().catch((e) =>
+                        console.error(`Failed to load last session: ${e}`),
+                      )
+                    }
+                    className="flex items-center gap-2"
+                  >
+                    <ArrowLeftIcon className="h-3 w-3" />
+                    Last Session
+                  </NewSessionButton>
+                </div>
+              )}
+            </div>
             <ConfigErrorIndicator />
           </div>