@geminilight/mindos 0.6.57 → 0.6.59

package/app/app/api/agents/custom/route.ts

@@ -49,6 +49,7 @@ export async function POST(req: NextRequest) {
       ...(overrides.presenceDirs && { presenceDirs: overrides.presenceDirs }),
       ...(overrides.presenceCli && { presenceCli: overrides.presenceCli }),
       ...(overrides.globalNestedKey && { globalNestedKey: overrides.globalNestedKey }),
+      ...(overrides.skillDir && { skillDir: overrides.skillDir }),
     };
 
     customs.push(agent);
@@ -106,6 +107,7 @@ export async function PUT(req: NextRequest) {
       ...(updates.preferredTransport && { preferredTransport: updates.preferredTransport }),
       ...(updates.presenceCli !== undefined && { presenceCli: updates.presenceCli || undefined }),
       ...(updates.globalNestedKey !== undefined && { globalNestedKey: updates.globalNestedKey || undefined }),
+      ...(updates.skillDir !== undefined && { skillDir: updates.skillDir || undefined }),
     };
 
     // Update presenceDirs: explicit override takes priority, then baseDir-derived default
@@ -115,6 +117,12 @@ export async function PUT(req: NextRequest) {
       updated.presenceDirs = [updates.baseDir.endsWith('/') ? updates.baseDir : updates.baseDir + '/'];
     }
 
+    // Update skillDir default when baseDir changes and no explicit skillDir
+    if (!updates.skillDir && updates.baseDir) {
+      const bd = updates.baseDir.endsWith('/') ? updates.baseDir : updates.baseDir + '/';
+      updated.skillDir = bd + 'skills/';
+    }
+
     customs[idx] = updated;
     saveCustomAgents(customs);
 

package/app/app/api/ask/route.ts

@@ -405,6 +405,143 @@ function toPiCustomToolDefinitions(tools: AgentTool<any>[]): ToolDefinition<any,
 // Non-streaming fallback for proxies that don't support stream + tools
 // ---------------------------------------------------------------------------
 
