diff --git a/src/features/composer/components/Composer.tsx b/src/features/composer/components/Composer.tsx
index d8953ed71..574a7baf0 100644
--- a/src/features/composer/components/Composer.tsx
+++ b/src/features/composer/components/Composer.tsx
@@ -117,6 +117,7 @@ export function Composer({
   const internalRef = useRef<HTMLTextAreaElement | null>(null);
   const textareaRef = externalTextareaRef ?? internalRef;
   const isDictationBusy = dictationState !== "idle";
+  const canSend = text.trim().length > 0 || attachedImages.length > 0;
 
   useEffect(() => {
     setText((prev) => (prev === draftText ? prev : draftText));
@@ -241,6 +242,8 @@ export function Composer({
         disabled={disabled}
         sendLabel={sendLabel}
         canStop={canStop}
+        canSend={canSend}
+        isProcessing={isProcessing}
         onStop={onStop}
         onSend={handleSend}
         dictationEnabled={dictationEnabled}
diff --git a/src/features/composer/components/ComposerInput.tsx b/src/features/composer/components/ComposerInput.tsx
index db3514d27..13cd983e9 100644
--- a/src/features/composer/components/ComposerInput.tsx
+++ b/src/features/composer/components/ComposerInput.tsx
@@ -11,6 +11,8 @@ type ComposerInputProps = {
   disabled: boolean;
   sendLabel: string;
   canStop: boolean;
+  canSend: boolean;
+  isProcessing: boolean;
   onStop: () => void;
   onSend: () => void;
   dictationState?: "idle" | "listening" | "processing";
@@ -42,6 +44,8 @@ export function ComposerInput({
   disabled,
   sendLabel,
   canStop,
+  canSend,
+  isProcessing,
   onStop,
   onSend,
   dictationState = "idle",
@@ -314,13 +318,20 @@ export function ComposerInput({
         {isDictating ? <Square aria-hidden /> : <Mic aria-hidden />}
       </button>
       <button
-        className={`composer-action${canStop ? " is-stop" : " is-send"}`}
+        className={`composer-action${canStop ? " is-stop" : " is-send"}${
+          canStop && isProcessing ? " is-loading" : ""
+        }`}
         onClick={handleActionClick}
-        disabled={disabled || isDictationBusy}
+        disabled={disabled || isDictationBusy || (!canStop && !canSend)}
         aria-label={canStop ? "Stop" : sendLabel}
       >
         {canStop ? (
-          <span className="composer-action-stop-square" aria-hidden />
+          <>
+            <span className="composer-action-stop-square" aria-hidden />
+            {isProcessing && (
+              <span className="composer-action-spinner" aria-hidden />
+            )}
+          </>
         ) : (
           <svg viewBox="0 0 24 24" fill="none" aria-hidden>
             <path
diff --git a/src/features/messages/components/Markdown.tsx b/src/features/messages/components/Markdown.tsx
index d71992ba4..66d743e75 100644
--- a/src/features/messages/components/Markdown.tsx
+++ b/src/features/messages/components/Markdown.tsx
@@ -14,6 +14,7 @@ type MarkdownProps = {
   className?: string;
   codeBlock?: boolean;
   onOpenFileLink?: (path: string) => void;
+  onOpenFileLinkMenu?: (event: React.MouseEvent, path: string) => void;
 };
 
 export function Markdown({
@@ -21,6 +22,7 @@ export function Markdown({
   className,
   codeBlock,
   onOpenFileLink,
+  onOpenFileLinkMenu,
 }: MarkdownProps) {
   const content = codeBlock ? `\`\`\`\n${value}\n\`\`\`` : value;
   const handleFileLinkClick = (event: React.MouseEvent, path: string) => {
@@ -28,6 +30,14 @@ export function Markdown({
     event.stopPropagation();
     onOpenFileLink?.(path);
   };
+  const handleFileLinkContextMenu = (
+    event: React.MouseEvent,
+    path: string,
+  ) => {
+    event.preventDefault();
+    event.stopPropagation();
+    onOpenFileLinkMenu?.(event, path);
+  };
   return (
     <div className={className}>
       <ReactMarkdown
@@ -60,6 +70,9 @@ export function Markdown({
                 <a
                   href={href}
                   onClick={(event) => handleFileLinkClick(event, path)}
+                  onContextMenu={(event) =>
+                    handleFileLinkContextMenu(event, path)
+                  }
                 >
                   {children}
                 </a>
@@ -102,7 +115,13 @@ export function Markdown({
             }
             const href = toFileLink(text);
             return (
-              <a href={href} onClick={(event) => handleFileLinkClick(event, text)}>
+              <a
+                href={href}
+                onClick={(event) => handleFileLinkClick(event, text)}
+                onContextMenu={(event) =>
+                  handleFileLinkContextMenu(event, text)
+                }
+              >
                 <code>{children}</code>
               </a>
             );
diff --git a/src/features/messages/components/Messages.tsx b/src/features/messages/components/Messages.tsx
index 3dc36587f..6aa59bc3d 100644
--- a/src/features/messages/components/Messages.tsx
+++ b/src/features/messages/components/Messages.tsx
@@ -221,7 +221,7 @@ export const Messages = memo(function Messages({
   const copyTimeoutRef = useRef<number | null>(null);
   const [elapsedMs, setElapsedMs] = useState(0);
   const scrollKey = scrollKeyForItems(items);
-  const openFileLink = useFileLinkOpener(workspacePath);
+  const { openFileLink, showFileLinkMenu } = useFileLinkOpener(workspacePath);
 
   const isNearBottom = (node: HTMLDivElement) =>
     node.scrollHeight - node.scrollTop - node.clientHeight <= SCROLL_THRESHOLD_PX;
@@ -343,6 +343,7 @@ export const Messages = memo(function Messages({
                   value={item.text}
                   className="markdown"
                   onOpenFileLink={openFileLink}
+                  onOpenFileLinkMenu={showFileLinkMenu}
                 />
                 <button
                   type="button"
@@ -414,6 +415,7 @@ export const Messages = memo(function Messages({
                       isExpanded ? "" : "tool-inline-clamp"
                     }`}
                     onOpenFileLink={openFileLink}
+                    onOpenFileLinkMenu={showFileLinkMenu}
                   />
                 )}
               </div>
@@ -440,6 +442,7 @@ export const Messages = memo(function Messages({
                   value={item.text}
                   className="item-text markdown"
                   onOpenFileLink={openFileLink}
+                  onOpenFileLinkMenu={showFileLinkMenu}
                 />
               )}
             </div>
@@ -575,6 +578,7 @@ export const Messages = memo(function Messages({
                     value={item.detail}
                     className="item-text markdown"
                     onOpenFileLink={openFileLink}
+                    onOpenFileLinkMenu={showFileLinkMenu}
                   />
                 )}
                 {showToolOutput && summary.output && (
@@ -583,6 +587,7 @@ export const Messages = memo(function Messages({
                     className="tool-inline-output markdown"
                     codeBlock
                     onOpenFileLink={openFileLink}
+                    onOpenFileLinkMenu={showFileLinkMenu}
                   />
                 )}
               </div>
diff --git a/src/features/messages/hooks/useFileLinkOpener.ts b/src/features/messages/hooks/useFileLinkOpener.ts
index d4a983aa2..c6e7de0f1 100644
--- a/src/features/messages/hooks/useFileLinkOpener.ts
+++ b/src/features/messages/hooks/useFileLinkOpener.ts
@@ -1,4 +1,8 @@
 import { useCallback } from "react";
+import type { MouseEvent } from "react";
+import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu";
+import { LogicalPosition } from "@tauri-apps/api/dpi";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { revealItemInDir } from "@tauri-apps/plugin-opener";
 import { openWorkspaceIn } from "../../../services/tauri";
 import { getStoredOpenAppId } from "../../app/utils/openApp";
@@ -35,8 +39,22 @@ function stripLineSuffix(path: string) {
   return match ? match[1] : path;
 }
 
+function revealLabel() {
+  const platform =
+    (navigator as Navigator & { userAgentData?: { platform?: string } })
+      .userAgentData?.platform ?? navigator.platform ?? "";
+  const normalized = platform.toLowerCase();
+  if (normalized.includes("mac")) {
+    return "Reveal in Finder";
+  }
+  if (normalized.includes("win")) {
+    return "Show in Explorer";
+  }
+  return "Reveal in File Manager";
+}
+
 export function useFileLinkOpener(workspacePath?: string | null) {
-  return useCallback(
+  const openFileLink = useCallback(
     async (rawPath: string) => {
       const openAppId = getStoredOpenAppId();
       const target = OPEN_TARGETS[openAppId] ?? OPEN_TARGETS.vscode;
@@ -53,4 +71,66 @@ export function useFileLinkOpener(workspacePath?: string | null) {
     },
     [workspacePath],
   );
+
+  const showFileLinkMenu = useCallback(
+    async (event: MouseEvent, rawPath: string) => {
+      event.preventDefault();
+      event.stopPropagation();
+      const openAppId = getStoredOpenAppId();
+      const target = OPEN_TARGETS[openAppId] ?? OPEN_TARGETS.vscode;
+      const resolvedPath = resolveFilePath(stripLineSuffix(rawPath), workspacePath);
+      const openLabel =
+        target.id === "finder"
+          ? "Open in Finder"
+          : target.appName
+            ? `Open in ${target.appName}`
+            : "Open Link";
+      const items = [
+        await MenuItem.new({
+          text: openLabel,
+          action: async () => {
+            await openFileLink(rawPath);
+          },
+        }),
+        await MenuItem.new({
+          text: "Open Link in New Window",
+          action: async () => {
+            await openFileLink(rawPath);
+          },
+        }),
+        await MenuItem.new({
+          text: revealLabel(),
+          action: async () => {
+            await revealItemInDir(resolvedPath);
+          },
+        }),
+        await MenuItem.new({
+          text: "Download Linked File",
+          enabled: false,
+        }),
+        await MenuItem.new({
+          text: "Copy Link",
+          action: async () => {
+            const link =
+              resolvedPath.startsWith("/") ? `file://${resolvedPath}` : resolvedPath;
+            try {
+              await navigator.clipboard.writeText(link);
+            } catch {
+              // Clipboard failures are non-fatal here.
+            }
+          },
+        }),
+        await PredefinedMenuItem.new({ item: "Separator" }),
+        await PredefinedMenuItem.new({ item: "Services" }),
+      ];
+
+      const menu = await Menu.new({ items });
+      const window = getCurrentWindow();
+      const position = new LogicalPosition(event.clientX, event.clientY);
+      await menu.popup(position, window);
+    },
+    [openFileLink, workspacePath],
+  );
+
+  return { openFileLink, showFileLinkMenu };
 }
diff --git a/src/styles/composer.css b/src/styles/composer.css
index 987e50acd..95ba08f57 100644
--- a/src/styles/composer.css
+++ b/src/styles/composer.css
@@ -195,6 +195,7 @@
   display: inline-flex;
   align-items: center;
   justify-content: center;
+  position: relative;
 }
 
 .composer-action--mic.is-active {
@@ -312,6 +313,16 @@
   background: currentColor;
 }
 
+.composer-action-spinner {
+  position: absolute;
+  width: 18px;
+  height: 18px;
+  border-radius: 999px;
+  border: 2px solid rgba(255, 120, 120, 0.35);
+  border-top-color: rgba(255, 120, 120, 0.9);
+  animation: composer-action-spin 0.8s linear infinite;
+}
+
 
 .composer.is-disabled {
   opacity: 0.7;
@@ -346,6 +357,14 @@
   color: rgba(255, 196, 196, 0.4);
 }
 
+@keyframes composer-action-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
 
 .composer-select:disabled {
   cursor: not-allowed;