@geminilight/mindos 0.6.61 → 0.6.65

package/_standalone/components/shared/ProviderSelect.tsx

@@ -1,55 +1,84 @@
 'use client';
 
 import { useState } from 'react';
-import { CheckCircle2, ChevronDown, SkipForward } from 'lucide-react';
-import { type ProviderId, PROVIDER_PRESETS, groupedProviders } from '@/lib/agent/providers';
+import { CheckCircle2, ChevronDown, SkipForward, Plus } from 'lucide-react';
+import { type ProviderId, PROVIDER_PRESETS, groupedProviders, ALL_PROVIDER_IDS } from '@/lib/agent/providers';
+import { type Provider } from '@/lib/custom-endpoints';
 import { useLocale } from '@/lib/stores/locale-store';
 
 interface ProviderSelectProps {
-  value: ProviderId | 'skip';
-  onChange: (id: ProviderId | 'skip') => void;
+  value: string | 'skip';
+  onChange: (id: string | 'skip') => void;
   showSkip?: boolean;
   compact?: boolean;
+  /** @deprecated Use customProviders (unified Provider[]) instead */
   configuredProviders?: Set<ProviderId>;
+  customProviders?: Provider[];
+  onAdd?: () => void;
 }
 
 export default function ProviderSelect({
   value, onChange, showSkip = false, compact = false, configuredProviders,
+  customProviders, onAdd,
 }: ProviderSelectProps) {
   const { locale } = useLocale();
   const [showMore, setShowMore] = useState(false);
   const groups = groupedProviders();
 
-  const renderItem = (id: ProviderId) => {
+  const hasConfigured = configuredProviders && configuredProviders.size > 0;
+  const hasCustom = customProviders && customProviders.length > 0;
+
+  // In compact settings mode: show provider list + Add button
+  // New model: customProviders IS the full list (unified Provider[])
+  // Legacy model: configuredProviders set + separate customProviders array
+  const useConfiguredMode = compact && (hasConfigured || hasCustom) && !showSkip;
+
+  // Legacy: Sorted configured provider IDs (for backward compat with old callers)
+  const configuredIds = hasConfigured
+    ? ALL_PROVIDER_IDS.filter(id => configuredProviders!.has(id))
+    : [];
+
+  // Add panel shows ALL providers as protocol templates (can add multiple of the same type)
+  const { primary: primaryItems, more: moreItems } = groups;
+
+  /* ── Compact tab button (for legacy builtin-only mode) ── */
+  const renderCompactTab = (id: ProviderId) => {
     const preset = PROVIDER_PRESETS[id];
     const displayName = locale === 'zh' ? preset.nameZh : preset.name;
     const isSelected = value === id;
     const isConfigured = configuredProviders?.has(id);
 
-    if (compact) {
-      return (
-        <button
-          key={id}
-          type="button"
-          onClick={() => onChange(id)}
-          className={`flex items-center gap-2 px-3 py-2 rounded-lg border text-left transition-all text-sm ${
-            isSelected
-              ? 'border-[var(--amber)] bg-[var(--amber-subtle)] shadow-sm'
-              : 'border-border/50 hover:border-border hover:bg-muted/30'
-          }`}
-        >
-          <span className={`font-medium ${isSelected ? 'text-foreground' : 'text-muted-foreground'}`}>
-            {displayName}
-          </span>
-          {isConfigured && !isSelected && (
-            <CheckCircle2 size={12} className="text-success ml-auto shrink-0" />
-          )}
-          {isSelected && (
-            <CheckCircle2 size={14} className="ml-auto shrink-0" style={{ color: 'var(--amber)' }} />
-          )}
-        </button>
-      );
-    }
+    return (
+      <button
+        key={id}
+        type="button"
+        onClick={() => onChange(id)}
+        className={`flex items-center gap-2 px-3 py-2 rounded-lg border text-left transition-all text-sm ${
+          isSelected
+            ? 'border-[var(--amber)] bg-[var(--amber-subtle)] shadow-sm'
+            : 'border-border/50 hover:border-border hover:bg-muted/30'
+        }`}
+      >
+        <span className={`font-medium ${isSelected ? 'text-foreground' : 'text-muted-foreground'}`}>
+          {displayName}
+        </span>
+        {isConfigured && !isSelected && (
+          <CheckCircle2 size={12} className="text-success ml-auto shrink-0" />
+        )}
+        {isSelected && (
+          <CheckCircle2 size={14} className="ml-auto shrink-0" style={{ color: 'var(--amber)' }} />
+        )}
+      </button>
+    );
+  };
+
+  /* ── Full card button (used in setup wizard / non-compact) ── */
+  const renderCard = (id: ProviderId) => {
+    const preset = PROVIDER_PRESETS[id];
+    const displayName = locale === 'zh' ? preset.nameZh : preset.name;
+    const description = locale === 'zh' ? preset.descriptionZh : preset.description;
+    const isSelected = value === id;
+    const isConfigured = configuredProviders?.has(id);
 
     return (
       <button
@@ -64,7 +93,10 @@ export default function ProviderSelect({
       >
         <div className="flex-1 min-w-0">
           <p className="text-sm font-medium" style={{ color: 'var(--foreground)' }}>{displayName}</p>
-          <p className="text-xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>
+          {description && (
+            <p className="text-xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>{description}</p>
+          )}
+          <p className={`text-xs ${description ? 'mt-1' : 'mt-0.5'}`} style={{ color: 'var(--muted-foreground)' }}>
             {preset.defaultModel}
           </p>
         </div>
@@ -78,16 +110,71 @@ export default function ProviderSelect({
     );
   };
 
-  const { primary: primaryItems, more: moreItems } = groups;
+  /* ════════════════════════════════════════════
+   *  MODE 1: Provider list + Add button
+   *  (compact settings, has providers)
+   * ════════════════════════════════════════════ */
+  if (useConfiguredMode) {
+    return (
+      <div className="space-y-2">
+        {/* Providers row */}
+        <div className="flex flex-wrap gap-2">
+          {/* Legacy: built-in configured providers */}
+          {configuredIds.map(id => renderCompactTab(id))}
+
+          {/* Unified provider list (or legacy custom providers) */}
+          {customProviders?.map(cp => {
+            const isSelected = value === cp.id;
+            return (
+              <button
+                key={cp.id}
+                type="button"
+                onClick={() => onChange(cp.id)}
+                className={`flex items-center gap-2 px-3 py-2 rounded-lg border text-left transition-all text-sm ${
+                  isSelected
+                    ? 'border-[var(--amber)] bg-[var(--amber-subtle)] shadow-sm'
+                    : 'border-border/50 hover:border-border hover:bg-muted/30'
+                }`}
+              >
+                <span className={`font-medium ${isSelected ? 'text-foreground' : 'text-muted-foreground'}`}>
+                  {cp.name}
+                </span>
+                {isSelected && (
+                  <CheckCircle2 size={14} className="ml-auto shrink-0" style={{ color: 'var(--amber)' }} />
+                )}
+              </button>
+            );
+          })}
+
+          {/* Add button — opens form directly */}
+          {onAdd && (
+            <button
+              type="button"
+              onClick={onAdd}
+              className="flex items-center gap-1.5 px-3 py-2 rounded-lg border border-dashed border-border/50 text-sm text-muted-foreground hover:border-border hover:text-foreground transition-all"
+            >
+              <Plus size={14} />
+              <span>{locale === 'zh' ? '添加' : 'Add'}</span>
+            </button>
+          )}
+        </div>
+      </div>
+    );
+  }
+
+  /* ════════════════════════════════════════════
+   *  MODE 2: Full list (setup wizard / no configured providers)
+   *  Original behavior preserved
+   * ════════════════════════════════════════════ */
 
   return (
     <div className="space-y-2">
-      {/* Primary providers — always visible */}
+      {/* Primary providers */}
       <div className={compact ? 'flex flex-wrap gap-2' : 'grid grid-cols-1 gap-2'}>
-        {primaryItems.map(renderItem)}
+        {primaryItems.map(id => compact ? renderCompactTab(id) : renderCard(id))}
       </div>
 
-      {/* Show more toggle */}
+      {/* More toggle */}
       {moreItems.length > 0 && (
         <>
           <button
@@ -98,12 +185,14 @@ export default function ProviderSelect({
             <ChevronDown size={12} className={`transition-transform ${showMore ? 'rotate-180' : ''}`} />
             {showMore
               ? (locale === 'zh' ? '收起' : 'Show less')
-              : (locale === 'zh' ? `更多 (${moreItems.length})` : `More providers (${moreItems.length})`)}
+              : (locale === 'zh'
+                  ? `更多 (${moreItems.length})`
+                  : `More (${moreItems.length})`)}
           </button>
 
           {showMore && (
             <div className={compact ? 'flex flex-wrap gap-2' : 'grid grid-cols-1 gap-2'}>
-              {moreItems.map(renderItem)}
+              {moreItems.map(id => compact ? renderCompactTab(id) : renderCard(id))}
             </div>
           )}
         </>
@@ -129,6 +218,7 @@ export default function ProviderSelect({
           )}
         </button>
       )}
+
     </div>
   );
 }

package/_standalone/hooks/useAskChat.ts

@@ -28,21 +28,25 @@ export interface AskChatRefs {
 interface UseAskChatOpts {
   currentFile?: string;
   chatMode: AskMode;
-  providerOverride: ProviderId | null;
+  providerOverride: ProviderId | `p_${string}` | null;
+  modelOverride: string | null;
   onFirstMessage?: () => void;
   refs: AskChatRefs;
   errorLabels: { noResponse: string; stopped: string };
   resetInputState: () => void;
+  onRestoreInput?: (userMessage: Message) => void;
 }
 
 export function useAskChat({
   currentFile,
   chatMode,
   providerOverride,
+  modelOverride,
   onFirstMessage,
   refs,
   errorLabels,
   resetInputState,
+  onRestoreInput,
 }: UseAskChatOpts) {
   const [isLoading, setIsLoading] = useState(false);
   const [loadingPhase, setLoadingPhase] = useState<LoadingPhase>('connecting');
@@ -51,10 +55,68 @@ export function useAskChat({
   const abortRef = useRef<AbortController | null>(null);
   const firstMessageFired = useRef(false);
 
-  const stop = useCallback(() => { abortRef.current?.abort(); }, []);
+  // Cooldown guard: after stop+retract, briefly block re-submission so that
+  // the mouseup on the stop-button position doesn't accidentally trigger the
+  // send button that React swaps in at the same DOM position.
+  const submitCooldownRef = useRef(false);
+
+  // Track the pending user message so we can retract it on stop.
+  // `userMessageIndex` is the index of the *user* message inside the messages
+  // array (the assistant placeholder sits at userMessageIndex + 1).
+  const pendingMessageRef = useRef<{
+    userMessageIndex: number;
+    userMessage: Message;
+  } | null>(null);
+
+  // When true the AbortError handler in submit() skips its own setMessages
+  // because stop() already cleaned up the messages array.
+  const retractedRef = useRef(false);
+
+  const stop = useCallback(() => {
+    const pending = pendingMessageRef.current;
+
+    // Abort the fetch first.
+    abortRef.current?.abort();
+
+    if (pending) {
+      retractedRef.current = true;
+
+      // Always remove the user message + assistant response (empty or partial)
+      // from the messages array. The user clicked stop — they don't want this
+      // exchange in the history at all.
+      refs.sessionRef.current?.setMessages(prev => {
+        const updated = [...prev];
+        const idx = pending.userMessageIndex;
+
+        // Remove assistant message first (at idx + 1) — may be empty placeholder
+        // or a partial streamed response.
+        if (idx + 1 < updated.length && updated[idx + 1]?.role === 'assistant') {
+          updated.splice(idx + 1, 1);
+        }
+
+        // Remove the user message.
+        if (idx < updated.length && updated[idx]?.role === 'user') {
+          updated.splice(idx, 1);
+        }
+
+        return updated;
+      });
+
+      // Restore text (+ attachments) back into the input box.
+      onRestoreInput?.(pending.userMessage);
+
+      pendingMessageRef.current = null;
+
+      // Block re-submission for a short window so the browser's mouseup
+      // doesn't hit the send button that replaces the stop button.
+      submitCooldownRef.current = true;
+      setTimeout(() => { submitCooldownRef.current = false; }, 300);
+    }
+  }, [refs, onRestoreInput]);
 
   const submit = useCallback(async (e: React.FormEvent) => {
     e.preventDefault();
+    if (submitCooldownRef.current) return; // ignore accidental re-submit after stop
     const m = refs.mentionRef.current;
     const s = refs.slashRef.current;
     const img = refs.imageUploadRef.current;
@@ -68,15 +130,33 @@ export function useAskChat({
     const skill = refs.selectedSkillRef.current;
     const acpAgent = refs.selectedAcpAgentRef.current;
     const pendingImages = img.images.length > 0 ? [...img.images] : undefined;
+    // Only store explicitly user-chosen files (filter out auto-included currentFile)
+    const explicitAttached = refs.attachedFilesRef.current.filter(f => f !== currentFile);
+    const pendingAttachedFiles = explicitAttached.length > 0 ? explicitAttached : undefined;
+    const pendingUploadedNames = upl.localAttachments
+      .filter(f => f.status !== 'loading')
+      .map(f => f.name);
     const userMsg: Message = {
       role: 'user',
       content: text,
       timestamp: Date.now(),
       ...(skill && { skillName: skill.name }),
       ...(pendingImages && { images: pendingImages }),
+      ...(pendingAttachedFiles && { attachedFiles: pendingAttachedFiles }),
+      ...(pendingUploadedNames.length > 0 && { uploadedFileNames: pendingUploadedNames }),
     };
     img.clearImages();
     const requestMessages = [...sess.messages, userMsg];
+
+    // Track the user message index for potential retraction on stop.
+    // The user message is at requestMessages.length - 1; the assistant
+    // placeholder we're about to insert will be at requestMessages.length.
+    pendingMessageRef.current = {
+      userMessageIndex: requestMessages.length - 1,
+      userMessage: userMsg,
+    };
+    retractedRef.current = false;
+
     sess.setMessages([...requestMessages, { role: 'assistant', content: '', timestamp: Date.now() }]);
 
     resetInputState();
@@ -114,6 +194,7 @@ export function useAskChat({
       selectedAcpAgent: acpAgent,
       mode: chatMode,
       providerOverride: providerOverride ?? undefined,
+      modelOverride: modelOverride ?? undefined,
     });
 
     const doFetch = async (): Promise<{ finalMessage: Message }> => {
@@ -187,6 +268,8 @@ export function useAskChat({
               return updated;
             });
           }
+          // Successfully received response — no longer retractable.
+          pendingMessageRef.current = null;
           return;
         } catch (err) {
           lastError = err instanceof Error ? err : new Error(String(err));
@@ -198,18 +281,21 @@ export function useAskChat({
       if (lastError) throw lastError;
     } catch (err) {
       if ((err as Error).name === 'AbortError') {
-        refs.sessionRef.current?.setMessages(prev => {
-          const updated = [...prev];
-          const lastIdx = updated.length - 1;
-          if (lastIdx >= 0 && updated[lastIdx].role === 'assistant') {
-            const last = updated[lastIdx];
-            const hasContent = last.content.trim() || (last.parts && last.parts.length > 0);
-            if (!hasContent) {
-              updated[lastIdx] = { role: 'assistant', content: `__error__${errorLabels.stopped}` };
+        // If stop() already retracted the messages, skip writing __error__stopped.
+        if (!retractedRef.current) {
+          refs.sessionRef.current?.setMessages(prev => {
+            const updated = [...prev];
+            const lastIdx = updated.length - 1;
+            if (lastIdx >= 0 && updated[lastIdx].role === 'assistant') {
+              const last = updated[lastIdx];
+              const hasContent = last.content.trim() || (last.parts && last.parts.length > 0);
+              if (!hasContent) {
+                updated[lastIdx] = { role: 'assistant', content: `__error__${errorLabels.stopped}` };
+              }
             }
-          }
-          return updated;
-        });
+            return updated;
+          });
+        }
       } else {
         const errMsg = err instanceof Error ? err.message : 'Something went wrong';
         refs.sessionRef.current?.setMessages(prev => {
@@ -230,6 +316,7 @@ export function useAskChat({
       setIsLoading(false);
       setReconnectAttempt(0);
       abortRef.current = null;
+      pendingMessageRef.current = null;
     }
   }, [currentFile, chatMode, providerOverride, errorLabels.noResponse, errorLabels.stopped, onFirstMessage, refs, resetInputState]);
 

package/_standalone/hooks/useAskPanel.ts

@@ -33,6 +33,8 @@ export function useAskPanel(): AskPanelState {
   const [desktopAskPopupOpen, setDesktopAskPopupOpen] = useState(false);
   const [askInitialMessage, setAskInitialMessage] = useState('');
   const [askMaximized, setAskMaximized] = useState(false);
+  const askMaximizedRef = useRef(false);
+  askMaximizedRef.current = askMaximized;
   const [askOpenSource, setAskOpenSource] = useState<'user' | 'guide' | 'guide-next'>('user');
   const [askAcpAgent, setAskAcpAgent] = useState<AcpAgentSelection | null>(null);
   const prevWidthRef = useRef(RIGHT_ASK_DEFAULT_WIDTH);
@@ -60,7 +62,21 @@ export function useAskPanel(): AskPanelState {
       }
     };
     window.addEventListener('storage', onStorage);
-    return () => window.removeEventListener('storage', onStorage);
+
+    // Listen for "dock to panel" from home page fullscreen
+    const onOpenPanel = () => {
+      setAskPanelOpen(true);
+      if (askMaximizedRef.current) {
+        setAskMaximized(false);
+        setAskPanelWidth(prevWidthRef.current);
+      }
+    };
+    window.addEventListener('mindos:open-ask-panel', onOpenPanel);
+
+    return () => {
+      window.removeEventListener('storage', onStorage);
+      window.removeEventListener('mindos:open-ask-panel', onOpenPanel);
+    };
   }, []);
 
   // Bridge useAskModal store → right Ask panel or popup

package/_standalone/lib/settings-ai-client.ts

@@ -2,26 +2,35 @@
  * Client-side mirror of "can /api/ask run?" using GET /api/settings payload.
  * Must stay aligned with server `effectiveAiConfig()` provider + key resolution.
  */
-import { type ProviderId, PROVIDER_PRESETS, isProviderId, getApiKeyEnvVar } from './agent/providers';
+import { PROVIDER_PRESETS, isProviderId, getApiKeyEnvVar } from './agent/providers';
+import { type Provider } from './custom-endpoints';
 
 export type SettingsJsonForAi = {
   ai?: {
-    provider?: string;
-    providers?: Partial<Record<string, { apiKey?: string }>>;
+    activeProvider?: string;
+    providers?: Provider[];
   };
   envOverrides?: Partial<Record<string, boolean>>;
 };
 
 export function isAiConfiguredForAsk(data: SettingsJsonForAi): boolean {
-  const provId = data.ai?.provider;
-  const provider: ProviderId = (provId && isProviderId(provId)) ? provId : 'anthropic';
+  const providers = data.ai?.providers ?? [];
+  const activeId = data.ai?.activeProvider;
   const env = data.envOverrides ?? {};
 
-  const k = data.ai?.providers?.[provider]?.apiKey;
-  if (typeof k === 'string' && k.length > 0) return true;
+  const current = activeId ? providers.find(p => p.id === activeId) : providers[0];
+  if (!current) return false;
 
-  const envVar = getApiKeyEnvVar(provider);
+  // Has API key directly
+  if (current.apiKey && current.apiKey.length > 0) return true;
+
+  // Has env var override
+  const envVar = isProviderId(current.protocol) ? getApiKeyEnvVar(current.protocol) : undefined;
   if (envVar && env[envVar]) return true;
 
+  // Has fallback key (e.g. Ollama)
+  const preset = isProviderId(current.protocol) ? PROVIDER_PRESETS[current.protocol] : undefined;
+  if (preset?.apiKeyFallback) return true;
+
   return false;
 }