package.json

@@ -27,6 +27,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@codemirror/commands": "6.8.1",
     "@codemirror/lang-angular": "^0.1.4",
     "@codemirror/lang-cpp": "^6.0.3",
     "@codemirror/lang-css": "^6.3.1",

pnpm-lock.yaml

@@ -8,6 +8,9 @@ importers:
 
   .:
     dependencies:
+      '@codemirror/commands':
+        specifier: 6.8.1
+        version: 6.8.1
       '@codemirror/lang-angular':
         specifier: ^0.1.4
         version: 0.1.4
@@ -239,8 +242,8 @@ packages:
   '@codemirror/autocomplete@6.20.0':
     resolution: {integrity: sha512-bOwvTOIJcG5FVo5gUUupiwYh8MioPLQ4UcqbcRf7UQ98X90tCa9E1kZ3Z7tqwpZxYyOvh1YTYbmZE9RTfTp5hg==}
 
-  '@codemirror/commands@6.10.1':
-    resolution: {integrity: sha512-uWDWFypNdQmz2y1LaNJzK7fL7TYKLeUAU0npEC685OKTF3KcQ2Vu3klIM78D7I6wGhktme0lh3CuQLv0ZCrD9Q==}
+  '@codemirror/commands@6.8.1':
+    resolution: {integrity: sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==}
 
   '@codemirror/lang-angular@0.1.4':
     resolution: {integrity: sha512-oap+gsltb/fzdlTQWD6BFF4bSLKcDnlxDsLdePiJpCVNKWXSTAbiiQeYI3UmES+BLAdkmIC1WjyztC1pi/bX4g==}
@@ -2184,7 +2187,7 @@ snapshots:
       '@codemirror/view': 6.39.11
       '@lezer/common': 1.5.0
 
-  '@codemirror/commands@6.10.1':
+  '@codemirror/commands@6.8.1':
     dependencies:
       '@codemirror/language': 6.12.1
       '@codemirror/state': 6.5.4
@@ -3214,7 +3217,7 @@ snapshots:
   codemirror@6.0.2:
     dependencies:
       '@codemirror/autocomplete': 6.20.0
-      '@codemirror/commands': 6.10.1
+      '@codemirror/commands': 6.8.1
       '@codemirror/language': 6.12.1
       '@codemirror/lint': 6.9.3
       '@codemirror/search': 6.6.0

src/lib/components/InputBar.svelte

@@ -30,6 +30,7 @@
   import SnippetLibraryPanel from "$lib/components/SnippetLibraryPanel.svelte";
   import QuickActionsPanel from "$lib/components/QuickActionsPanel.svelte";
   import ClipboardHistoryPanel from "$lib/components/ClipboardHistoryPanel.svelte";
+  import TextInputContextMenu from "$lib/components/TextInputContextMenu.svelte";
   import type { Attachment } from "$lib/types/messages";
 
   const INPUT_HISTORY_KEY = "hikari-input-history";
@@ -49,6 +50,23 @@
   let showClipboardHistory = $state(false);
   let streamerModeActive = $state(false);
 
+  // Context menu state
+  let textareaElement: HTMLTextAreaElement | undefined = $state();
+  let contextMenuShow = $state(false);
+  let contextMenuX = $state(0);
+  let contextMenuY = $state(0);
+
+  function handleContextMenu(event: MouseEvent) {
+    event.preventDefault();
+    contextMenuShow = true;
+    contextMenuX = event.clientX;
+    contextMenuY = event.clientY;
+  }
+
+  function closeContextMenu() {
+    contextMenuShow = false;
+  }
+
   isStreamerMode.subscribe((value) => {
     streamerModeActive = value;
   });
