diff --git a/grid-agent-gui/frontend/src/components/ChatInterface.svelte b/grid-agent-gui/frontend/src/components/ChatInterface.svelte
index 5f279fe..f28e20f 100644
--- a/grid-agent-gui/frontend/src/components/ChatInterface.svelte
+++ b/grid-agent-gui/frontend/src/components/ChatInterface.svelte
@@ -32,6 +32,7 @@
   let showErrorModal = false;
   let showSettings = false;
   let showDocs = false;
+  let showClearModal = false;
   let errorMessage = "";
   let isExporting = false;
   let isAborting = false;
@@ -235,6 +236,102 @@
     errorMessage = "";
   }
 
+  function handleClear() {
+    showClearModal = true;
+  }
+
+  function clearConversation() {
+    showClearModal = false;
+    messagesStore.set([]);
+  }
+
+  async function saveAndClear() {
+    showClearModal = false;
+    await handleExport();
+    messagesStore.set([]);
+  }
+
+  function editMessage(index: number, newContent: string) {
+    // First update the message content and timestamp
+    messagesStore.update((msgs) => {
+      const newMsgs = [...msgs];
+      if (newMsgs[index] && newMsgs[index].role === "user") {
+        newMsgs[index] = { ...newMsgs[index], content: newContent, timestamp: new Date().toISOString() };
+      }
+      return newMsgs;
+    });
+
+    // If this user message has an agent response immediately following, retrigger AI
+    const messages = $messagesStore;
+    const nextIndex = index + 1;
+    if (messages[index].role === "user" && nextIndex < messages.length && messages[nextIndex].role === "agent") {
+      // Remove the agent response
+      messagesStore.update((msgs) => {
+        return msgs.filter((_, i) => i !== nextIndex);
+      });
+
+      // Add placeholder for new response
+      const requestID = `req_${Date.now()}_${Math.random()}`;
+      const placeholderMsg = {
+        role: "agent",
+        content: "",
+        timestamp: new Date().toISOString(),
+        requestID: requestID,
+        steps: [
+          {
+            progressText: "🤔 Processing your request...",
+            exportPrefix: "",
+            content: "Processing your request...",
+            output: "",
+            error: "",
+          },
+        ],
+      };
+      messagesStore.update((msgs) => [...msgs, placeholderMsg]);
+
+      // Send the edited message directly
+      (async () => {
+        isSending = true;
+        currentRequestID = requestID;
+        try {
+          const response = await SendMessage(newContent, requestID);
+          messagesStore.update((msgs) => {
+            const idx = msgs.findIndex((m) => m.requestID === response.requestID);
+            if (idx !== -1) {
+              const newMsgs = [...msgs];
+              newMsgs[idx] = response;
+              return newMsgs;
+            }
+            return [...msgs, response]; // Fallback
+          });
+        } catch (error) {
+          console.error("Failed to send message:", error);
+          messagesStore.update((msgs) => {
+            const idx = msgs.findIndex((m) => m.requestID === requestID);
+            if (idx !== -1) {
+              const existingMsg = msgs[idx];
+              const steps = (existingMsg.steps || []).filter(
+                (s) => !s.progressText?.includes("🤔 Processing"),
+              );
+              steps.push({
+                progressText: "❌ Error",
+                exportPrefix: "",
+                content: "",
+                output: "",
+                error: String(error),
+              });
+              msgs[idx] = { ...existingMsg, content: error, steps };
+            }
+            return [...msgs];
+          });
+        } finally {
+          isSending = false;
+          currentRequestID = "";
+        }
+      })();
+    }
+  }
+
   function toggleSettings() {
     showSettings = !showSettings;
   }
@@ -612,6 +709,25 @@
           >
         {/if}
       </button>