+/**
+ * Reassemble SSE chunks (from proxies that ignore stream:false) into a
+ * single OpenAI-style chat completion response.
+ *
+ * SSE format:  data: {"choices":[{"delta":{"content":"He"}}]}
+ * Output:      {"choices":[{"message":{"role":"assistant","content":"Hello!"},"finish_reason":"stop"}]}
+ */
+function reassembleSSE(sseText: string): any {
+  const lines = sseText.split('\n');
+  let content = '';
+  let role = 'assistant';
+  let finishReason = 'stop';
+  const toolCalls: Map<number, { id: string; type: string; function: { name: string; arguments: string } }> = new Map();
+
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed.startsWith('data:')) continue;
+    const payload = trimmed.slice(5).trim();
+    if (payload === '[DONE]') break;
+
+    let chunk: any;
+    try {
+      chunk = JSON.parse(payload);
+    } catch {
+      continue; // skip unparseable lines
+    }
+
+    const delta = chunk?.choices?.[0]?.delta;
+    if (!delta) continue;
+
+    if (delta.role) role = delta.role;
+    if (delta.content) content += delta.content;
+    if (chunk.choices[0].finish_reason) finishReason = chunk.choices[0].finish_reason;
+
+    // Accumulate tool calls (they arrive in incremental deltas)
+    if (delta.tool_calls) {
+      for (const tc of delta.tool_calls) {
+        const idx = tc.index ?? 0;
+        const existing = toolCalls.get(idx);
+        if (!existing) {
+          toolCalls.set(idx, {
+            id: tc.id ?? '',
+            type: tc.type ?? 'function',
+            function: {
+              name: tc.function?.name ?? '',
+              arguments: tc.function?.arguments ?? '',
+            },
+          });
+        } else {
+          if (tc.id) existing.id = tc.id;
+          if (tc.function?.name) existing.function.name += tc.function.name;
+          if (tc.function?.arguments) existing.function.arguments += tc.function.arguments;
+        }
+      }
+    }
+  }
+
+  const message: any = { role, content: content || null };
+  if (toolCalls.size > 0) {
+    message.tool_calls = Array.from(toolCalls.values());
+  }
+
+  return {
+    choices: [{ message, finish_reason: finishReason }],
+  };
+}
+
+/**
+ * Convert pi-ai format messages to OpenAI API format.
+ * pi-ai messages have nested structures; OpenAI format is flatter with tool_calls array.
+ */
+function piMessagesToOpenAI(piMessages: any[]): any[] {
+  return piMessages.map(msg => {
+    const role = msg.role;
+
+    // Skip system role (will be added separately)
+    if (role === 'system') return null;
+
+    // Pass through user messages (simple string content)
+    if (role === 'user') {
+      return {
+        role: 'user',
+        content: typeof msg.content === 'string' ? msg.content : msg.content,
+      };
+    }
+
+    // Assistant messages: flatten content array into text + tool_calls
+    if (role === 'assistant') {
+      const content = msg.content;
+      let textContent = '';
+      const toolCalls: any[] = [];
+
+      if (Array.isArray(content)) {
+        for (const part of content) {
+          if (part.type === 'text' && part.text) {
+            textContent += part.text;
+          } else if (part.type === 'toolCall') {
+            toolCalls.push({
+              id: part.id ?? `call_${Date.now()}`,
+              type: 'function',
+              function: {
+                name: part.name ?? 'unknown',
+                arguments: JSON.stringify(part.arguments ?? {}),
+              },
+            });
+          }
+        }
+      }
+
+      const result: any = { role: 'assistant' };
+      // Always include content (even if empty) for tool-call-only messages
+      // OpenAI API may handle this differently, but it's safer to include empty string
+      result.content = textContent || '';
+      if (toolCalls.length > 0) result.tool_calls = toolCalls;
+      return result;
+    }
+
+    // Tool result messages
+    if (role === 'toolResult') {
+      const contentText = Array.isArray(msg.content)
+        ? msg.content
+            .filter((c: any) => c.type === 'text')
+            .map((c: any) => c.text ?? '')
+            .join('\n')
+        : String(msg.content ?? '');
+
+      return {
+        role: 'tool',
+        tool_call_id: msg.toolCallId ?? 'unknown',
+        content: contentText,
+      };
+    }
+
+    return null;
+  }).filter(Boolean);
+}
+
 /**
  * Mini agent loop using non-streaming OpenAI-compatible API.
  * Used when a proxy silently breaks stream+tools by returning plain text.
@@ -415,7 +552,7 @@ async function runNonStreamingFallback(opts: {
   apiKey: string;
   model: string;
   systemPrompt: string;
-  historyMessages: { role: string; content: unknown }[];
+  historyMessages: any[];
   userContent: string;
   tools: AgentTool<any>[];
   send: (event: MindOSSSEvent) => void;
@@ -433,9 +570,12 @@ async function runNonStreamingFallback(opts: {
     },
   }));
 
-  const messages: { role: string; content: unknown; tool_calls?: unknown; tool_call_id?: string }[] = [
+  // Convert pi-ai format messages to OpenAI format
+  const openaiMessages = piMessagesToOpenAI(historyMessages);
+
+  const messages: { role: string; content?: unknown; tool_calls?: unknown; tool_call_id?: string }[] = [
     { role: 'system', content: systemPrompt },
-    ...historyMessages,
+    ...openaiMessages,
     { role: 'user', content: userContent },
   ];
 
@@ -447,6 +587,9 @@ async function runNonStreamingFallback(opts: {
     if (signal.aborted) throw new Error('Request aborted');
     step++;
 
+    // Use stream:true and parse SSE ourselves.
+    // Many proxies ignore stream:false (returning SSE with empty choices or broken JSON).
+    // Using stream:true is the most universally compatible approach.
     const resp = await fetch(endpoint, {
       method: 'POST',
       headers: {
@@ -458,7 +601,7 @@ async function runNonStreamingFallback(opts: {
         messages,
         tools: openaiTools.length > 0 ? openaiTools : undefined,
         tool_choice: openaiTools.length > 0 ? 'auto' : undefined,
-        stream: false,
+        stream: true,
       }),
       signal,
     });
@@ -468,11 +611,28 @@ async function runNonStreamingFallback(opts: {
       throw new Error(`Non-streaming API error ${resp.status}: ${errText.slice(0, 200)}`);
     }
 
-    const data = await resp.json() as any;
+    // Read the full response body (SSE or JSON)
+    const rawText = await resp.text();
+    const trimmed = rawText.trimStart();
+
+    let data: any;
+    if (trimmed.startsWith('data:')) {
+      // Response is SSE — reassemble chunks into a single OpenAI response
+      data = reassembleSSE(trimmed);
+    } else {
+      // Some endpoints might still return plain JSON even with stream:true
+      try {
+        data = JSON.parse(rawText);
+      } catch {
+        throw new Error(`API returned invalid response: ${rawText.slice(0, 200)}`);
+      }
+    }
+
     const choice = data?.choices?.[0];
     if (!choice) throw new Error('Empty response from API');
 
-    const msg = choice.message;
+    // reassembleSSE always produces .message; standard JSON may use .message or .delta
+    const msg = choice.message ?? choice.delta ?? {};
     const finishReason: string = choice.finish_reason ?? 'stop';
 
     // Emit text content in chunks to simulate streaming appearance
@@ -1185,11 +1345,12 @@ export async function POST(req: NextRequest) {
             if (lastPromptError) throw lastPromptError;
 
             metrics.recordRequest(Date.now() - requestStartTime);
-            if (!hasContent && lastModelError) {
-              // No content received — check if this looks like a proxy stream+tools incompatibility.
-              // Only attempt fallback for OpenAI-compatible endpoints with a custom baseUrl.
+            if (!hasContent && (lastModelError || (baseUrl && provider === 'openai'))) {
+              // No content received — either a model error or proxy compatibility issue.
+              // For OpenAI-compatible endpoints with custom baseUrl, always try the fallback
+              // even without an explicit error (some proxies silently return empty responses).
               if (baseUrl && provider === 'openai') {
-                send({ type: 'status', message: t.proxyCompatDetecting });
+                send({ type: 'status', message: lastModelError ? t.proxyCompatDetecting : t.proxyCompatMode });
                 try {
                   await runNonStreamingFallback({
                     baseUrl,

package/app/app/api/mcp/agents/route.ts

@@ -14,7 +14,7 @@ import {
   detectAgentInstalledSkills,
   resolveSkillWorkspaceProfile,
 } from '@/lib/mcp-agents';
-import { getAllAgents, loadCustomAgents } from '@/lib/custom-agents';
+import { getAllAgents, loadCustomAgents, scanCustomAgentSkills } from '@/lib/custom-agents';
 import { readSettings } from '@/lib/settings';
 import { scanSkillDirs } from '@/lib/pi-integration/skills';
 import { getMindRoot } from '@/lib/fs';
@@ -105,7 +105,9 @@ export async function GET() {
         status = detectInstalled(key);
       }
 
-      const skillProfile = resolveSkillWorkspaceProfile(key);
+      const skillProfile = isCustom
+        ? { mode: 'additional' as const, skillAgentName: key, workspacePath: expandHome(customByKey[key]?.skillDir || agent.presenceDirs?.[0] + 'skills/') }
+        : resolveSkillWorkspaceProfile(key);
       const runtime = isCustom
         ? { hiddenRootPath: '', hiddenRootPresent: false, conversationSignal: false, usageSignal: false, lastActivityAt: undefined }
         : detectAgentRuntimeSignals(key);
@@ -113,7 +115,7 @@ export async function GET() {
         ? { servers: [] as string[], sources: [] as string[] }
         : detectAgentConfiguredMcpServers(key);
       const installedSkills = isCustom
-        ? { skills: [] as string[], sourcePath: '' }
+        ? scanCustomAgentSkills(customByKey[key])
         : detectAgentInstalledSkills(key);
 
       return {

package/app/app/api/settings/route.ts

@@ -124,6 +124,15 @@ export async function POST(req: NextRequest) {
     };
 
     writeSettings(next);
+    // Clear proxy compat cache when AI config changes — stale cache causes
+    // the non-streaming fallback to be used even when streaming would work.
+    if (JSON.stringify(next.ai) !== JSON.stringify(current.ai)) {
+      const { readSettings: rs, writeSettings: ws } = await import('@/lib/settings');
+      const s = rs();
+      if (s.baseUrlCompat && Object.keys(s.baseUrlCompat).length > 0) {
+        ws({ ...s, baseUrlCompat: {} });
+      }
+    }
     if (next.mindRoot !== current.mindRoot) invalidateCache();
     return NextResponse.json({ ok: true });
   } catch (err) {

package/app/app/api/settings/test-key/route.ts

@@ -1,7 +1,7 @@
 export const dynamic = 'force-dynamic';
 import { NextRequest, NextResponse } from 'next/server';
 import { complete } from '@mariozechner/pi-ai';
-import { effectiveAiConfig } from '@/lib/settings';
+import { effectiveAiConfig, readBaseUrlCompat, writeSettings, readSettings } from '@/lib/settings';
 import { getModelConfig } from '@/lib/agent/model';
 import { type ProviderId, isProviderId } from '@/lib/agent/providers';
 
@@ -84,6 +84,18 @@ export async function POST(req: NextRequest) {
         signal: ctrl.signal,
       });
 
+      // Clear stale proxy compat cache for this baseUrl on successful test.
+      // Prevents stale 'non-streaming' cache from forcing the fallback path.
+      if (baseUrl) {
+        const compat = readBaseUrlCompat();
+        if (compat[baseUrl]) {
+          const s = readSettings();
+          const updated = { ...(s.baseUrlCompat ?? {}) };
+          delete updated[baseUrl];
+          writeSettings({ ...s, baseUrlCompat: updated });
+        }
+      }
+
       return NextResponse.json({ ok: true, latency: Date.now() - start });
     } catch (e) {
       return NextResponse.json({ ok: false, ...classifyPiAiError(e) });

package/app/app/globals.css

@@ -180,7 +180,7 @@ body {
 }
 
 .prose {
-  font-family: var(--prose-font-override, 'Lora', Georgia, serif);
+  font-family: var(--prose-font-override, 'IBM Plex Sans', system-ui, sans-serif);
   color: var(--prose-body);
   line-height: 1.85;
   font-size: var(--prose-font-size-override, 0.95rem);
@@ -238,6 +238,7 @@ body {
 
 /* Ask Panel — compact prose for side panel chat bubbles */
 .prose.prose-panel {
+  font-family: 'IBM Plex Sans', system-ui, sans-serif;
   font-size: 0.8125rem !important;
   line-height: 1.6;
 }

