@geminilight/mindos 0.6.61 → 0.6.65

package/app/components/agents/AgentsSkillsSection.tsx

@@ -209,8 +209,8 @@ export default function AgentsSkillsSection({
       {/* Header */}
       <div className="flex items-center justify-between gap-3">
         <h2 className="text-sm font-semibold text-foreground flex items-center gap-2">
-          <div className="w-6 h-6 rounded-md bg-muted/50 flex items-center justify-center">
-            <Zap size={13} className="text-muted-foreground/70" aria-hidden="true" />
+          <div className="w-6 h-6 rounded-md bg-[var(--amber-subtle)] flex items-center justify-center">
+            <Zap size={13} className="text-[var(--amber)]" aria-hidden="true" />
           </div>
           {copy.title}
         </h2>

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';
@@ -18,7 +18,7 @@ import SessionHistory from '@/components/ask/SessionHistory';
 import AskHeader from '@/components/ask/AskHeader';
 import FileChip from '@/components/ask/FileChip';
 import AgentSelectorCapsule from '@/components/ask/AgentSelectorCapsule';
-import ProviderModelCapsule, { getPersistedProvider } from '@/components/ask/ProviderModelCapsule';
+import ProviderModelCapsule, { getPersistedProviderModel } from '@/components/ask/ProviderModelCapsule';
 import type { ProviderId } from '@/lib/agent/providers';
 import { useAskChat } from '@/hooks/useAskChat';
 import { cn } from '@/lib/utils';
@@ -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,11 +105,14 @@ 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 | null>(null);
+  const [providerOverride, setProviderOverride] = useState<ProviderId | `p_${string}` | null>(null);
+  const [modelOverride, setModelOverride] = useState<string | null>(null);
 
   useEffect(() => {
     setChatMode(getPersistedMode());
-    setProviderOverride(getPersistedProvider());
+    const persisted = getPersistedProviderModel();
+    setProviderOverride(persisted.provider);
+    setModelOverride(persisted.model);
   }, []);
 
   const session = useAskSession(currentFile);
@@ -133,17 +138,42 @@ 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({
     currentFile,
     chatMode,
     providerOverride,
+    modelOverride,
     onFirstMessage,
     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;
@@ -478,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}
@@ -491,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}
@@ -518,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 && (
@@ -569,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',
@@ -617,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">
@@ -686,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 ? (
@@ -701,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
@@ -714,19 +746,26 @@ export default function AskContent({ visible, currentFile, initialMessage, initi
             )}
             {mounted && (
               <ProviderModelCapsule
-                value={providerOverride}
-                onChange={setProviderOverride}
+                providerValue={providerOverride}
+                onProviderChange={(p) => {
+                  setProviderOverride(p);
+                  setModelOverride(null);
+                }}
+                modelValue={modelOverride}
+                onModelChange={setModelOverride}
                 disabled={isLoading}
               />
             )}
             </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">