diff options
| -rw-r--r-- | continuedev/src/continuedev/core/autopilot.py | 17 | ||||
| -rw-r--r-- | continuedev/src/continuedev/core/config.py | 36 | ||||
| -rw-r--r-- | continuedev/src/continuedev/plugins/steps/on_traceback.py | 43 | ||||
| -rw-r--r-- | continuedev/src/continuedev/server/ide.py | 276 | ||||
| -rw-r--r-- | extension/package.json | 10 | ||||
| -rw-r--r-- | extension/react-app/src/components/UserInputContainer.tsx | 50 | ||||
| -rw-r--r-- | extension/src/commands.ts | 3 | ||||
| -rw-r--r-- | extension/src/continueIdeClient.ts | 22 |
8 files changed, 284 insertions, 173 deletions
diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index f7808335..ded120d2 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -25,6 +25,7 @@ from ..plugins.steps.core.core import ( ReversibleStep, UserInputStep, ) +from ..plugins.steps.on_traceback import DefaultOnTracebackStep from ..server.ide_protocol import AbstractIdeProtocolServer from .context import ContextManager from .main import ( @@ -219,10 +220,18 @@ class Autopilot(ContinueBaseModel): get_traceback_funcs = [get_python_traceback, get_javascript_traceback] for get_tb_func in get_traceback_funcs: traceback = get_tb_func(output) - if traceback is not None: - for tb_step in self.continue_sdk.config.on_traceback: - step = tb_step.step({"output": output, **tb_step.params}) - await self._run_singular_step(step) + if ( + traceback is not None + and self.continue_sdk.config.on_traceback is not None + ): + step = self.continue_sdk.config.on_traceback(output=output) + await self._run_singular_step(step) + + async def handle_debug_terminal(self, content: str): + """Run the debug terminal step""" + # step = self.continue_sdk.config.on_traceback(output=content) + step = DefaultOnTracebackStep(output=content) + await self._run_singular_step(step) async def handle_highlighted_code( self, range_in_files: List[RangeInFileWithContents] diff --git a/continuedev/src/continuedev/core/config.py b/continuedev/src/continuedev/core/config.py index 84b6b10b..f5bf81fb 100644 --- a/continuedev/src/continuedev/core/config.py +++ b/continuedev/src/continuedev/core/config.py @@ -1,14 +1,11 @@ -import json -import os -from .main import Step -from .context import ContextProvider -from ..libs.llm.maybe_proxy_openai import MaybeProxyOpenAI -from .models import Models +from typing import Dict, List, Optional, Type + from pydantic import BaseModel, validator -from typing import List, Literal, Optional, Dict, Type -from .main import Policy, Step +from ..libs.llm.maybe_proxy_openai import MaybeProxyOpenAI from .context import ContextProvider +from .main import Policy, Step +from .models import Models class SlashCommand(BaseModel): @@ -24,34 +21,33 @@ class CustomCommand(BaseModel): description: str -class OnTracebackSteps(BaseModel): - step: Type[Step] - params: Optional[Dict] = {} - - class ContinueConfig(BaseModel): """ A pydantic class for the continue config file. """ + steps_on_startup: List[Step] = [] disallowed_steps: Optional[List[str]] = [] allow_anonymous_telemetry: Optional[bool] = True models: Models = Models( default=MaybeProxyOpenAI(model="gpt-4"), + medium=MaybeProxyOpenAI(model="gpt-3.5-turbo"), ) temperature: Optional[float] = 0.5 - custom_commands: Optional[List[CustomCommand]] = [CustomCommand( - name="test", - description="This is an example custom command. Use /config to edit it and create more", - prompt="Write a comprehensive set of unit tests for the selected code. It should setup, run tests that check for correctness including important edge cases, and teardown. Ensure that the tests are complete and sophisticated. Give the tests just as chat output, don't edit any file.", - )] + custom_commands: Optional[List[CustomCommand]] = [ + CustomCommand( + name="test", + description="This is an example custom command. Use /config to edit it and create more", + prompt="Write a comprehensive set of unit tests for the selected code. It should setup, run tests that check for correctness including important edge cases, and teardown. Ensure that the tests are complete and sophisticated. Give the tests just as chat output, don't edit any file.", + ) + ] slash_commands: Optional[List[SlashCommand]] = [] - on_traceback: Optional[List[OnTracebackSteps]] = [] + on_traceback: Optional[Step] = None system_message: Optional[str] = None policy_override: Optional[Policy] = None context_providers: List[ContextProvider] = [] - @validator('temperature', pre=True) + @validator("temperature", pre=True) def temperature_validator(cls, v): return max(0.0, min(1.0, v)) diff --git a/continuedev/src/continuedev/plugins/steps/on_traceback.py b/continuedev/src/continuedev/plugins/steps/on_traceback.py index e99f212d..86a0f499 100644 --- a/continuedev/src/continuedev/plugins/steps/on_traceback.py +++ b/continuedev/src/continuedev/plugins/steps/on_traceback.py @@ -1,9 +1,13 @@ import os -from .core.core import UserInputStep from ...core.main import ChatMessage, Step from ...core.sdk import ContinueSDK +from ...libs.util.traceback_parsers import ( + get_javascript_traceback, + get_python_traceback, +) from .chat import SimpleChatStep +from .core.core import UserInputStep class DefaultOnTracebackStep(Step): @@ -11,17 +15,38 @@ class DefaultOnTracebackStep(Step): name: str = "Help With Traceback" hide: bool = True - async def run(self, sdk: ContinueSDK): + async def find_relevant_files(self, sdk: ContinueSDK): # Add context for any files in the traceback that are in the workspace for line in self.output.split("\n"): segs = line.split(" ") for seg in segs: - if seg.startswith(os.path.sep) and os.path.exists(seg) and os.path.commonprefix([seg, sdk.ide.workspace_directory]) == sdk.ide.workspace_directory: + if ( + seg.startswith(os.path.sep) + and os.path.exists(seg) + and os.path.commonprefix([seg, sdk.ide.workspace_directory]) + == sdk.ide.workspace_directory + ): file_contents = await sdk.ide.readFile(seg) - self.chat_context.append(ChatMessage( - role="user", - content=f"The contents of {seg}:\n```\n{file_contents}\n```", - summary="" - )) - await sdk.run_step(UserInputStep(user_input=f"""I got the following error, can you please help explain how to fix it?\n\n{self.output}""")) + self.chat_context.append( + ChatMessage( + role="user", + content=f"The contents of {seg}:\n```\n{file_contents}\n```", + summary="", + ) + ) + # TODO: The ideal is that these are added as context items, so then the user can see them + # And this function is where you can get arbitrarily fancy about adding context + + async def run(self, sdk: ContinueSDK): + tb = self.output.strip() + for tb_parser in [get_python_traceback, get_javascript_traceback]: + if parsed_tb := tb_parser(tb): + tb = parsed_tb + break + + await sdk.run_step( + UserInputStep( + user_input=f"""I got the following error, can you please help explain how to fix it?\n\n{tb}""" + ) + ) await sdk.run_step(SimpleChatStep(name="Help With Traceback")) diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py index e523d3aa..5d85d57d 100644 --- a/continuedev/src/continuedev/server/ide.py +++ b/continuedev/src/continuedev/server/ide.py @@ -1,28 +1,46 @@ # This is a separate server from server/main.py +import asyncio import json import os -from typing import Any, Coroutine, List, Type, TypeVar, Union +import traceback import uuid -from fastapi import WebSocket, APIRouter -from starlette.websockets import WebSocketState, WebSocketDisconnect -from uvicorn.main import Server +from typing import Any, Coroutine, List, Type, TypeVar, Union + +import nest_asyncio +from fastapi import APIRouter, WebSocket from pydantic import BaseModel -import traceback -import asyncio +from starlette.websockets import WebSocketDisconnect, WebSocketState +from uvicorn.main import Server -from ..plugins.steps.core.core import DisplayErrorStep, MessageStep -from .meilisearch_server import start_meilisearch -from ..libs.util.telemetry import posthog_logger +from ..libs.util.create_async_task import create_async_task +from ..libs.util.logging import logger from ..libs.util.queue import AsyncSubscriptionQueue -from ..models.filesystem import FileSystem, RangeInFile, EditDiff, RangeInFileWithContents, RealFileSystem -from ..models.filesystem_edit import AddDirectory, AddFile, DeleteDirectory, DeleteFile, FileSystemEdit, FileEdit, FileEditWithFullContents, RenameDirectory, RenameFile, SequentialFileSystemEdit +from ..libs.util.telemetry import posthog_logger +from ..models.filesystem import ( + EditDiff, + FileSystem, + RangeInFile, + RangeInFileWithContents, + RealFileSystem, +) +from ..models.filesystem_edit import ( + AddDirectory, + AddFile, + DeleteDirectory, + DeleteFile, + FileEdit, + FileEditWithFullContents, + FileSystemEdit, + RenameDirectory, + RenameFile, + SequentialFileSystemEdit, +) +from ..plugins.steps.core.core import DisplayErrorStep from .gui import session_manager from .ide_protocol import AbstractIdeProtocolServer -from ..libs.util.create_async_task import create_async_task +from .meilisearch_server import start_meilisearch from .session_manager import SessionManager -from ..libs.util.logging import logger -import nest_asyncio nest_asyncio.apply() @@ -98,6 +116,10 @@ class UniqueIdResponse(BaseModel): uniqueId: str +class TerminalContentsResponse(BaseModel): + contents: str + + T = TypeVar("T", bound=BaseModel) @@ -157,22 +179,25 @@ class IdeProtocolServer(AbstractIdeProtocolServer): async def _send_json(self, message_type: str, data: Any): if self.websocket.application_state == WebSocketState.DISCONNECTED: logger.debug( - f"Tried to send message, but websocket is disconnected: {message_type}") + f"Tried to send message, but websocket is disconnected: {message_type}" + ) return logger.debug(f"Sending IDE message: {message_type}") - await self.websocket.send_json({ - "messageType": message_type, - "data": data - }) + await self.websocket.send_json({"messageType": message_type, "data": data}) async def _receive_json(self, message_type: str, timeout: int = 20) -> Any: try: - return await asyncio.wait_for(self.sub_queue.get(message_type), timeout=timeout) + return await asyncio.wait_for( + self.sub_queue.get(message_type), timeout=timeout + ) except asyncio.TimeoutError: raise Exception( - f"IDE Protocol _receive_json timed out after 20 seconds: {message_type}") + f"IDE Protocol _receive_json timed out after 20 seconds: {message_type}" + ) - async def _send_and_receive_json(self, data: Any, resp_model: Type[T], message_type: str) -> T: + async def _send_and_receive_json( + self, data: Any, resp_model: Type[T], message_type: str + ) -> T: await self._send_json(message_type, data) resp = await self._receive_json(message_type) return resp_model.parse_obj(resp) @@ -186,14 +211,19 @@ class IdeProtocolServer(AbstractIdeProtocolServer): await self.setSuggestionsLocked(data["filepath"], data["locked"]) elif message_type == "fileEdits": fileEdits = list( - map(lambda d: FileEditWithFullContents.parse_obj(d), data["fileEdits"])) + map(lambda d: FileEditWithFullContents.parse_obj(d), data["fileEdits"]) + ) self.onFileEdits(fileEdits) elif message_type == "highlightedCodePush": self.onHighlightedCodeUpdate( - [RangeInFileWithContents(**rif) for rif in data["highlightedCode"]]) + [RangeInFileWithContents(**rif) for rif in data["highlightedCode"]] + ) elif message_type == "commandOutput": output = data["output"] self.onCommandOutput(output) + elif message_type == "debugTerminal": + content = data["contents"] + self.onDebugTerminal(content) elif message_type == "acceptRejectSuggestion": self.onAcceptRejectSuggestion(data["accepted"]) elif message_type == "acceptRejectDiff": @@ -202,7 +232,16 @@ class IdeProtocolServer(AbstractIdeProtocolServer): self.onMainUserInput(data["input"]) elif message_type == "deleteAtIndex": self.onDeleteAtIndex(data["index"]) - elif message_type in ["highlightedCode", "openFiles", "visibleFiles", "readFile", "editFile", "getUserSecret", "runCommand"]: + elif message_type in [ + "highlightedCode", + "openFiles", + "visibleFiles", + "readFile", + "editFile", + "getUserSecret", + "runCommand", + "getTerminalContents", + ]: self.sub_queue.post(message_type, data) elif message_type == "workspaceDirectory": self.workspace_directory = data["workspaceDirectory"] @@ -212,88 +251,79 @@ class IdeProtocolServer(AbstractIdeProtocolServer): raise ValueError("Unknown message type", message_type) async def showSuggestion(self, file_edit: FileEdit): - await self._send_json("showSuggestion", { - "edit": file_edit.dict() - }) + await self._send_json("showSuggestion", {"edit": file_edit.dict()}) async def showDiff(self, filepath: str, replacement: str, step_index: int): - await self._send_json("showDiff", { - "filepath": filepath, - "replacement": replacement, - "step_index": step_index - }) + await self._send_json( + "showDiff", + { + "filepath": filepath, + "replacement": replacement, + "step_index": step_index, + }, + ) async def setFileOpen(self, filepath: str, open: bool = True): # Autopilot needs access to this. - await self._send_json("setFileOpen", { - "filepath": filepath, - "open": open - }) + await self._send_json("setFileOpen", {"filepath": filepath, "open": open}) async def showMessage(self, message: str): - await self._send_json("showMessage", { - "message": message - }) + await self._send_json("showMessage", {"message": message}) async def showVirtualFile(self, name: str, contents: str): - await self._send_json("showVirtualFile", { - "name": name, - "contents": contents - }) + await self._send_json("showVirtualFile", {"name": name, "contents": contents}) async def setSuggestionsLocked(self, filepath: str, locked: bool = True): # Lock suggestions in the file so they don't ruin the offset before others are inserted - await self._send_json("setSuggestionsLocked", { - "filepath": filepath, - "locked": locked - }) + await self._send_json( + "setSuggestionsLocked", {"filepath": filepath, "locked": locked} + ) async def getSessionId(self): - new_session = await asyncio.wait_for(self.session_manager.new_session( - self, self.session_id), timeout=5) + new_session = await asyncio.wait_for( + self.session_manager.new_session(self, self.session_id), timeout=5 + ) session_id = new_session.session_id logger.debug(f"Sending session id: {session_id}") - await self._send_json("getSessionId", { - "sessionId": session_id - }) + await self._send_json("getSessionId", {"sessionId": session_id}) async def highlightCode(self, range_in_file: RangeInFile, color: str = "#00ff0022"): - await self._send_json("highlightCode", { - "rangeInFile": range_in_file.dict(), - "color": color - }) + await self._send_json( + "highlightCode", {"rangeInFile": range_in_file.dict(), "color": color} + ) async def runCommand(self, command: str) -> str: - return (await self._send_and_receive_json({"command": command}, RunCommandResponse, "runCommand")).output + return ( + await self._send_and_receive_json( + {"command": command}, RunCommandResponse, "runCommand" + ) + ).output async def showSuggestionsAndWait(self, suggestions: List[FileEdit]) -> bool: ids = [str(uuid.uuid4()) for _ in suggestions] for i in range(len(suggestions)): - self._send_json("showSuggestion", { - "suggestion": suggestions[i], - "suggestionId": ids[i] - }) - responses = await asyncio.gather(*[ - self._receive_json(ShowSuggestionResponse) - for i in range(len(suggestions)) - ]) # WORKING ON THIS FLOW HERE. Fine now to just await for response, instead of doing something fancy with a "waiting" state on the autopilot. + self._send_json( + "showSuggestion", {"suggestion": suggestions[i], "suggestionId": ids[i]} + ) + responses = await asyncio.gather( + *[ + self._receive_json(ShowSuggestionResponse) + for i in range(len(suggestions)) + ] + ) # WORKING ON THIS FLOW HERE. Fine now to just await for response, instead of doing something fancy with a "waiting" state on the autopilot. # Just need connect the suggestionId to the IDE (and the gui) return any([r.accepted for r in responses]) def on_error(self, e: Exception) -> Coroutine: - err_msg = '\n'.join(traceback.format_exception(e)) + err_msg = "\n".join(traceback.format_exception(e)) e_title = e.__str__() or e.__repr__() return self.showMessage(f"Error in Continue server: {e_title}\n {err_msg}") def onAcceptRejectSuggestion(self, accepted: bool): - posthog_logger.capture_event("accept_reject_suggestion", { - "accepted": accepted - }) + posthog_logger.capture_event("accept_reject_suggestion", {"accepted": accepted}) def onAcceptRejectDiff(self, accepted: bool): - posthog_logger.capture_event("accept_reject_diff", { - "accepted": accepted - }) + posthog_logger.capture_event("accept_reject_diff", {"accepted": accepted}) def onFileSystemUpdate(self, update: FileSystemEdit): # Access to Autopilot (so SessionManager) @@ -323,18 +353,21 @@ class IdeProtocolServer(AbstractIdeProtocolServer): def onCommandOutput(self, output: str): if autopilot := self.__get_autopilot(): - create_async_task( - autopilot.handle_command_output(output), self.on_error) + create_async_task(autopilot.handle_command_output(output), self.on_error) + + def onDebugTerminal(self, content: str): + if autopilot := self.__get_autopilot(): + create_async_task(autopilot.handle_debug_terminal(content), self.on_error) def onHighlightedCodeUpdate(self, range_in_files: List[RangeInFileWithContents]): if autopilot := self.__get_autopilot(): - create_async_task(autopilot.handle_highlighted_code( - range_in_files), self.on_error) + create_async_task( + autopilot.handle_highlighted_code(range_in_files), self.on_error + ) def onMainUserInput(self, input: str): if autopilot := self.__get_autopilot(): - create_async_task( - autopilot.accept_user_input(input), self.on_error) + create_async_task(autopilot.accept_user_input(input), self.on_error) # Request information. Session doesn't matter. async def getOpenFiles(self) -> List[str]: @@ -342,26 +375,36 @@ class IdeProtocolServer(AbstractIdeProtocolServer): return resp.openFiles async def getVisibleFiles(self) -> List[str]: - resp = await self._send_and_receive_json({}, VisibleFilesResponse, "visibleFiles") + resp = await self._send_and_receive_json( + {}, VisibleFilesResponse, "visibleFiles" + ) return resp.visibleFiles + async def getTerminalContents(self) -> str: + resp = await self._send_and_receive_json( + {}, TerminalContentsResponse, "getTerminalContents" + ) + return resp.contents + async def getHighlightedCode(self) -> List[RangeInFile]: - resp = await self._send_and_receive_json({}, HighlightedCodeResponse, "highlightedCode") + resp = await self._send_and_receive_json( + {}, HighlightedCodeResponse, "highlightedCode" + ) return resp.highlightedCode async def readFile(self, filepath: str) -> str: """Read a file""" - resp = await self._send_and_receive_json({ - "filepath": filepath - }, ReadFileResponse, "readFile") + resp = await self._send_and_receive_json( + {"filepath": filepath}, ReadFileResponse, "readFile" + ) return resp.contents async def getUserSecret(self, key: str) -> str: """Get a user secret""" try: - resp = await self._send_and_receive_json({ - "key": key - }, GetUserSecretResponse, "getUserSecret") + resp = await self._send_and_receive_json( + {"key": key}, GetUserSecretResponse, "getUserSecret" + ) return resp.value except Exception as e: logger.debug(f"Error getting user secret: {e}") @@ -369,9 +412,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer): async def saveFile(self, filepath: str): """Save a file""" - await self._send_json("saveFile", { - "filepath": filepath - }) + await self._send_json("saveFile", {"filepath": filepath}) async def readRangeInFile(self, range_in_file: RangeInFile) -> str: """Read a range in a file""" @@ -380,9 +421,9 @@ class IdeProtocolServer(AbstractIdeProtocolServer): async def editFile(self, edit: FileEdit) -> FileEditWithFullContents: """Edit a file""" - resp = await self._send_and_receive_json({ - "edit": edit.dict() - }, EditFileResponse, "editFile") + resp = await self._send_and_receive_json( + {"edit": edit.dict()}, EditFileResponse, "editFile" + ) return resp.fileEdit async def applyFileSystemEdit(self, edit: FileSystemEdit) -> EditDiff: @@ -392,7 +433,8 @@ class IdeProtocolServer(AbstractIdeProtocolServer): if isinstance(edit, FileEdit): file_edit = await self.editFile(edit) _, diff = FileSystem.apply_edit_to_str( - file_edit.fileContents, file_edit.fileEdit) + file_edit.fileContents, file_edit.fileEdit + ) backward = diff.backward elif isinstance(edit, AddFile): fs.write(edit.filepath, edit.content) @@ -403,8 +445,9 @@ class IdeProtocolServer(AbstractIdeProtocolServer): fs.delete_file(edit.filepath) elif isinstance(edit, RenameFile): fs.rename_file(edit.filepath, edit.new_filepath) - backward = RenameFile(filepath=edit.new_filepath, - new_filepath=edit.filepath) + backward = RenameFile( + filepath=edit.new_filepath, new_filepath=edit.filepath + ) elif isinstance(edit, AddDirectory): fs.add_directory(edit.path) backward = DeleteDirectory(path=edit.path) @@ -414,11 +457,15 @@ class IdeProtocolServer(AbstractIdeProtocolServer): for root, dirs, files in os.walk(edit.path, topdown=False): for f in files: path = os.path.join(root, f) - edit_diff = await self.applyFileSystemEdit(DeleteFile(filepath=path)) + edit_diff = await self.applyFileSystemEdit( + DeleteFile(filepath=path) + ) backward_edits.append(edit_diff) for d in dirs: path = os.path.join(root, d) - edit_diff = await self.applyFileSystemEdit(DeleteDirectory(path=path)) + edit_diff = await self.applyFileSystemEdit( + DeleteDirectory(path=path) + ) backward_edits.append(edit_diff) edit_diff = await self.applyFileSystemEdit(DeleteDirectory(path=edit.path)) @@ -437,10 +484,7 @@ class IdeProtocolServer(AbstractIdeProtocolServer): else: raise TypeError("Unknown FileSystemEdit type: " + str(type(edit))) - return EditDiff( - forward=edit, - backward=backward - ) + return EditDiff(forward=edit, backward=backward) @router.websocket("/ws") @@ -469,15 +513,18 @@ async def websocket_endpoint(websocket: WebSocket, session_id: str = None): logger.debug(f"Received IDE message: {message_type}") create_async_task( - ideProtocolServer.handle_json(message_type, data), ideProtocolServer.on_error) + ideProtocolServer.handle_json(message_type, data), + ideProtocolServer.on_error, + ) # Initialize the IDE Protocol Server ideProtocolServer = IdeProtocolServer(session_manager, websocket) if session_id is not None: session_manager.registered_ides[session_id] = ideProtocolServer other_msgs = await ideProtocolServer.initialize(session_id) - posthog_logger.capture_event("session_started", { - "session_id": ideProtocolServer.session_id}) + posthog_logger.capture_event( + "session_started", {"session_id": ideProtocolServer.session_id} + ) for other_msg in other_msgs: handle_msg(other_msg) @@ -487,16 +534,20 @@ async def websocket_endpoint(websocket: WebSocket, session_id: str = None): message = await websocket.receive_text() handle_msg(message) - except WebSocketDisconnect as e: + except WebSocketDisconnect: logger.debug("IDE websocket disconnected") except Exception as e: logger.debug(f"Error in ide websocket: {e}") - err_msg = '\n'.join(traceback.format_exception(e)) - posthog_logger.capture_event("gui_error", { - "error_title": e.__str__() or e.__repr__(), "error_message": err_msg}) + err_msg = "\n".join(traceback.format_exception(e)) + posthog_logger.capture_event( + "gui_error", + {"error_title": e.__str__() or e.__repr__(), "error_message": err_msg}, + ) if session_id is not None and session_id in session_manager.sessions: - await session_manager.sessions[session_id].autopilot.continue_sdk.run_step(DisplayErrorStep(e=e)) + await session_manager.sessions[session_id].autopilot.continue_sdk.run_step( + DisplayErrorStep(e=e) + ) elif ideProtocolServer is not None: await ideProtocolServer.showMessage(f"Error in Continue server: {err_msg}") @@ -506,7 +557,8 @@ async def websocket_endpoint(websocket: WebSocket, session_id: str = None): if websocket.client_state != WebSocketState.DISCONNECTED: await websocket.close() - posthog_logger.capture_event("session_ended", { - "session_id": ideProtocolServer.session_id}) + posthog_logger.capture_event( + "session_ended", {"session_id": ideProtocolServer.session_id} + ) if ideProtocolServer.session_id in session_manager.registered_ides: session_manager.registered_ides.pop(ideProtocolServer.session_id) diff --git a/extension/package.json b/extension/package.json index 0bd09604..388d9b97 100644 --- a/extension/package.json +++ b/extension/package.json @@ -85,6 +85,11 @@ "command": "continue.focusContinueInputWithEdit", "category": "Continue", "title": "Focus Continue Input With Edit" + }, + { + "command": "continue.debugTerminal", + "category": "Continue", + "title": "Debug Terminal" } ], "keybindings": [ @@ -117,6 +122,11 @@ "command": "continue.toggleAuxiliaryBar", "mac": "alt+cmd+m", "key": "alt+ctrl+m" + }, + { + "command": "continue.debugTerminal", + "mac": "alt+cmd+d", + "key": "alt+ctrl+d" } ], "menus": { diff --git a/extension/react-app/src/components/UserInputContainer.tsx b/extension/react-app/src/components/UserInputContainer.tsx index 9784a615..fe85c431 100644 --- a/extension/react-app/src/components/UserInputContainer.tsx +++ b/extension/react-app/src/components/UserInputContainer.tsx @@ -1,5 +1,4 @@ import React, { useContext, useEffect, useRef, useState } from "react"; -import ReactMarkdown from "react-markdown"; import styled from "styled-components"; import { defaultBorderRadius, @@ -8,11 +7,9 @@ import { vscForeground, } from "."; import HeaderButtonWithText from "./HeaderButtonWithText"; -import { XMarkIcon, PencilIcon, CheckIcon } from "@heroicons/react/24/outline"; +import { XMarkIcon, CheckIcon } from "@heroicons/react/24/outline"; import { HistoryNode } from "../../../schema/HistoryNode"; -import StyledMarkdownPreview from "./StyledMarkdownPreview"; import { GUIClientContext } from "../App"; -import { text } from "stream/consumers"; interface UserInputContainerProps { onDelete: () => void; @@ -80,13 +77,19 @@ const UserInputContainer = (props: UserInputContainerProps) => { const client = useContext(GUIClientContext); useEffect(() => { - if (isEditing) { - textAreaRef.current?.focus(); + if (isEditing && textAreaRef.current) { + textAreaRef.current.focus(); // Select all text - textAreaRef.current?.setSelectionRange( + textAreaRef.current.setSelectionRange( 0, textAreaRef.current.value.length ); + // Change the size to match the contents (up to a max) + textAreaRef.current.style.height = "auto"; + textAreaRef.current.style.height = + (textAreaRef.current.scrollHeight > 500 + ? 500 + : textAreaRef.current.scrollHeight) + "px"; } }, [isEditing]); @@ -130,6 +133,9 @@ const UserInputContainer = (props: UserInputContainerProps) => { } }} defaultValue={props.children} + onBlur={() => { + setIsEditing(false); + }} /> ) : ( <StyledPre @@ -155,27 +161,15 @@ const UserInputContainer = (props: UserInputContainerProps) => { <CheckIcon width="1.4em" height="1.4em" /> </HeaderButtonWithText> ) : ( - <> - <HeaderButtonWithText - onClick={(e) => { - setIsEditing((prev) => !prev); - e.stopPropagation(); - }} - text="Edit" - > - <PencilIcon width="1.4em" height="1.4em" /> - </HeaderButtonWithText> - - <HeaderButtonWithText - onClick={(e) => { - props.onDelete(); - e.stopPropagation(); - }} - text="Delete" - > - <XMarkIcon width="1.4em" height="1.4em" /> - </HeaderButtonWithText> - </> + <HeaderButtonWithText + onClick={(e) => { + props.onDelete(); + e.stopPropagation(); + }} + text="Delete" + > + <XMarkIcon width="1.4em" height="1.4em" /> + </HeaderButtonWithText> )} </div> )} diff --git a/extension/src/commands.ts b/extension/src/commands.ts index ea12699e..4761826e 100644 --- a/extension/src/commands.ts +++ b/extension/src/commands.ts @@ -63,6 +63,9 @@ const commandsMap: { [command: string]: (...args: any) => any } = { const uri = vscode.Uri.file(logFile); await vscode.window.showTextDocument(uri); }, + "continue.debugTerminal": async () => { + await ideProtocolClient.debugTerminal(); + }, }; export function registerAllCommands(context: vscode.ExtensionContext) { diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 5b9e285d..6c107a63 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -227,6 +227,11 @@ class IdeProtocolClient { contents: this.readFile(data.filepath), }); break; + case "getTerminalContents": + messenger.send("getTerminalContents", { + contents: await this.getTerminalContents(), + }); + break; case "editFile": const fileEdit = await this.editFile(data.edit); messenger.send("editFile", { @@ -491,6 +496,18 @@ class IdeProtocolClient { return contents; } + async getTerminalContents(): Promise<string> { + await vscode.commands.executeCommand("workbench.action.terminal.selectAll"); + await vscode.commands.executeCommand( + "workbench.action.terminal.copySelection" + ); + await vscode.commands.executeCommand( + "workbench.action.terminal.clearSelection" + ); + let terminalContents = await vscode.env.clipboard.readText(); + return terminalContents; + } + editFile(edit: FileEdit): Promise<FileEditWithFullContents> { return new Promise((resolve, reject) => { openEditorAndRevealRange( @@ -574,6 +591,11 @@ class IdeProtocolClient { this.messenger?.send("mainUserInput", { input }); } + async debugTerminal() { + const contents = await this.getTerminalContents(); + this.messenger?.send("debugTerminal", { contents }); + } + deleteAtIndex(index: number) { this.messenger?.send("deleteAtIndex", { index }); } |