package/app/app/layout.tsx

@@ -9,7 +9,7 @@ import ErrorBoundary from '@/components/ErrorBoundary';
 import Toaster from '@/components/ui/Toaster';
 import RegisterSW from './register-sw';
 import UpdateOverlay from '@/components/UpdateOverlay';
-import { cookies } from 'next/headers';
+import { cookies, headers } from 'next/headers';
 import type { Locale } from '@/lib/i18n';
 import '@/lib/renderers/index'; // globally register built-in renderers once
 
@@ -67,9 +67,21 @@ export default async function RootLayout({
     console.error('[RootLayout] Failed to load file tree:', err);
   }
 
-  // Read locale from cookie (set by pre-hydration script) so SSR matches client
+  // Read locale from cookie, or infer from Accept-Language header
+  // This matches the client pre-hydration script logic: 
+  // localStorage > system language preference (via Accept-Language)
   const cookieStore = await cookies();
-  const ssrLocale: Locale = cookieStore.get('locale')?.value === 'zh' ? 'zh' : 'en';
+  const cookieLocale = cookieStore.get('locale')?.value;
+  let ssrLocale: Locale = 'en';
+  if (cookieLocale === 'zh') {
+    ssrLocale = 'zh';
+  } else if (cookieLocale !== 'en') {
+    // Cookie not set or invalid — infer from Accept-Language header
+    // (matches client: navigator.language.startsWith('zh') ? 'zh' : 'en')
+    const headerStore = await headers();
+    const acceptLanguage = headerStore.get('Accept-Language') || '';
+    ssrLocale = acceptLanguage.includes('zh') ? 'zh' : 'en';
+  }
 
   return (
     <html lang={ssrLocale} suppressHydrationWarning>
@@ -92,7 +104,7 @@ export default async function RootLayout({
         {/* Apply user appearance settings before first paint, preventing flash */}
         <script
           dangerouslySetInnerHTML={{
-            __html: `(function(){try{var s=localStorage.getItem('theme');var dark=s&&s!=='system'?s==='dark':window.matchMedia('(prefers-color-scheme: dark)').matches;document.documentElement.classList.toggle('dark',dark);var cw=localStorage.getItem('content-width');if(cw)document.documentElement.style.setProperty('--content-width-override',cw);var pf=localStorage.getItem('prose-font');if(pf==='geist'){pf='inter';localStorage.setItem('prose-font','inter')}var fm={lora:'"Lora", Georgia, serif','ibm-plex-sans':'"IBM Plex Sans", sans-serif',inter:'var(--font-inter), sans-serif','ibm-plex-mono':'"IBM Plex Mono", monospace'};if(pf&&fm[pf])document.documentElement.style.setProperty('--prose-font-override',fm[pf]);var loc=localStorage.getItem('locale')||'system';var rl=loc==='system'?(navigator.language.startsWith('zh')?'zh':'en'):loc;document.documentElement.lang=rl==='zh'?'zh':'en';document.cookie='locale='+rl+';path=/;max-age=31536000;SameSite=Lax'}catch(e){}})();`,
+            __html: `(function(){try{var s=localStorage.getItem('theme');var dark=s&&s!=='system'?s==='dark':window.matchMedia('(prefers-color-scheme: dark)').matches;document.documentElement.classList.toggle('dark',dark);var cw=localStorage.getItem('content-width');if(cw)document.documentElement.style.setProperty('--content-width-override',cw);var pf=localStorage.getItem('prose-font');if(pf==='geist'){pf='inter';localStorage.setItem('prose-font','inter')}var fm={lora:'"Lora", Georgia, serif','ibm-plex-sans':'"IBM Plex Sans", sans-serif',inter:'var(--font-inter), sans-serif','ibm-plex-mono':'"IBM Plex Mono", monospace'};if(pf&&fm[pf])document.documentElement.style.setProperty('--prose-font-override',fm[pf]);var loc=localStorage.getItem('locale')||'system';var rl=loc==='system'?(navigator.language.startsWith('zh')?'zh':'en'):loc;window.__mindos_locale__=rl;document.documentElement.lang=rl==='zh'?'zh':'en';document.cookie='locale='+rl+';path=/;max-age=31536000;SameSite=Lax'}catch(e){}})();`,
           }}
         />
       </head>

package/app/components/AskFab.tsx

@@ -22,11 +22,11 @@ export default function AskFab({ onToggle, askPanelOpen }: AskFabProps) {
         fixed z-40 bottom-5 right-5
         items-center justify-center
         gap-0 hover:gap-2
-        p-3 rounded-xl
-        text-white font-medium text-[13px]
-        shadow-sm shadow-amber-900/10
+        p-3 rounded-2xl
+        text-[var(--amber-foreground)] font-medium text-[13px]
+        shadow-md shadow-[var(--amber)]/15
         transition-all duration-200 ease-out
-        hover:shadow-md hover:shadow-amber-900/15
+        hover:shadow-lg hover:shadow-[var(--amber)]/20
         active:scale-95 cursor-pointer overflow-hidden
         ${askPanelOpen ? 'opacity-0 pointer-events-none translate-y-2' : 'opacity-100 translate-y-0'}
       `}

package/app/components/AskModal.tsx

@@ -29,7 +29,7 @@ export default function AskModal({ open, onClose, currentFile, initialMessage, i
         role="dialog"
         aria-modal="true"
         aria-label={t.ask.title}
-        className="w-full md:max-w-2xl md:mx-4 bg-card border-t md:border border-border rounded-t-2xl md:rounded-xl shadow-2xl flex flex-col h-[92vh] md:h-auto md:max-h-[75vh]"
+        className="w-full md:max-w-2xl md:mx-4 bg-card border-t md:border border-border/60 rounded-t-2xl md:rounded-2xl shadow-2xl flex flex-col h-[92vh] md:h-auto md:max-h-[75vh]"
       >
         <AskContent
           visible={open}