Depreciated active files and directory structure default (#188)

* Depreciated active files and directory structure default * Added inventory home shortcut * Changed onboarding --------- Co-authored-by: nang-dev <[email protected]>
trypear · Feb 4, 2025 · 8e39e96 · 8e39e96
1 parent f5974bd
commit 8e39e96
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 73 deletions.
diff --git a/core/protocol/ideWebview.ts b/core/protocol/ideWebview.ts
@@ -55,7 +55,7 @@ export type ToIdeFromWebviewProtocol = ToIdeFromWebviewOrCoreProtocol & {
   isSupermavenInstalled: [undefined, boolean];
   uninstallVscodeExtension: [{ extensionId: string }, void];
   completeWelcome: [undefined, void];
-  openInventory: [undefined, void];
+  openInventoryHome: [undefined, void];
   getUrlTitle: [string, string];
   pearAIinstallation: [{tools: ToolType[], installExtensions: boolean}, void];
 };

diff --git a/extensions/vscode/src/extension/VsCodeMessenger.ts b/extensions/vscode/src/extension/VsCodeMessenger.ts
@@ -164,7 +164,7 @@ export class VsCodeMessenger {
       }
       return 0;
     });
-    this.onWebview("openInventory", (msg) => {
+    this.onWebview("openInventoryHome", (msg) => {
       vscode.commands.executeCommand("pearai.toggleInventoryHome");
     });
     this.onWebview("pearAIinstallation", (msg) => {

diff --git a/gui/src/components/ShortcutContainer.tsx b/gui/src/components/ShortcutContainer.tsx
@@ -124,6 +124,12 @@ const ShortcutContainer = () => {
   };
 
   const shortcuts = [
+    {
+      modifiers: [modifier],
+      keyCode: "E",
+      description: "Open Inventory",
+      onClick: () => ideMessenger.post("openInventoryHome", undefined),
+    },
     {
       modifiers: [modifier],
       keyCode: "\\",

diff --git a/gui/src/components/mainInput/TipTapEditor.tsx b/gui/src/components/mainInput/TipTapEditor.tsx
@@ -57,8 +57,6 @@ import {
 } from "./getSuggestion";
 import { ComboBoxItem } from "./types";
 import { useLocation } from "react-router-dom";
-import ActiveFileIndicator from "./ActiveFileIndicator";
-import { setActiveFilePath } from "@/redux/slices/uiStateSlice";
 import TopBar from "./TopBarIndicators";
 import { isAiderMode, isPerplexityMode } from "../../util/bareChatMode";
 
@@ -969,8 +967,8 @@ const TipTapEditor = memo(function TipTapEditor({
         });
         event.preventDefault();
       }}
-    > 
-      {(!isPerplexity && !isAider) && <TopBar />}
+    >
+      {/* {(!isPerplexity && !isAider) && <TopBar />} */}
       <EditorContent
         spellCheck={false}
         editor={editor}

diff --git a/gui/src/components/mainInput/TopBarIndicators.tsx b/gui/src/components/mainInput/TopBarIndicators.tsx
@@ -1,5 +1,4 @@
 import { useContext } from "react";
-import ActiveFileIndicator from "./ActiveFileIndicator";
 import { IdeMessengerContext } from "../../context/IdeMessenger";
 import styled from "styled-components";
 import {
@@ -35,19 +34,19 @@ export default function TopBar() {
   const ideMessenger = useContext(IdeMessengerContext);
 
   const handleClick = () => {
-    ideMessenger.post("openInventory", undefined);
+    ideMessenger.post("openInventoryHome", undefined);
 }
   return (
     <div className="flex justify-between items-center mb-2 text-xs w-full">
       <div className="flex items-center gap-1">
-      <ActiveFileIndicator />
-      </div>
-        <MenuButton 
+      <MenuButton
         offFocus={false}
         onClick={handleClick}
       >
         {getMetaKeyLabel()}+1 Inventory
       </MenuButton>
+      </div>
+
     </div>
   );
 };
diff --git a/gui/src/components/mainInput/resolveInput.ts b/gui/src/components/mainInput/resolveInput.ts
@@ -118,35 +118,36 @@ async function resolveEditorContent(
     }
   }
 
-  const defaultModelTitle = (store.getState() as any).state.defaultModelTitle;
-  const excludeDirStructure =
-    defaultModelTitle?.toLowerCase() &&
-    EXCLUDE_DIR_STRUCTURE.some((term) =>
-      defaultModelTitle.toLowerCase().includes(term),
-    );
-
-  if (!excludeDirStructure) {
-    const previousDirectoryItems = (store.getState() as any).state
-      .directoryItems;
-    // use directory structure
-    const directoryItems = await ideMessenger.request(
-      "context/getContextItems",
-      {
-        name: "directory",
-        query: "",
-        fullInput: stripImages(parts),
-        selectedCode,
-      },
-    );
-
-    if (previousDirectoryItems !== directoryItems[0].content) {
-      store.dispatch(setDirectoryItems(directoryItems[0].content));
-      contextItems.push(...directoryItems);
-      for (const codebaseItem of directoryItems) {
-        contextItemsText += codebaseItem.content + "\n\n";
-      }
-    }
-  }
+  // Depreciated DirStructure on every request (-nang)
+  // const defaultModelTitle = (store.getState() as any).state.defaultModelTitle;
+  // const excludeDirStructure =
+  //   defaultModelTitle?.toLowerCase() &&
+  //   EXCLUDE_DIR_STRUCTURE.some((term) =>
+  //     defaultModelTitle.toLowerCase().includes(term),
+  //   );
+
+  // if (!excludeDirStructure) {
+  //   const previousDirectoryItems = (store.getState() as any).state
+  //     .directoryItems;
+  //   // use directory structure
+  //   const directoryItems = await ideMessenger.request(
+  //     "context/getContextItems",
+  //     {
+  //       name: "directory",
+  //       query: "",
+  //       fullInput: stripImages(parts),
+  //       selectedCode,
+  //     },
+  //   );
+
+  //   if (previousDirectoryItems !== directoryItems[0].content) {
+  //     store.dispatch(setDirectoryItems(directoryItems[0].content));
+  //     contextItems.push(...directoryItems);
+  //     for (const codebaseItem of directoryItems) {
+  //       contextItemsText += codebaseItem.content + "\n\n";
+  //     }
+  //   }
+  // }
 
   // cmd+enter to use codebase
   if (modifiers.useCodebase) {

diff --git a/gui/src/hooks/useChatHandler.ts b/gui/src/hooks/useChatHandler.ts
@@ -92,7 +92,7 @@ function useChatHandler(dispatch: Dispatch, ideMessenger: IIdeMessenger, source:
             }
           })
         );
-        
+
         dispatch(setPerplexityCitations(citationsWithTitles));
       }
 
@@ -208,34 +208,34 @@ function useChatHandler(dispatch: Dispatch, ideMessenger: IIdeMessenger, source:
         ideMessenger,
       );
 
-      // Automatically use currently open file
-      if (source === 'continue' && (!modifiers.noContext || useActiveFile) && (history.length === 0 || index === 0)) {
-        const usingFreeTrial = defaultModel.provider === "free-trial";
+      // Depreciated: Automatically use currently open file (-nang)
+      // if (source === 'continue' && (!modifiers.noContext || useActiveFile) && (history.length === 0 || index === 0)) {
+      //   const usingFreeTrial = defaultModel.provider === "free-trial";
 
-        const currentFilePath = await ideMessenger.ide.getCurrentFile();
-        if (typeof currentFilePath === "string") {
-          let currentFileContents =
-            await ideMessenger.ide.readFile(currentFilePath);
-          if (usingFreeTrial) {
-            currentFileContents = currentFileContents
-              .split("\n")
-              .slice(0, 1000)
-              .join("\n");
-          }
-          contextItems.unshift({
-            content: `The following file is currently open. Don't reference it if it's not relevant to the user's message.\n\n\`\`\`${getRelativePath(
-              currentFilePath,
-              await ideMessenger.ide.getWorkspaceDirs(),
-            )}\n${currentFileContents}\n\`\`\``,
-            name: `Active file: ${getBasename(currentFilePath)}`,
-            description: currentFilePath,
-            id: {
-              itemId: currentFilePath,
-              providerTitle: "file",
-            },
-          });
-        }
-      }
+      //   const currentFilePath = await ideMessenger.ide.getCurrentFile();
+      //   if (typeof currentFilePath === "string") {
+      //     let currentFileContents =
+      //       await ideMessenger.ide.readFile(currentFilePath);
+      //     if (usingFreeTrial) {
+      //       currentFileContents = currentFileContents
+      //         .split("\n")
+      //         .slice(0, 1000)
+      //         .join("\n");
+      //     }
+      //     contextItems.unshift({
+      //       content: `The following file is currently open. Don't reference it if it's not relevant to the user's message.\n\n\`\`\`${getRelativePath(
+      //         currentFilePath,
+      //         await ideMessenger.ide.getWorkspaceDirs(),
+      //       )}\n${currentFileContents}\n\`\`\``,
+      //       name: `Active file: ${getBasename(currentFilePath)}`,
+      //       description: currentFilePath,
+      //       id: {
+      //         itemId: currentFilePath,
+      //         providerTitle: "file",
+      //       },
+      //     });
+      //   }
+      // }
 
       const message: ChatMessage = {
         role: "user",

diff --git a/gui/src/pages/onboarding/OnboardingTutorial.tsx b/gui/src/pages/onboarding/OnboardingTutorial.tsx
@@ -272,11 +272,6 @@ const OnboardingTutorial: React.FC<OnboardingTutorialProps> = ({
         <>
           <p>
             Lastly, press{" "}
-            <b>
-              <kbd className="font-mono">{getMetaKeyAndShortcutLabel()}</kbd>
-              &nbsp;<kbd className="font-mono">1</kbd>
-            </b>{" "}
-            / {" "}
             <b>
               <kbd className="font-mono">{getMetaKeyAndShortcutLabel()}</kbd>
               &nbsp;<kbd className="font-mono">E</kbd>