+      <button
+        class="icon-btn clear-btn"
+        on:click={handleClear}
+        title="Clear Conversation"
+        disabled={$messagesStore.length === 0}
+      >
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          width="20"
+          height="20"
+          viewBox="0 0 24 24"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          ><path d="M3 6h18" /><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" /><path d="M10 11v6" /><path d="M14 11v6" /></svg
+        >
+      </button>
       <button class="icon-btn" on:click={toggleDocs} title="Help">
         <svg
           xmlns="http://www.w3.org/2000/svg"
@@ -708,8 +824,8 @@
       </div>
     {/if}
 
-    {#each $messagesStore as msg}
-      <ChatMessage message={msg} />
+    {#each $messagesStore as msg, index}
+      <ChatMessage message={msg} on:edit={(e) => editMessage(index, e.detail.content)} />
     {/each}
   </div>
 
@@ -805,6 +921,21 @@
   </div>
 {/if}
 
+<!-- Clear Modal -->
+{#if showClearModal}
+  <div class="modal-overlay" on:click={() => showClearModal = false} transition:fade>
+    <div class="modal" on:click|stopPropagation transition:fade>
+      <h2>Clear Conversation</h2>
+      <p>If you clear the window context you will not be able to retrieve the conversation.</p>
+      <div class="modal-actions">
+        <button class="btn primary" on:click={saveAndClear}>Save and Clear</button>
+        <button class="btn danger" on:click={clearConversation}>Clear</button>
+        <button class="btn secondary" on:click={() => showClearModal = false}>Cancel</button>
+      </div>
+    </div>
+  </div>
+{/if}
+
 <Settings show={showSettings} on:close={() => (showSettings = false)} />
 <Docs show={showDocs} on:close={() => (showDocs = false)} />
 
@@ -970,6 +1101,15 @@
     background: rgba(239, 68, 68, 0.1);
   }
 
+  .clear-btn {
+    color: var(--text-secondary);
+  }
+
+  .clear-btn:hover {
+    color: var(--error);
+    background: rgba(239, 68, 68, 0.1);
+  }
+
   /* Floating Input Area */
   .input-area {
     padding: 1.5rem;
diff --git a/grid-agent-gui/frontend/src/components/ChatMessage.svelte b/grid-agent-gui/frontend/src/components/ChatMessage.svelte
index ed5cbe5..79c77d2 100644
--- a/grid-agent-gui/frontend/src/components/ChatMessage.svelte
+++ b/grid-agent-gui/frontend/src/components/ChatMessage.svelte
@@ -6,6 +6,8 @@
   import { marked } from "marked";
   import DOMPurify from "dompurify";
   import { BrowserOpenURL } from "../../wailsjs/runtime/runtime.js";
+  import { createEventDispatcher } from "svelte";
+  const dispatch = createEventDispatcher();
 
   // Step types
   const STEP_TYPE_TOOL = "tool";
@@ -32,6 +34,9 @@
     error?: string;
   };
 
+  let isEditing = false;
+  let editContent = message.content;
+
   const isUser = message.role === "user";
   let showSteps = false;
 
@@ -104,6 +109,34 @@
       BrowserOpenURL(link.href);
     }
   }
+
+  function startEditing() {
+    if (isUser) {
+      isEditing = true;
+      editContent = message.content;
+    }
+  }
+
+  function saveEdit() {
+    if (isUser && editContent.trim()) {
+      dispatch('edit', { content: editContent.trim() });
+      isEditing = false;
+    }
+  }
+
+  function cancelEdit() {
+    isEditing = false;
+    editContent = message.content;
+  }
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (event.key === 'Enter' && !event.shiftKey) {
+      event.preventDefault();
+      saveEdit();
+    } else if (event.key === 'Escape') {
+      cancelEdit();
+    }
+  }
 </script>
 
 <div class="message-wrapper {isUser ? 'user' : 'agent'}" in:fade>
