Merge remote-tracking branch 'upstream/ai-agent' into ai-agent

Author: vizzyfreezy

src/pages/aiAssistant/assistant.js

@@ -222,8 +222,7 @@ export default function openAIAssistantPage() {
 				child: tag("i", {
 					className: "icon edit",
 				}),
-				// TODO: Implement edit functionality
-				//onclick: () => editMessage(message.id),
+				onclick: () => editMessage(message.id),
 			});
 			messageActions.appendChild(editBtn);
 		}
@@ -238,7 +237,11 @@ export default function openAIAssistantPage() {
 		if (message.role === "user") {
 			messageContent.textContent = message.content;
 		} else {
-			const md = markdownIt();
+			const md = markdownIt({
+				html: true,
+				linkify: true,
+				typographer: true,
+			});
 			messageContent.innerHTML = md.render(message.content);
 		}
 
@@ -248,6 +251,74 @@ export default function openAIAssistantPage() {
 		scrollToBottom();
 	};
 
+	const editMessage = (messageId) => {
+		const message = chatHistory.find((msg) => msg.id === messageId);
+		if (!message) return;
+
+		const messageEl = messageContainerRef.el.querySelector(
+			`#message-${message.id}`,
+		);
+		const messageContent = messageEl.querySelector(".message-content");
+
+		const editContainer = <div className="edit-container"></div>;
+
+		const textarea = (
+			<textarea
+				className="edit-textarea"
+				defaultValue={message.content}
+				placeholder="Edit your message..."
+				onkeydown={(e) => {
+					if (e.key === "Enter" && e.ctrlKey) {
+						e.preventDefault();
+						// TODO: save edit
+					} else if (e.key === "Escape") {
+						e.preventDefault();
+						// TODO: cancel edit
+					}
+				}}
+			/>
+		);
+
+		const editActions = <div className="edit-actions"></div>;
+
+		const editInfo = (
+			<div className="edit-info">
+				Press Ctrl+Enter to save, Escape to cancel
+			</div>
+		);
+
+		const editButtons = (
+			<div className="edit-buttons">
+				<button
+					className="btn btn-sm btn-outline"
+					onclick={() => {
+						const md = markdownIt({
+							html: true,
+							linkify: true,
+							typographer: true,
+						});
+						messageContent.innerHTML = md.render(message.content);
+					}}
+				>
+					<i className="icon clearclose"></i>{" "}
+					<span className="btn-text">Cancel</span>
+				</button>
+				<button className="btn btn-sm btn-primary">
+					<i className="icon check"></i> <span className="btn-text">Save</span>
+				</button>
+			</div>
+		);
+
+		editActions.append(editInfo, editButtons);
+		editContainer.append(textarea, editActions);
+
+		messageContent.innerHTML = "";
+		messageContent.appendChild(editContainer);
+
+		textarea.focus();
+		textarea.select();
+	};
+
 	/**
 	 * Updates the profile button appearance and state
 	 * @param {string} profile - Profile type ("ask" or "write")
@@ -416,6 +487,7 @@ export default function openAIAssistantPage() {
 						);
 					}
 					chatHistory.push({
+						id: msg.id,
 						role: msg.role,
 						content: msg.content,
 					});
@@ -485,7 +557,10 @@ export default function openAIAssistantPage() {
 			role: "user",
 			content: userInput,
 		};
-		chatHistory.push(userMessageForAgent);
+		chatHistory.push({
+			...userMessageForAgent,
+			id: userMsgId.id,
+		});
 
 		chatInputRef.el.value = "";
 		handleChatInput();
@@ -609,6 +684,15 @@ export default function openAIAssistantPage() {
 			);
 			if (targetMessageElContent) {
 				targetMessageElContent.innerHTML += errorContent;
+			} else {
+				const assistantErrorMsg = {
+					id: assistantMsgId,
+					conversationId: currentConversationId,
+					role: "assistant",
+					content: errorContent,
+					timestamp: Date.now(),
+				};
+				addMessage(assistantErrorMsg);
 			}
 		} finally {
 			currentController = null;
@@ -631,6 +715,7 @@ export default function openAIAssistantPage() {
 
 			if (!wasError) {
 				chatHistory.push({
+					id: assistantFinalData.id,
 					role: "assistant",
 					content: streamedContent,
 				});

src/pages/aiAssistant/assistant.module.scss

@@ -182,14 +182,15 @@
       border-radius: 0.375rem;
       color: var(--primary-text-color);
       font-size: 0.875rem;
-      resize: vertical;
+      resize: none;
       transition: all 0.2s ease;
-    }
+      box-sizing: border-box;
 
-    .edit-textarea:focus {
-      outline: none;
-      border-color: var(--active-color);
-      box-shadow: 0 0 0 2px rgba(35, 116, 225, 0.1);
+      &:focus {
+        outline: none;
+        border-color: var(--active-color);
+        box-shadow: 0 0 0 2px rgba(35, 116, 225, 0.1);
+      }
     }
 
     .edit-actions {

src/pages/aiAssistant/system_prompt.js

@@ -1,3 +1,5 @@
+import { addedFolder } from "lib/openFolder";
+
 export const SYSTEM_PROMPT = `You are a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices.
 
 ## Communication
@@ -26,4 +28,7 @@ Otherwise, follow debugging best practices:
 1. Unless explicitly requested by the user, use the best suited external APIs and packages to solve the task. There is no need to ask the user for permission.
 2. When selecting which version of an API or package to use, choose one that is compatible with the user's dependency management file(s). If no such file exists or if the package is not present, use the latest version that is in your training data.
 3. If an external API requires an API Key, be sure to point this out to the user. Adhere to best security practices (e.g. DO NOT hardcode an API key in a place where it can be exposed)
+
+SideBar workspace projects(name, absolutePath or url):
+${addedFolder.map((node) => `name: ${node.title}\nurl: ${node.url}`).join("\n")}
 `;