@@ -876,10 +894,12 @@ User: ${formattedMessage}`;
       <!-- svelte-ignore a11y_no_static_element_interactions -->
       <div class="resize-handle" onmousedown={handleResizeStart} title="Drag to resize"></div>
       <textarea
+        bind:this={textareaElement}
         bind:value={inputValue}
         onkeydown={handleKeyDown}
         oninput={handleInputChange}
         onpaste={handlePaste}
+        oncontextmenu={handleContextMenu}
         placeholder={isConnected
           ? "Ask Hikari anything... (type / for commands)"
           : "Connect to Claude first..."}
@@ -958,6 +978,15 @@ User: ${formattedMessage}`;
   />
 {/if}
 
+{#if contextMenuShow && textareaElement}
+  <TextInputContextMenu
+    x={contextMenuX}
+    y={contextMenuY}
+    inputElement={textareaElement}
+    onClose={closeContextMenu}
+  />
+{/if}
+
 <style>
   .input-bar {
     display: flex;

src/lib/components/TextInputContextMenu.svelte

@@ -0,0 +1,228 @@
+<script lang="ts">
+  interface Props {
+    x: number;
+    y: number;
+    inputElement: HTMLTextAreaElement | HTMLInputElement;
+    onClose: () => void;
+  }
+
+  let { x, y, inputElement, onClose }: Props = $props();
+
+  // Menu element reference for measuring
+  let menuElement: HTMLDivElement | undefined = $state();
+
+  // Adjusted position to keep menu within viewport
+  let adjustedX = $derived.by(() => {
+    if (!menuElement) return x;
+    const menuWidth = menuElement.offsetWidth || 180;
+    const maxX = window.innerWidth - menuWidth - 8;
+    return Math.min(x, maxX);
+  });
+
+  let adjustedY = $derived.by(() => {
+    if (!menuElement) return y;
+    const menuHeight = menuElement.offsetHeight || 250;
+    const maxY = window.innerHeight - menuHeight - 8;
+    return Math.min(y, maxY);
+  });
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (event.key === "Escape") {
+      onClose();
+    }
+  }
+
+  function execCommand(command: "cut" | "copy" | "paste" | "selectAll" | "undo" | "redo") {
+    inputElement.focus();
+
+    switch (command) {
+      case "cut":
+        document.execCommand("cut");
+        break;
+      case "copy":
+        document.execCommand("copy");
+        break;
+      case "paste":
+        document.execCommand("paste");
+        break;
+      case "selectAll":
+        inputElement.select();
+        break;
+      case "undo":
+        document.execCommand("undo");
+        break;
+      case "redo":
+        document.execCommand("redo");
+        break;
+    }
+    onClose();
+  }
+
+  // Check if there's a selection
+  let hasSelection = $derived(inputElement.selectionStart !== inputElement.selectionEnd);
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+<!-- svelte-ignore a11y_no_static_element_interactions a11y_click_events_have_key_events -->
+<div
+  class="menu-overlay"
+  onclick={onClose}
+  oncontextmenu={(e) => {
+    e.preventDefault();
+    onClose();
+  }}
+>
+  <!-- svelte-ignore a11y_no_static_element_interactions -->
+  <div
+    bind:this={menuElement}
+    class="menu-content"
+    style="left: {adjustedX}px; top: {adjustedY}px;"
+    onclick={(e) => e.stopPropagation()}
+  >
+    <button class="menu-item" onclick={() => execCommand("undo")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M3 10h10a5 5 0 0 1 5 5v2M3 10l4-4M3 10l4 4"
+        />
+      </svg>
+      Undo
+      <span class="shortcut">Ctrl+Z</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("redo")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M21 10H11a5 5 0 0 0-5 5v2M21 10l-4-4M21 10l-4 4"
+        />
+      </svg>
+      Redo
+      <span class="shortcut">Ctrl+Y</span>
+    </button>
+
+    <div class="menu-divider"></div>
+
+    <button class="menu-item" onclick={() => execCommand("cut")} disabled={!hasSelection}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M14.121 14.121L19 19m-7-7l7-7m-7 7l-2.879 2.879M12 12L9.121 9.121m0 5.758a3 3 0 1 0-4.243-4.243 3 3 0 0 0 4.243 4.243zm0-5.758a3 3 0 1 0-4.243-4.243 3 3 0 0 0 4.243 4.243z"
+        />
+      </svg>
+      Cut
+      <span class="shortcut">Ctrl+X</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("copy")} disabled={!hasSelection}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M8 16H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2m-6 12h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2z"
+        />
+      </svg>
+      Copy
+      <span class="shortcut">Ctrl+C</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("paste")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2"
+        />
+      </svg>
+      Paste
+      <span class="shortcut">Ctrl+V</span>
+    </button>
+
+    <div class="menu-divider"></div>
+
+    <button class="menu-item" onclick={() => execCommand("selectAll")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M4 5a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5z"
+        />
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 9h6v6H9z" />
+      </svg>
+      Select All
+      <span class="shortcut">Ctrl+A</span>
+    </button>
+  </div>
+</div>
+
+<style>
+  .menu-overlay {
+    position: fixed;
+    inset: 0;
+    z-index: 50;
+  }
+
+  .menu-content {
+    position: absolute;
+    z-index: 50;
+    min-width: 180px;
+    border-radius: 0.375rem;
+    border: 1px solid var(--border-color);
+    background-color: var(--bg-secondary);
+    padding: 0.25rem 0;
+    box-shadow:
+      0 10px 15px -3px rgba(0, 0, 0, 0.1),
+      0 4px 6px -2px rgba(0, 0, 0, 0.05);
+  }
+
+  .menu-item {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.375rem 0.75rem;
+    text-align: left;
+    font-size: 0.875rem;
+    color: var(--text-primary);
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    transition: background-color 0.15s ease;
+  }
+
+  .menu-item:hover:not(:disabled) {
+    background-color: var(--bg-primary);
+  }
+
+  .menu-item:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .menu-divider {
+    margin: 0.25rem 0;
+    border-top: 1px solid var(--border-color);
+  }
+
+  .menu-icon {
+    width: 1rem;
+    height: 1rem;
+    flex-shrink: 0;
+  }
+
+  .shortcut {
+    margin-left: auto;
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+  }
+</style>

src/lib/components/editor/CodeEditor.svelte

@@ -36,6 +36,7 @@
   import { tags } from "@lezer/highlight";
   import { editorStore } from "$lib/stores/editor";
   import { configStore } from "$lib/stores/config";
+  import EditorContextMenu from "./EditorContextMenu.svelte";
   import type { EditorTab } from "$lib/types/editor";
   import type { Extension } from "@codemirror/state";
 
@@ -45,6 +46,22 @@
   let view: EditorView | null = null;
   let themeCompartment = new Compartment();
 
+  // Context menu state
+  let contextMenuShow = false;
+  let contextMenuX = 0;
+  let contextMenuY = 0;
+
+  function handleContextMenu(event: MouseEvent) {
+    event.preventDefault();
+    contextMenuShow = true;
+    contextMenuX = event.clientX;
+    contextMenuY = event.clientY;
+  }
+
+  function closeContextMenu() {
+    contextMenuShow = false;
+  }
+
   // Subscribe to theme changes
   const config = configStore.config;
 
@@ -436,7 +453,17 @@
   }
 </script>
 
-<div class="code-editor" bind:this={editorContainer}></div>
+<!-- svelte-ignore a11y_no_static_element_interactions -->
+<div class="code-editor" bind:this={editorContainer} oncontextmenu={handleContextMenu}></div>
+
+{#if contextMenuShow && view}
+  <EditorContextMenu
+    x={contextMenuX}
+    y={contextMenuY}
+    editorView={view}
+    onClose={closeContextMenu}
+  />
+{/if}
 
 <style>
   .code-editor {

src/lib/components/editor/EditorContextMenu.svelte

@@ -0,0 +1,238 @@
+<script lang="ts">
+  import type { EditorView } from "@codemirror/view";
+
+  interface Props {
+    x: number;
+    y: number;
+    editorView: EditorView;
+    onClose: () => void;
+  }
+
+  let { x, y, editorView, onClose }: Props = $props();
+
+  // Menu element reference for measuring
+  let menuElement: HTMLDivElement | undefined = $state();
+
+  // Adjusted position to keep menu within viewport
+  let adjustedX = $derived.by(() => {
+    if (!menuElement) return x;
+    const menuWidth = menuElement.offsetWidth || 180;
+    const maxX = window.innerWidth - menuWidth - 8;
+    return Math.min(x, maxX);
+  });
+
+  let adjustedY = $derived.by(() => {
+    if (!menuElement) return y;
+    const menuHeight = menuElement.offsetHeight || 250;
+    const maxY = window.innerHeight - menuHeight - 8;
+    return Math.min(y, maxY);
+  });
+
+  function handleKeydown(event: KeyboardEvent) {
+    if (event.key === "Escape") {
+      onClose();
+    }
+  }
+
+  function execCommand(command: "cut" | "copy" | "paste" | "selectAll" | "undo" | "redo") {
+    editorView.focus();
+
+    switch (command) {
+      case "cut":
+        document.execCommand("cut");
+        break;
+      case "copy":
+        document.execCommand("copy");
+        break;
+      case "paste":
+        document.execCommand("paste");
+        break;
+      case "selectAll":
+        editorView.dispatch({
+          selection: { anchor: 0, head: editorView.state.doc.length },
+        });
+        break;
+      case "undo":
+        import("@codemirror/commands").then(({ undo }) => {
+          undo(editorView);
+        });
+        break;
+      case "redo":
+        import("@codemirror/commands").then(({ redo }) => {
+          redo(editorView);
+        });
+        break;
+    }
+    onClose();
+  }
+
+  // Check if there's a selection
+  let hasSelection = $derived(
+    editorView.state.selection.main.from !== editorView.state.selection.main.to
+  );
+</script>
+
+<svelte:window onkeydown={handleKeydown} />
+
+<!-- svelte-ignore a11y_no_static_element_interactions a11y_click_events_have_key_events -->
+<div
+  class="menu-overlay"
+  onclick={onClose}
+  oncontextmenu={(e) => {
+    e.preventDefault();
+    onClose();
+  }}
+>
+  <!-- svelte-ignore a11y_no_static_element_interactions -->
+  <div
+    bind:this={menuElement}
+    class="menu-content"
+    style="left: {adjustedX}px; top: {adjustedY}px;"
+    onclick={(e) => e.stopPropagation()}
+  >
+    <button class="menu-item" onclick={() => execCommand("undo")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M3 10h10a5 5 0 0 1 5 5v2M3 10l4-4M3 10l4 4"
+        />
+      </svg>
+      Undo
+      <span class="shortcut">Ctrl+Z</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("redo")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M21 10H11a5 5 0 0 0-5 5v2M21 10l-4-4M21 10l-4 4"
+        />
+      </svg>
+      Redo
+      <span class="shortcut">Ctrl+Y</span>
+    </button>
+
+    <div class="menu-divider"></div>
+
+    <button class="menu-item" onclick={() => execCommand("cut")} disabled={!hasSelection}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M14.121 14.121L19 19m-7-7l7-7m-7 7l-2.879 2.879M12 12L9.121 9.121m0 5.758a3 3 0 1 0-4.243-4.243 3 3 0 0 0 4.243 4.243zm0-5.758a3 3 0 1 0-4.243-4.243 3 3 0 0 0 4.243 4.243z"
+        />
+      </svg>
+      Cut
+      <span class="shortcut">Ctrl+X</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("copy")} disabled={!hasSelection}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M8 16H6a2 2 0 0 1-2-2V6a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v2m-6 12h8a2 2 0 0 0 2-2v-8a2 2 0 0 0-2-2h-8a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2z"
+        />
+      </svg>
+      Copy
+      <span class="shortcut">Ctrl+C</span>
+    </button>
+
+    <button class="menu-item" onclick={() => execCommand("paste")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M9 5H7a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V7a2 2 0 0 0-2-2h-2M9 5a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2M9 5a2 2 0 0 1 2-2h2a2 2 0 0 1 2 2"
+        />
+      </svg>
+      Paste
+      <span class="shortcut">Ctrl+V</span>
+    </button>
+
+    <div class="menu-divider"></div>
+
+    <button class="menu-item" onclick={() => execCommand("selectAll")}>
+      <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          stroke-width="2"
+          d="M4 5a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V5z"
+        />
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 9h6v6H9z" />
+      </svg>
+      Select All
+      <span class="shortcut">Ctrl+A</span>
+    </button>
+  </div>
+</div>
+
+<style>
+  .menu-overlay {
+    position: fixed;
+    inset: 0;
+    z-index: 50;
+  }
+
+  .menu-content {
+    position: absolute;
+    z-index: 50;
+    min-width: 180px;
+    border-radius: 0.375rem;
+    border: 1px solid var(--border-color);
+    background-color: var(--bg-secondary);
+    padding: 0.25rem 0;
+    box-shadow:
+      0 10px 15px -3px rgba(0, 0, 0, 0.1),
+      0 4px 6px -2px rgba(0, 0, 0, 0.05);
+  }
+
+  .menu-item {
+    display: flex;
+    width: 100%;
+    align-items: center;
+    gap: 0.5rem;
+    padding: 0.375rem 0.75rem;
+    text-align: left;
+    font-size: 0.875rem;
+    color: var(--text-primary);
+    background: transparent;
+    border: none;
+    cursor: pointer;
+    transition: background-color 0.15s ease;
+  }
+
+  .menu-item:hover:not(:disabled) {
+    background-color: var(--bg-primary);
+  }
+
+  .menu-item:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  .menu-divider {
+    margin: 0.25rem 0;
+    border-top: 1px solid var(--border-color);
+  }
+
+  .menu-icon {
+    width: 1rem;
+    height: 1rem;
+    flex-shrink: 0;
+  }
+
+  .shortcut {
+    margin-left: auto;
+    font-size: 0.75rem;
+    color: var(--text-secondary);
+  }
+</style>

src/lib/components/editor/FileContextMenu.svelte

@@ -56,6 +56,24 @@
       onClose();
     }
   }
+
+  // Menu element reference for measuring
+  let menuElement: HTMLDivElement | undefined = $state();
+
+  // Adjusted position to keep menu within viewport
+  let adjustedX = $derived.by(() => {
+    if (!menuElement) return x;
+    const menuWidth = menuElement.offsetWidth || 160;
+    const maxX = window.innerWidth - menuWidth - 8;
+    return Math.min(x, maxX);
+  });
+
+  let adjustedY = $derived.by(() => {
+    if (!menuElement) return y;
+    const menuHeight = menuElement.offsetHeight || 200;
+    const maxY = window.innerHeight - menuHeight - 8;
+    return Math.min(y, maxY);
+  });
 </script>
 
 <svelte:window onkeydown={handleKeydown} />
@@ -70,7 +88,12 @@
   }}
 >
   <!-- svelte-ignore a11y_no_static_element_interactions -->
-  <div class="menu-content" style="left: {x}px; top: {y}px;" onclick={(e) => e.stopPropagation()}>
+  <div
+    bind:this={menuElement}
+    class="menu-content"
+    style="left: {adjustedX}px; top: {adjustedY}px;"
+    onclick={(e) => e.stopPropagation()}
+  >
     <button class="menu-item" onclick={handleNewFile}>
       <svg class="menu-icon" fill="none" stroke="currentColor" viewBox="0 0 24 24">
         <path

src/routes/+layout.svelte

@@ -1,9 +1,17 @@
-<script>
+<script lang="ts">
   import "../app.css";
 
   let { children } = $props();
+
+  // Prevent the default context menu globally
+  // Individual components can show their own context menus by calling event.stopPropagation()
+  function handleContextMenu(event: MouseEvent) {
+    event.preventDefault();
+  }
 </script>
 
+<svelte:window oncontextmenu={handleContextMenu} />
+
 <div id="app">
   {@render children()}
 </div>