@@ -118,9 +151,44 @@
   <div class="content-wrapper">
     <div class="bubble">
       {#if message.content}
-        <div class="text markdown-body" on:click={handleLinkClick}>
-          {@html renderMarkdown(message.content)}
-        </div>
+        {#if isEditing}
+          <div class="edit-container">
+            <textarea
+              bind:value={editContent}
+              on:keydown={handleKeydown}
+              class="edit-textarea"
+              rows="3"
+              placeholder="Edit your message..."
+            ></textarea>
+            <div class="edit-actions">
+              <button class="edit-btn save-btn" on:click={saveEdit}>Save</button>
+              <button class="edit-btn cancel-btn" on:click={cancelEdit}>Cancel</button>
+            </div>
+          </div>
+        {:else}
+          <div class="message-content">
+            <div class="text markdown-body" on:click={handleLinkClick}>
+              {@html renderMarkdown(message.content)}
+            </div>
+            {#if isUser}
+              <button class="edit-trigger" on:click={startEditing} title="Edit message">
+                <svg
+                  width="16"
+                  height="16"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  stroke-width="2"
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                >
+                  <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"></path>
+                  <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"></path>
+                </svg>
+              </button>
+            {/if}
+          </div>
+        {/if}
       {:else if message.steps && message.steps.length > 0}
         <div class="typing-indicator">
           <span></span>
@@ -543,4 +611,113 @@
     font-weight: 700;
     color: inherit; /* inherit ensures it looks good in user bubbles too */
   }
+
+  /* Edit functionality styling */
+  .message-content {
+    position: relative;
+  }
+
+  .edit-trigger {
+    position: absolute;
+    bottom: 0.5rem;
+    right: 0.5rem;
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    font-size: 1rem;
+    opacity: 0;
+    pointer-events: none;
+    transition: opacity 0.2s;
+    padding: 0.25rem;
+    border-radius: 0.25rem;
+    color: var(--text-secondary);
+  }
+
+  .message-content:hover .edit-trigger {
+    opacity: 1;
+    pointer-events: auto;
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
+  }
+
+  .edit-container {
+    display: flex;
+    flex-direction: column;
+    gap: 0.75rem;
+  }
+
+  .edit-textarea {
+    width: 100%;
+    padding: 0.75rem;
+    border: 1px solid var(--border);
+    border-radius: 0.5rem;
+    background: var(--bg-primary);
+    color: var(--text-primary);
+    font-family: inherit;
+    font-size: 0.95rem;
+    resize: vertical;
+    min-height: 3rem;
+    outline: none;
+    transition: border-color 0.2s;
+  }
+
+  .edit-textarea:focus {
+    border-color: var(--accent);
+  }
+
+  .user .edit-textarea {
+    background: rgba(255, 255, 255, 0.1);
+    color: white;
+  }
+
+  .agent .edit-textarea {
+    background: var(--bg-primary);
+    color: var(--text-primary);
+  }
+
+  .edit-actions {
+    display: flex;
+    gap: 0.5rem;
+    justify-content: flex-end;
+  }
+
+  .edit-btn {
+    padding: 0.5rem 1rem;
+    border-radius: 0.375rem;
+    font-size: 0.875rem;
+    font-weight: 600;
+    cursor: pointer;
+    transition: all 0.2s;
+    border: none;
+  }
+
+  .save-btn {
+    background: var(--accent);
+    color: white;
+  }
+
+  .save-btn:hover {
+    background: var(--accent-hover);
+  }
+
+  .cancel-btn {
+    background: transparent;
+    color: var(--text-secondary);
+    border: 1px solid var(--border);
+  }
+
+  .cancel-btn:hover {
+    background: var(--bg-tertiary);
+    color: var(--text-primary);
+  }
+
+  .user .cancel-btn {
+    color: rgba(255, 255, 255, 0.8);
+    border-color: rgba(255, 255, 255, 0.3);
+  }
+
+  .user .cancel-btn:hover {
+    background: rgba(255, 255, 255, 0.1);
+    color: white;
+  }
 </style>