@geminilight/mindos 0.6.63 → 0.6.65

package/app/app/api/skills/route.ts

@@ -17,7 +17,7 @@ export async function GET() {
   try {
     const settings = readSettings();
     const disabledSkills = settings.disabledSkills ?? [];
-    const skills = scanSkillDirs({
+    const skills = await scanSkillDirs({
       projectRoot: PROJECT_ROOT,
       mindRoot: getMindRoot(),
       disabledSkills,

package/app/app/layout.tsx

@@ -9,6 +9,7 @@ import ErrorBoundary from '@/components/ErrorBoundary';
 import Toaster from '@/components/ui/Toaster';
 import RegisterSW from './register-sw';
 import UpdateOverlay from '@/components/UpdateOverlay';
+import UpdateToast from '@/components/UpdateToast';
 import { cookies, headers } from 'next/headers';
 import type { Locale } from '@/lib/i18n';
 import '@/lib/renderers/index'; // globally register built-in renderers once
@@ -120,9 +121,10 @@ export default async function RootLayout({
               </ShellLayout>
             </ErrorBoundary>
           </TooltipProvider>
-          <Toaster />
-          <RegisterSW />
-          <UpdateOverlay />
+        <Toaster />
+        <RegisterSW />
+        <UpdateOverlay />
+        <UpdateToast />
       </body>
     </html>
   );

package/app/components/HomeContent.tsx

@@ -1,6 +1,7 @@
 'use client';
 
 import { useState, useCallback } from 'react';
+import { useRouter } from 'next/navigation';
 import { useLocale } from '@/lib/stores/locale-store';
 import { FolderSync, PenLine, BarChart3, Sparkles, ArrowUpRight } from 'lucide-react';
 import OnboardingView from './OnboardingView';
@@ -22,6 +23,7 @@ const TAB_ICONS = [FolderSync, PenLine, BarChart3, Sparkles];
 
 export default function HomeContent({ recent, existingFiles, spaces }: { recent: RecentFile[]; existingFiles?: string[]; spaces?: SpaceInfo[] }) {
   const { t } = useLocale();
+  const router = useRouter();
   const [activeTab, setActiveTab] = useState(0);
   const [maximized, setMaximized] = useState(false);
 
@@ -32,6 +34,14 @@ export default function HomeContent({ recent, existingFiles, spaces }: { recent:
     setMaximized(true);
   }, []);
 
+  // Navigate to editor with right-side Ask panel open
+  const handleDockToPanel = useCallback(() => {
+    const target = recent.length > 0 ? `/view/${recent[0].path}` : '/';
+    // Signal the already-mounted SidebarLayout to open the Ask panel
+    window.dispatchEvent(new CustomEvent('mindos:open-ask-panel'));
+    router.push(target);
+  }, [recent, router]);
+
   if (recent.length === 0) {
     return <OnboardingView />;
   }
@@ -98,6 +108,7 @@ export default function HomeContent({ recent, existingFiles, spaces }: { recent:
               maximized={maximized}
               onMaximize={toggleMaximize}
               onFirstMessage={handleFirstMessage}
+              onDockToPanel={handleDockToPanel}
             />
           </div>
         </div>

package/app/components/UpdateToast.tsx

@@ -0,0 +1,255 @@
+'use client';
+
+import { useEffect, useState, useCallback, useRef } from 'react';
+import { X } from 'lucide-react';
+import { useLocale } from '@/lib/stores/locale-store';
+
+/* ── Bridge interface ──────────────────────────────────────────────── */
+
+interface MindosDesktopBridge {
+  checkUpdate?: () => Promise<{ available: boolean; version?: string }>;
+  onUpdateAvailable?: (cb: (info: { version?: string }) => void) => () => void;
+  checkCoreUpdate?: () => Promise<{
+    available: boolean;
+    currentVersion: string;
+    latestVersion: string;
+  }>;
+  onCoreUpdateAvailable?: (
+    cb: (info: { current: string; latest: string; ready?: boolean }) => void,
+  ) => () => void;
+}
+
+function getDesktopBridge(): MindosDesktopBridge | null {
+  if (typeof window === 'undefined') return null;
+  const w = window as unknown as { mindos?: MindosDesktopBridge };
+  return w.mindos?.checkUpdate ? (w.mindos as MindosDesktopBridge) : null;
+}
+
+/* ── Types ─────────────────────────────────────────────────────────── */
+
+interface PendingUpdate {
+  type: 'desktop' | 'core';
+  version: string;
+}
+
+type ToastVisibility = 'hidden' | 'visible' | 'dismissing';
+
+/* ── Constants ─────────────────────────────────────────────────────── */
+
+const SKIP_DESKTOP_KEY = 'mindos_update_skip_desktop';
+const SKIP_CORE_KEY = 'mindos_update_skip_core';
+const SHOW_DELAY_MS = 10_000; // Wait 10 s after startup before showing
+const DISMISS_MS = 200; // Match the CSS transition duration
+
+/* ── Helpers ───────────────────────────────────────────────────────── */
+
+/** Proper semantic-version comparison: returns true when `a` is strictly newer than `b`. */
+function isNewer(a: string, b: string): boolean {
+  const pa = a.split('.').map(Number);
+  const pb = b.split('.').map(Number);
+  for (let i = 0; i < Math.max(pa.length, pb.length); i++) {
+    const va = pa[i] ?? 0;
+    const vb = pb[i] ?? 0;
+    if (va > vb) return true;
+    if (va < vb) return false;
+  }
+  return false;
+}
+
+/* ── Component ─────────────────────────────────────────────────────── */
+
+/**
+ * Desktop-only update notification toast.
+ *
+ * Appears in the bottom-right corner when the Electron bridge reports a new
+ * Desktop shell or MindOS Core update.  Persists until the user clicks
+ * "View Details" (→ Settings > Update tab) or "Skip Version" (→ stored in
+ * localStorage so it won't re-appear for that version).
+ *
+ * Renders `null` in browser/CLI mode (no bridge).
+ */
+export default function UpdateToast() {
+  const { t } = useLocale();
+  const ut = t.settings.update.updateToast;
+
+  const [visibility, setVisibility] = useState<ToastVisibility>('hidden');
+  const [updates, setUpdates] = useState<{
+    desktop?: PendingUpdate;
+    core?: PendingUpdate;
+  }>({});
+
+  // Stable ref for the bridge — avoids re-running the effect every render.
+  const bridgeRef = useRef<MindosDesktopBridge | null>(null);
+  const [isDesktop, setIsDesktop] = useState(false);
+
+  // Timeout bookkeeping — prevents stale setState after dismiss / unmount.
+  const timers = useRef(new Set<ReturnType<typeof setTimeout>>());
+  const queued = useRef<{ desktop?: string; core?: string }>({});
+
+  // ── Timeout helpers ─────────────────────────────────────────────────
+
+  const clearTimers = useCallback(() => {
+    timers.current.forEach(clearTimeout);
+    timers.current.clear();
+  }, []);
+
+  const schedule = useCallback((state: ToastVisibility, ms: number) => {
+    const id = setTimeout(() => {
+      timers.current.delete(id);
+      setVisibility(state);
+    }, ms);
+    timers.current.add(id);
+  }, []);
+
+  // ── Detect Desktop bridge once on mount ─────────────────────────────
+
+  useEffect(() => {
+    const b = getDesktopBridge();
+    bridgeRef.current = b;
+    setIsDesktop(!!b);
+  }, []);
+
+  // ── Subscribe to IPC update events ──────────────────────────────────
+
+  useEffect(() => {
+    const bridge = bridgeRef.current;
+    if (!bridge) return;
+
+    clearTimers();
+    const teardowns: Array<() => void> = [];
+
+    // Helper: queue an update unless already queued for this version.
+    const enqueue = (
+      key: 'desktop' | 'core',
+      version: string,
+      skipKey: string,
+    ) => {
+      const skipped = localStorage.getItem(skipKey);
+      if (skipped && !isNewer(version, skipped)) return;
+      if (queued.current[key] === version) return; // de-dup
+
+      queued.current[key] = version;
+      setUpdates(prev => ({ ...prev, [key]: { type: key, version } }));
+      schedule('visible', SHOW_DELAY_MS);
+    };
+
+    if (bridge.onUpdateAvailable) {
+      teardowns.push(
+        bridge.onUpdateAvailable(info => {
+          if (info?.version) enqueue('desktop', info.version, SKIP_DESKTOP_KEY);
+        }),
+      );
+    }
+
+    if (bridge.onCoreUpdateAvailable) {
+      teardowns.push(
+        bridge.onCoreUpdateAvailable(info => {
+          if (info?.latest && !info.ready) {
+            enqueue('core', info.latest, SKIP_CORE_KEY);
+          }
+        }),
+      );
+    }
+
+    return () => {
+      teardowns.forEach(fn => fn());
+      clearTimers();
+    };
+  }, [isDesktop, clearTimers, schedule]); // eslint-disable-line react-hooks/exhaustive-deps
+
+  // Clean up on unmount
+  useEffect(() => () => clearTimers(), [clearTimers]);
+
+  // ── Actions ─────────────────────────────────────────────────────────
+
+  const handleViewDetails = useCallback(() => {
+    clearTimers();
+    window.dispatchEvent(
+      new CustomEvent('mindos:open-settings', { detail: { tab: 'update' } }),
+    );
+    setVisibility('dismissing');
+    schedule('hidden', DISMISS_MS);
+  }, [clearTimers, schedule]);
+
+  const handleSkip = useCallback(() => {
+    clearTimers();
+    if (updates.desktop) localStorage.setItem(SKIP_DESKTOP_KEY, updates.desktop.version);
+    if (updates.core) localStorage.setItem(SKIP_CORE_KEY, updates.core.version);
+    setVisibility('dismissing');
+    schedule('hidden', DISMISS_MS);
+  }, [updates, clearTimers, schedule]);
+
+  // ── Render ──────────────────────────────────────────────────────────
+
+  if (!isDesktop || visibility === 'hidden') return null;
+
+  const hasBoth = !!(updates.desktop && updates.core);
+  const title = hasBoth
+    ? ut.titleMultiple
+    : updates.desktop
+      ? ut.titleSingle(ut.desktopLabel, updates.desktop.version)
+      : updates.core
+        ? ut.titleSingle(ut.coreLabel, updates.core.version)
+        : '';
+
+  const subtitle = hasBoth
+    ? `${ut.desktopLabel} v${updates.desktop!.version} \u00B7 ${ut.coreLabel} v${updates.core!.version}`
+    : '';
+
+  const show = visibility === 'visible';
+
+  return (
+    <div
+      role="status"
+      aria-live="polite"
+      className={`
+        fixed bottom-14 right-4 z-40 pointer-events-none
+        transition-all duration-200
+        ${show ? 'opacity-100 translate-y-0' : 'opacity-0 translate-y-2'}
+      `}
+    >
+      <div className="pointer-events-auto flex flex-col gap-2.5 bg-card border border-border rounded-xl shadow-lg px-4 py-3 w-[290px]">
+        {/* ── Title row ── */}
+        <div className="flex items-start gap-2">
+          {/* Amber indicator dot */}
+          <span className="mt-[5px] w-2 h-2 rounded-full bg-[var(--amber)] shrink-0" />
+
+          <div className="flex-1 min-w-0">
+            <p className="text-sm font-medium text-foreground leading-snug">{title}</p>
+            {subtitle && (
+              <p className="text-xs text-muted-foreground mt-0.5 truncate">{subtitle}</p>
+            )}
+          </div>
+
+          {/* Close = same as skip */}
+          <button
+            type="button"
+            onClick={handleSkip}
+            className="shrink-0 p-0.5 rounded text-muted-foreground hover:text-foreground transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+            aria-label="Dismiss"
+          >
+            <X size={13} />
+          </button>
+        </div>
+
+        {/* ── Actions ── */}
+        <div className="flex gap-2">
+          <button
+            type="button"
+            onClick={handleViewDetails}
+            className="flex-1 px-3 py-1.5 text-xs font-medium rounded-lg text-[var(--amber-foreground)] bg-[var(--amber)] hover:opacity-90 transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+          >
+            {ut.viewDetails}
+          </button>
+          <button
+            type="button"
+            onClick={handleSkip}
+            className="flex-1 px-3 py-1.5 text-xs rounded-lg text-muted-foreground border border-border hover:text-foreground hover:bg-muted transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring"
+          >
+            {hasBoth ? ut.skipAll : ut.skipVersion}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

package/app/components/ask/AskContent.tsx

@@ -3,7 +3,7 @@
 import { useEffect, useLayoutEffect, useRef, useState, useCallback, useMemo } from 'react';
 import { Send, StopCircle, X, Plus, FileText, ImageIcon } from 'lucide-react';
 import { useLocale } from '@/lib/stores/locale-store';
-import type { AskMode } from '@/lib/types';
+import type { AskMode, Message } from '@/lib/types';
 import ModeCapsule, { getPersistedMode } from '@/components/ask/ModeCapsule';
 import { useAskSession } from '@/hooks/useAskSession';
 import { useFileUpload } from '@/hooks/useFileUpload';
@@ -74,9 +74,11 @@ interface AskContentProps {
   askMode?: 'panel' | 'popup';
   /** Switch between panel ↔ popup */
   onModeSwitch?: () => void;
+  /** Navigate from fullscreen to right-side panel mode */
+  onDockToPanel?: () => void;
 }
 
-export default function AskContent({ visible, currentFile, initialMessage, initialAcpAgent, onFirstMessage, variant, onClose, maximized, onMaximize, askMode, onModeSwitch }: AskContentProps) {
+export default function AskContent({ visible, currentFile, initialMessage, initialAcpAgent, onFirstMessage, variant, onClose, maximized, onMaximize, askMode, onModeSwitch, onDockToPanel }: AskContentProps) {
   const isPanel = variant === 'panel';
   const isHome = variant === 'home';
 
@@ -103,7 +105,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
   const selectedAcpAgentRef = useRef(selectedAcpAgent);
   selectedAcpAgentRef.current = selectedAcpAgent;
   const [chatMode, setChatMode] = useState<AskMode>('agent');
-  const [providerOverride, setProviderOverride] = useState<ProviderId | `cp_${string}` | null>(null);
+  const [providerOverride, setProviderOverride] = useState<ProviderId | `p_${string}` | null>(null);
   const [modelOverride, setModelOverride] = useState<string | null>(null);
 
   useEffect(() => {
@@ -136,7 +138,30 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
     setSelectedSkill(null);
     setSelectedAcpAgent(null);
     setAttachedFiles(currentFile ? [currentFile] : []);
-  }, [currentFile]);
+    upload.clearAttachments();
+  }, [currentFile, upload]);
+
+
+  const handleRestoreInput = useCallback((userMessage: Message) => {
+    setInput(userMessage.content);
+    // Restore images if they exist
+    if (userMessage.images && userMessage.images.length > 0) {
+      // Reconstruct the images state from the message images
+      imageUpload.clearImages();
+      // Note: we can't directly set images without going through the upload flow
+      // So we just clear them for now - in practice, images are usually small content
+      // and the user can re-add them if needed
+    }
+    if (userMessage.attachedFiles) setAttachedFiles(userMessage.attachedFiles);
+    // Restore skill selection if it was set
+    if (userMessage.skillName) {
+      // The skill is already in the slash command system, just mark as selected
+      // This will be handled through the UI state
+      slash.resetSlash(); // Clear any active slash query
+    }
+    // Focus back to input
+    setTimeout(() => inputRef.current?.focus(), 50);
+  }, [imageUpload, slash]);
 
   const chatRefs = useRef({ inputValueRef, mentionRef, slashRef, imageUploadRef, sessionRef, uploadRef, selectedSkillRef, selectedAcpAgentRef, attachedFilesRef });
   const chat = useAskChat({
@@ -148,6 +173,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
     refs: chatRefs.current,
     errorLabels: { noResponse: t.ask.errorNoResponse, stopped: t.ask.stopped },
     resetInputState,
+    onRestoreInput: handleRestoreInput,
   });
   const { isLoading, loadingPhase, reconnectAttempt, reconnectMaxRef } = chat;
   const handleSubmit = chat.submit;
@@ -482,7 +508,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
   }), [t, reconnectAttempt]);
 
   return (
-    <>
+    <div className="flex min-h-0 w-full flex-col h-full">
       {/* Header — home variant shows session switcher + new/history/fullscreen buttons */}
       <AskHeader
         isPanel={isPanel || isHome}
@@ -495,6 +521,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
         askMode={isHome ? undefined : askMode}
         onModeSwitch={isHome ? undefined : onModeSwitch}
         onClose={isHome ? undefined : onClose}
+        onDockToPanel={maximized ? onDockToPanel : undefined}
         sessions={session.sessions}
         activeSessionId={session.activeSessionId}
         onLoadSession={handleLoadSession}
@@ -522,32 +549,33 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
         />
       )}
 
-      {/* Messages */}
       {/* Messages — home variant hides empty state (suggestions rendered externally) */}
-      {!isHome && (
-        <MessageList
-          messages={session.messages}
-          isLoading={isLoading}
-          loadingPhase={loadingPhase}
-          emptyPrompt={t.ask.emptyPrompt}
-          emptyHint={t.ask.emptyHint}
-          suggestions={t.ask.suggestions}
-          onSuggestionClick={setInput}
-          labels={messageLabels}
-        />
-      )}
-      {isHome && session.messages.length > 0 && (
-        <MessageList
-          messages={session.messages}
-          isLoading={isLoading}
-          loadingPhase={loadingPhase}
-          emptyPrompt={t.ask.emptyPrompt}
-          emptyHint={t.ask.emptyHint}
-          suggestions={[]}
-          onSuggestionClick={setInput}
-          labels={messageLabels}
-        />
-      )}
+      <div className="flex-1 min-h-0 flex flex-col">
+        {!isHome && (
+          <MessageList
+            messages={session.messages}
+            isLoading={isLoading}
+            loadingPhase={loadingPhase}
+            emptyPrompt={t.ask.emptyPrompt}
+            emptyHint={t.ask.emptyHint}
+            suggestions={t.ask.suggestions}
+            onSuggestionClick={setInput}
+            labels={messageLabels}
+          />
+        )}
+        {isHome && session.messages.length > 0 && (
+          <MessageList
+            messages={session.messages}
+            isLoading={isLoading}
+            loadingPhase={loadingPhase}
+            emptyPrompt={t.ask.emptyPrompt}
+            emptyHint={t.ask.emptyHint}
+            suggestions={[]}
+            onSuggestionClick={setInput}
+            labels={messageLabels}
+          />
+        )}
+      </div>
 
       {/* Popovers — flex children so they stay within overflow boundary (absolute positioning would be clipped by RightAskPanel's overflow-hidden) */}
       {mention.mentionQuery !== null && mention.mentionResults.length > 0 && (
@@ -573,7 +601,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
       )}
 
       {/* Composer card — unified input area */}
-      <div className="shrink-0 px-3 pb-2.5 pt-1">
+      <div className={cn('shrink-0', isHome ? 'px-2 pb-2 pt-0.5' : 'px-3 pb-2.5 pt-1')}>
         <div
           className={cn(
             'rounded-xl bg-muted/40 transition-all focus-within:bg-muted/60',
@@ -621,7 +649,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
           <form
             ref={formRef}
             onSubmit={handleSubmit}
-            className="flex items-end gap-1.5 px-3 py-2"
+            className={cn('flex items-end gap-1.5', isHome ? 'px-2 py-1.5' : 'px-3 py-2')}
           >
             {/* + attach button with mini menu */}
             <div className="relative shrink-0">
@@ -690,7 +718,7 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
               onPaste={handlePaste}
               placeholder={t.ask.placeholder}
               rows={1}
-              className="min-w-0 flex-1 resize-none overflow-y-hidden bg-transparent py-2 text-sm leading-relaxed text-foreground placeholder:text-muted-foreground/50 outline-none focus-visible:ring-0"
+              className={cn('min-w-0 flex-1 resize-none overflow-y-hidden bg-transparent py-2 leading-relaxed text-foreground placeholder:text-muted-foreground/50 outline-none focus-visible:ring-0', isHome ? 'text-xs' : 'text-sm')}
             />
 
             {isLoading ? (
@@ -705,8 +733,8 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
           </form>
 
           {/* Mode + Agent + Provider selector row + keyboard hint */}
-          <div className="flex items-center justify-between px-3 pb-2 pt-1.5 border-t border-border/10">
-            <div className="flex items-center gap-2">
+          <div className={cn('flex items-center justify-between border-t border-border/10', isPanel ? 'px-2 pb-1.5 pt-1 gap-1' : 'px-3 pb-2 pt-1.5')}>
+            <div className={cn('flex items-center flex-wrap', isPanel ? 'gap-1' : 'gap-2')}>
               <ModeCapsule mode={chatMode} onChange={setChatMode} disabled={isLoading} />
             {mounted && acpDetection.installedAgents.length > 0 && (
               <AgentSelectorCapsule
@@ -729,13 +757,15 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
               />
             )}
             </div>
-            {/* Keyboard hint */}
-            <span className="hidden md:inline text-2xs text-muted-foreground/40 select-none">
-              <kbd className="font-mono">Enter</kbd> {t.ask.send} · <kbd className="font-mono">Shift+Enter</kbd> {t.ask.newlineHint}
-            </span>
+            {/* Keyboard hint — hidden in panel (too narrow) and home (compact) */}
+            {!isPanel && !isHome && (
+              <span className="hidden md:inline text-2xs text-muted-foreground/40 select-none shrink-0">
+                <kbd className="font-mono">Enter</kbd> {t.ask.send} · <kbd className="font-mono">Shift+Enter</kbd> {t.ask.newlineHint}
+              </span>
+            )}
           </div>
         </div>
       </div>
-    </>
+    </div>
   );
 }

package/app/components/ask/AskHeader.tsx

@@ -16,6 +16,8 @@ interface AskHeaderProps {
   askMode?: 'panel' | 'popup';
   onModeSwitch?: () => void;
   onClose?: () => void;
+  /** Navigate from fullscreen to right-side panel mode */
+  onDockToPanel?: () => void;
   hideTitle?: boolean;
   /** Session switching — inline in header when >=2 sessions */
   sessions?: ChatSession[];
@@ -28,7 +30,7 @@ interface AskHeaderProps {
 
 export default memo(function AskHeader({
   isPanel, showHistory, onToggleHistory, onReset, isLoading,
-  maximized, onMaximize, askMode, onModeSwitch, onClose, hideTitle,
+  maximized, onMaximize, askMode, onModeSwitch, onClose, onDockToPanel, hideTitle,
   sessions, activeSessionId, onLoadSession, onDeleteSession, onRenameSession, onTogglePinSession,
 }: AskHeaderProps) {
   const { t } = useLocale();
@@ -244,6 +246,11 @@ export default memo(function AskHeader({
             {maximized ? <Minimize2 size={iconSize} /> : <Maximize2 size={iconSize} />}
           </button>
         )}
+        {onDockToPanel && (
+          <button type="button" onClick={(e) => { e.stopPropagation(); onDockToPanel(); }} className="p-2 rounded-lg hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={t.hints.dockToSide ?? 'Dock to side panel'}>
+            <PanelRight size={iconSize} />
+          </button>
+        )}
         {onModeSwitch && (
           <button type="button" onClick={(e) => { e.stopPropagation(); onModeSwitch(); }} className="p-2 rounded-lg hover:bg-muted text-muted-foreground hover:text-foreground transition-colors" title={askMode === 'popup' ? t.hints.dockToSide : t.hints.openAsPopup}>
             {askMode === 'popup' ? <PanelRight size={iconSize} /> : <AppWindow size={iconSize} />}

package/app/components/ask/MessageList.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useRef, useEffect, memo, useState, useCallback } from 'react';
-import { Sparkles, Loader2, AlertCircle, Wrench, WifiOff, Zap, Copy, Check, ArrowDown, FolderInput, Search, PenLine, Lightbulb } from 'lucide-react';
+import { Sparkles, Loader2, AlertCircle, Wrench, WifiOff, Zap, Copy, Check, ArrowDown, FolderInput, Search, PenLine, Lightbulb, FileText, Paperclip } from 'lucide-react';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import type { Message, ImagePart } from '@/lib/types';
@@ -35,10 +35,17 @@ function CopyMessageButton({ text, label }: { text: string; label?: string }) {
   );
 }
 
-function UserMessageContent({ content, skillName, images }: { content: string; skillName?: string; images?: ImagePart[] }) {
+function UserMessageContent({ content, skillName, images, attachedFiles, uploadedFileNames }: { content: string; skillName?: string; images?: ImagePart[]; attachedFiles?: string[]; uploadedFileNames?: string[] }) {
   const resolved = skillName ?? content.match(SKILL_PREFIX_RE)?.[1];
   const prefixMatch = content.match(SKILL_PREFIX_RE);
   const rest = prefixMatch ? content.slice(prefixMatch[0].length) : content;
+
+  // Deduplicate: uploaded files already shown shouldn't repeat as attached
+  const uploadedSet = new Set(uploadedFileNames ?? []);
+  const dedupedAttached = attachedFiles?.filter(fp => !uploadedSet.has(fp.split('/').pop() ?? fp));
+  const hasContext = (dedupedAttached && dedupedAttached.length > 0)
+    || (uploadedFileNames && uploadedFileNames.length > 0);
+
   return (
     <>
       {/* Images */}
@@ -68,6 +75,33 @@ function UserMessageContent({ content, skillName, images }: { content: string; s
         </span>
       )}
       {resolved ? rest : content}
+      {/* File context chips */}
+      {hasContext && (
+        <div className="mt-2 pt-1.5 border-t border-white/15 flex flex-wrap gap-1 whitespace-normal" role="list" aria-label="Attached files">
+          {dedupedAttached?.map(fp => (
+            <span
+              key={fp}
+              role="listitem"
+              className="inline-flex items-center gap-1 px-1.5 py-0.5 rounded text-[10px] bg-white/10 text-white/80 min-w-0"
+              title={fp}
+            >
+              <FileText size={9} className="shrink-0 opacity-70" />
+              <span className="truncate max-w-[120px]">{fp.split('/').pop()}</span>
+            </span>
+          ))}
+          {uploadedFileNames?.map(name => (
+            <span
+              key={name}
+              role="listitem"
+              className="inline-flex items-center gap-1 px-1.5 py-0.5 rounded text-[10px] bg-white/10 text-white/80 min-w-0"
+              title={name}
+            >
+              <Paperclip size={9} className="shrink-0 opacity-70" />
+              <span className="truncate max-w-[120px]">{name}</span>
+            </span>
+          ))}
+        </div>
+      )}
     </>
   );
 }
@@ -253,7 +287,7 @@ export default memo(function MessageList({
             <div
               className="max-w-[85%] px-3.5 py-2.5 rounded-2xl rounded-br-lg text-sm leading-relaxed whitespace-pre-wrap bg-[var(--amber)] text-[var(--amber-foreground)] shadow-sm shadow-[var(--amber)]/10"
             >
-              <UserMessageContent content={m.content} skillName={m.skillName} images={m.images} />
+              <UserMessageContent content={m.content} skillName={m.skillName} images={m.images} attachedFiles={m.attachedFiles} uploadedFileNames={m.uploadedFileNames} />
             </div>
           ) : m.content.startsWith('__error__') ? (
             <div className="max-w-[85%] px-3.5 py-3 rounded-2xl rounded-bl-md border border-error/30 bg-error/10 text-sm shadow-sm">