Revert "Add RecallActions and observations for retrieval of prompt extensions (#6909)"

This reverts commit cc45f5d9c3.

frontend/__tests__/hooks/use-terminal.test.tsx

@@ -72,10 +72,8 @@ describe("useTerminal", () => {
       wrapper: Wrapper,
     });
 
-    // Input commands should be displayed
-    expect(mockTerminal.writeln).toHaveBeenCalledWith("echo hello");
-    // Output commands should be displayed
-    expect(mockTerminal.writeln).toHaveBeenCalledWith("hello");
+    expect(mockTerminal.writeln).toHaveBeenNthCalledWith(1, "echo hello");
+    expect(mockTerminal.writeln).toHaveBeenNthCalledWith(2, "hello");
   });
 
   it("should hide secrets in the terminal", () => {
@@ -99,31 +97,13 @@ describe("useTerminal", () => {
       },
     );
 
-    // Input command should be displayed with secrets masked
-    expect(mockTerminal.writeln).toHaveBeenCalledWith(
+    // BUG: `vi.clearAllMocks()` does not clear the number of calls
+    // therefore, we need to assume the order of the calls based
+    // on the test order
+    expect(mockTerminal.writeln).toHaveBeenNthCalledWith(
+      3,
       `export GITHUB_TOKEN=${"*".repeat(10)},${"*".repeat(10)},${"*".repeat(10)}`,
     );
-    
-    // Output command should be displayed with secrets masked
-    expect(mockTerminal.writeln).toHaveBeenCalledWith("*".repeat(10));
-  });
-  
-  it("should prevent duplicate command display", () => {
-    const inputCommand = "ls -la";
-    const commands: Command[] = [
-      { content: inputCommand, type: "input" },
-      { content: `${inputCommand}\nfile1.txt\nfile2.txt`, type: "output" },
-    ];
-
-    render(<TestTerminalComponent commands={commands} secrets={[]} />, {
-      wrapper: Wrapper,
-    });
-
-    // Input command should be displayed
-    expect(mockTerminal.writeln).toHaveBeenCalledWith(inputCommand);
-    
-    // Output should not be displayed since it starts with the input command
-    // This prevents the duplicate display of the command
-    expect(mockTerminal.writeln).not.toHaveBeenCalledWith(`${inputCommand}\nfile1.txt\nfile2.txt`);
+    expect(mockTerminal.writeln).toHaveBeenNthCalledWith(4, "*".repeat(10));
   });
 });

frontend/src/hooks/use-terminal.ts

@@ -86,8 +86,6 @@ export const useTerminal = ({
 
   const handleEnter = (command: string) => {
     terminal.current?.write("\r\n");
-    // Send the command to the backend but don't echo it back in the terminal
-    // The backend will include the command in its response
     send(getTerminalCommand(command));
   };
 
@@ -133,26 +131,10 @@ export const useTerminal = ({
           content = content.replaceAll(secret, "*".repeat(10));
         });
 
-        // Check if this is an output that starts with the previous input command
-        // This happens when the backend echoes back the command in the output
-        let shouldDisplayContent = true;
-        if (type === "output" && i > 0 && commands[i - 1].type === "input") {
-          const prevInputCommand = commands[i - 1].content.trim();
-          // If the output starts with the input command, remove it to avoid duplication
-          if (content.trim().startsWith(prevInputCommand)) {
-            // Skip displaying this part as it's a duplicate of the user's input
-            // that's already shown in the terminal
-            shouldDisplayContent = false;
-          }
-        }
+        terminal.current?.writeln(
+          parseTerminalOutput(content.replaceAll("\n", "\r\n").trim()),
+        );
 
-        if (shouldDisplayContent) {
-          terminal.current?.writeln(
-            parseTerminalOutput(content.replaceAll("\n", "\r\n").trim()),
-          );
-        }
-
-        // Add a new prompt after the output
         if (type === "output") {
           terminal.current.write(`\n$ `);
         }

openhands/agenthub/codeact_agent/prompts/additional_info.j2

@@ -1,6 +1,6 @@
 {% if repository_info %}
 <REPOSITORY_INFO>
-At the user's request, repository {{ repository_info.repo_name }} has been cloned to directory {{ repository_info.repo_directory }}.
+At the user's request, repository {{ repository_info.repo_name }} has been cloned to the current working directory {{ repository_info.repo_directory }}.
 </REPOSITORY_INFO>
 {% endif %}
 {% if repository_instructions -%}

tests/unit/test_prompt_manager.py

@@ -117,7 +117,7 @@ def test_prompt_manager_template_rendering(prompt_dir):
     msg_content: str = initial_msg.content[0].text
     assert '<REPOSITORY_INFO>' in msg_content
     assert (
-        "At the user's request, repository owner/repo has been cloned to directory /workspace/repo."
+        "At the user's request, repository owner/repo has been cloned to the current working directory /workspace/repo."
         in msg_content
     )
     assert '</REPOSITORY_INFO>' in msg_content