@geminilight/mindos 0.6.57 → 0.6.58

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/components/agents/CustomAgentModal.tsx

@@ -16,6 +16,9 @@ interface DetectResult {
   detectedFormat?: 'json' | 'toml';
   detectedConfigKey?: string;
   hasSkillsDir: boolean;
+  detectedSkillDir?: string;
+  skillCount?: number;
+  skillNames?: string[];
   suggestedName?: string;
 }
 
@@ -28,6 +31,7 @@ interface FormState {
   preferredTransport: 'stdio' | 'http';
   project: string;
   presenceCli: string;
+  skillDir: string;
 }
 
 interface CustomAgentModalProps {
@@ -85,6 +89,7 @@ export default function CustomAgentModal({
     preferredTransport: 'stdio',
     project: '',
     presenceCli: '',
+    skillDir: '',
   });
 
   // Reset state when modal opens/closes or editAgent changes
@@ -100,6 +105,7 @@ export default function CustomAgentModal({
         preferredTransport: editAgent.preferredTransport || 'stdio',
         project: editAgent.projectPath || '',
         presenceCli: '',
+        skillDir: editAgent.skillWorkspacePath || '',
       });
       setPhase('result');
       setCustomizeOpen(true);
@@ -115,6 +121,7 @@ export default function CustomAgentModal({
         preferredTransport: 'stdio',
         project: '',
         presenceCli: '',
+        skillDir: '',
       });
       setPhase('input');
       setCustomizeOpen(false);
@@ -182,7 +189,9 @@ export default function CustomAgentModal({
     // Detect API only scans ~/ paths for security; for other absolute paths,
     // skip detection and go straight to Phase B with sensible defaults.
     if (!dir.startsWith('~/')) {
-      setField('global', (dir.endsWith('/') ? dir : dir + '/') + 'mcp.json');
+      const normalized = dir.endsWith('/') ? dir : dir + '/';
+      setField('global', normalized + 'mcp.json');
+      setField('skillDir', normalized + 'skills/');
       setDetectResult({ exists: false, hasSkillsDir: false });
       setPhase('result');
       setDetecting(false);
@@ -216,11 +225,14 @@ export default function CustomAgentModal({
       }
       if (data.detectedFormat) setField('format', data.detectedFormat);
       if (data.detectedConfigKey) setField('configKey', data.detectedConfigKey);
+      setField('skillDir', data.detectedSkillDir || (dir.endsWith('/') ? dir : dir + '/') + 'skills/');
 
       setPhase('result');
     } catch {
       clearTimeout(timeout);
-      setField('global', (dir.endsWith('/') ? dir : dir + '/') + 'mcp.json');
+      const normalized = dir.endsWith('/') ? dir : dir + '/';
+      setField('global', normalized + 'mcp.json');
+      setField('skillDir', normalized + 'skills/');
       setDetectResult({ exists: false, hasSkillsDir: false });
       setDetectTimedOut(true);
       setPhase('result');
@@ -246,6 +258,7 @@ export default function CustomAgentModal({
           preferredTransport: form.preferredTransport,
           project: form.project.trim() || null,
           presenceCli: form.presenceCli.trim() || undefined,
+          skillDir: form.skillDir.trim() || undefined,
         }
       : {
           name: form.name.trim(),
@@ -256,6 +269,7 @@ export default function CustomAgentModal({
           preferredTransport: form.preferredTransport,
           project: form.project.trim() || null,
           presenceCli: form.presenceCli.trim() || undefined,
+          skillDir: form.skillDir.trim() || undefined,
         };
 
     try {
@@ -410,12 +424,12 @@ export default function CustomAgentModal({
                   <span className="text-muted-foreground">{p.customAgentTransportLabel}</span>
                   <span className="text-foreground">{form.preferredTransport}</span>
 
-                  {detectResult?.hasSkillsDir && (
-                    <>
-                      <span className="text-muted-foreground">{p.customAgentSkillsLabel}</span>
-                      <span className="text-foreground">{p.customAgentSkillsFound(0)}</span>
-                    </>
-                  )}
+                  <span className="text-muted-foreground">{p.customAgentSkillsLabel}</span>
+                  <span className="text-foreground">
+                    {detectResult?.hasSkillsDir
+                      ? p.customAgentSkillsFound(detectResult.skillCount ?? 0)
+                      : p.customAgentSkillsNone ?? '—'}
+                  </span>
                 </div>
               </div>
 
@@ -490,6 +504,16 @@ export default function CustomAgentModal({
                       </div>
                     </Field>
 
+                    {/* Skills Directory */}
+                    <Field label={p.customAgentSkillDir} hint={p.customAgentSkillDirHint}>
+                      <Input
+                        value={form.skillDir}
+                        onChange={(e) => setField('skillDir', e.target.value)}
+                        placeholder={p.customAgentSkillDirPlaceholder}
+                        autoComplete="off"
+                      />
+                    </Field>
+
                     {/* Project Config */}
                     <Field label={p.customAgentProjectConfig}>
                       <Input

package/app/data/skills/mindos/SKILL.md

@@ -3,14 +3,19 @@ name: mindos
 description: >
   Operate a MindOS knowledge base: update notes, search, organize files, execute SOPs/workflows,
   retrospective, append CSV, cross-agent handoff, route unstructured input to the right files,
-  distill experience, sync related docs. 更新笔记, 搜索知识库, 整理, 执行SOP, 复盘, 追加CSV, 交接, 路由到文件, 提炼经验.
-  Use when the task targets files inside the user's MindOS KB (mindRoot).
+  distill experience, sync related docs.
+  更新笔记, 搜索知识库, 整理文件, 执行SOP/工作流, 复盘, 追加CSV, 跨Agent交接,
+  路由非结构化输入到对应文件, 提炼经验, 同步关联文档.
   NOT for editing app source, project docs, or paths outside the KB.
   Core concepts: Space, Instruction (INSTRUCTION.md), Skill (SKILL.md); notes can embody both.
-  Trigger when user asks to: save or record a note, search their knowledge base, update or edit
-  a file, organize notes, run a workflow or SOP, capture decisions from a session, append rows
-  to a table or CSV, hand off context to another agent — or says "帮我记下来" / "搜一下我的笔记" /
-  "更新知识库" / "整理文件" / "执行工作流".
+  Trigger when user asks to: save or record anything, search for prior notes or context, update or
+  edit a file, organize notes, run a workflow or SOP, capture decisions from a session, append rows
+  to a table or CSV, hand off context to another agent, check if something was discussed before,
+  look up a past decision, distill lessons learned, prepare context for a meeting.
+  Also trigger on Chinese: 帮我记下来, 搜一下笔记, 更新知识库, 整理文件, 复盘, 提炼经验,
+  保存, 记录, 交接, 查一下之前的, 有没有相关笔记, 把这个存起来.
+  When the user's question implies stored context may exist (past decisions, previous discussions,
+  meeting records), consider searching MindOS even if they don't explicitly mention it.
 ---
 
 # MindOS Skill
@@ -115,9 +120,9 @@ User request
 ## Judgment heuristics
 
 **Save intent boundary:**
-- "帮我记下来" / "保存" = write
-- "搜一下" / "总结" = read-only
-- "整理一下" → ask: display only, or write back?
+- "save this" / "record" / "write down" = write
+- "search" / "summarize" / "look up" = read-only
+- "organize" → ask: display only, or write back?
 
 **File location uncertainty:**
 - Can't decide in 5 seconds → use nearest existing directory, inform user

package/app/data/skills/mindos-zh/SKILL.md

@@ -1,11 +1,20 @@
 ---
 name: mindos-zh
 description: >
-  操作 MindOS 知识库：更新笔记, 搜索知识库, 整理文件, 执行SOP/工作流, 复盘, 追加CSV, 跨Agent交接,
-  路由非结构化输入到对应文件, 提炼经验, 同步关联文档. update notes, search knowledge base, organize,
-  SOP, retrospective, CSV, handoff, route notes, distill experience.
-  仅 mindRoot 知识库内任务。不用于：改代码仓库/项目文档/KB 外路径。
+  MindOS 知识库操作：更新笔记、搜索知识库、整理文件、执行SOP/工作流、复盘、追加CSV、跨Agent交接、
+  路由非结构化输入到对应文件、提炼经验、同步关联文档。
+  仅 mindRoot 知识库内任务。不用于：改代码仓库、项目源码、KB 外路径。
   核心概念：空间、指令(INSTRUCTION.md)、技能(SKILL.md)；笔记可承载指令与技能。
+  触发场景：保存或记录任何内容、搜索历史笔记或上下文、更新或编辑文件、整理或重组文件结构、
+  执行SOP或工作流、捕获对话中的决策、复盘或总结经验、追加表格或CSV数据、跨Agent交接上下文、
+  提炼经验教训、同步关联文档、查找之前是否讨论过某事、查询历史决策、查找模板或SOP、
+  为会议准备上下文。
+  触发词：帮我记下来、搜一下我的笔记、更新知识库、整理文件、执行工作流、保存到知识库、
+  记录一下、整理笔记、复盘、提炼经验、同步文档、查一下之前的记录、有没有相关的笔记、
+  我之前写过什么、把这个存起来、总结一下保存、交接给其他Agent、追加到表格。
+  English triggers: save, record, search notes, organize, retrospective, handoff, lessons learned.
+  当用户的问题暗示可能存在历史记录（过去的决策、之前的讨论、会议纪要）时，
+  即使没有明确提到知识库，也应该考虑搜索 MindOS。
 ---
 
 # MindOS 技能

package/app/lib/custom-agents.ts

@@ -26,6 +26,8 @@ export interface CustomAgentDef {
   presenceDirs: string[];
   presenceCli?: string;
   globalNestedKey?: string;
+  /** Skills directory path. Defaults to `baseDir + 'skills/'`. */
+  skillDir?: string;
 }
 
 export interface DetectResult {
@@ -34,6 +36,9 @@ export interface DetectResult {
   detectedFormat?: 'json' | 'toml';
   detectedConfigKey?: string;
   hasSkillsDir: boolean;
+  detectedSkillDir?: string;
+  skillCount?: number;
+  skillNames?: string[];
   suggestedName?: string;
 }
 
@@ -87,6 +92,7 @@ export function inferDefaults(name: string, baseDir: string): Omit<CustomAgentDe
     format: 'json',
     preferredTransport: 'stdio',
     presenceDirs: [dir],
+    skillDir: dir + 'skills/',
   };
 }
 
@@ -112,8 +118,23 @@ export function detectBaseDir(baseDir: string): DetectResult {
   const dirName = path.basename(expanded.replace(/\/$/, ''));
   result.suggestedName = dirName.charAt(0).toUpperCase() + dirName.slice(1);
 
-  // Check for skills/ subdirectory
-  result.hasSkillsDir = fs.existsSync(path.join(expanded, 'skills'));
+  // Check for skills/ subdirectory and scan contents
+  const skillsPath = path.join(expanded, 'skills');
+  if (fs.existsSync(skillsPath)) {
+    result.hasSkillsDir = true;
+    result.detectedSkillDir = baseDir.endsWith('/') ? baseDir + 'skills/' : baseDir + '/skills/';
+    try {
+      const skillEntries = fs.readdirSync(skillsPath, { withFileTypes: true });
+      const skillNames = skillEntries
+        .filter(e => (e.isDirectory() || e.isSymbolicLink()) && !e.name.startsWith('.'))
+        .map(e => e.name)
+        .sort((a, b) => a.localeCompare(b));
+      result.skillCount = skillNames.length;
+      result.skillNames = skillNames;
+    } catch {
+      result.skillCount = 0;
+    }
+  }
 
   // Scan top-level files (max 20)
   let entries: string[];
@@ -239,6 +260,28 @@ export function getAllAgents(): Record<string, AgentDef> {
   return result;
 }
 
+/* ─── Skill Scanning ─── */
+
+/**
+ * Scan skills installed in a custom agent's skill directory.
+ * Returns the same shape as detectAgentInstalledSkills.
+ */
+export function scanCustomAgentSkills(custom: CustomAgentDef): { skills: string[]; sourcePath: string } {
+  const skillDir = custom.skillDir || (custom.baseDir.endsWith('/') ? custom.baseDir + 'skills/' : custom.baseDir + '/skills/');
+  const expanded = expandHome(skillDir);
+  if (!fs.existsSync(expanded)) return { skills: [], sourcePath: expanded };
+  try {
+    const entries = fs.readdirSync(expanded, { withFileTypes: true });
+    const skills = entries
+      .filter(e => (e.isDirectory() || e.isSymbolicLink()) && !e.name.startsWith('.'))
+      .map(e => e.name)
+      .sort((a, b) => a.localeCompare(b));
+    return { skills, sourcePath: expanded };
+  } catch {
+    return { skills: [], sourcePath: expanded };
+  }
+}
+
 /* ─── Validation ─── */
 
 export function validateCustomAgentInput(input: {

package/app/lib/i18n/modules/panels.ts

@@ -333,7 +333,11 @@ export const panelsEn = {
       customAgentFormatLabel: 'Format',
       customAgentTransportLabel: 'Transport',
       customAgentSkillsLabel: 'Skills',
-      customAgentSkillsFound: (n: number) => `${n} found`,
+      customAgentSkillsFound: (n: number) => `${n} skill${n !== 1 ? 's' : ''} found`,
+      customAgentSkillsNone: 'Not detected',
+      customAgentSkillDir: 'Skills Directory',
+      customAgentSkillDirHint: 'Where skills are installed for this agent',
+      customAgentSkillDirPlaceholder: '~/.xxx/skills/',
       customAgentCustomize: 'Customize these settings',
       customAgentAdd: 'Add Agent',
       customAgentAdding: 'Adding...',
@@ -1017,7 +1021,11 @@ export const panelsZh = {
       customAgentFormatLabel: '格式',
       customAgentTransportLabel: '传输协议',
       customAgentSkillsLabel: '技能',
-      customAgentSkillsFound: (n: number) => `发现 ${n} 个`,
+      customAgentSkillsFound: (n: number) => `发现 ${n} 个技能`,
+      customAgentSkillsNone: '未检测到',
+      customAgentSkillDir: '技能目录',
+      customAgentSkillDirHint: '此 Agent 安装技能的目录',
+      customAgentSkillDirPlaceholder: '~/.xxx/skills/',
       customAgentCustomize: '自定义配置',
       customAgentAdd: '添加 Agent',
       customAgentAdding: '添加中...',

package/app/lib/mcp-agents.ts

@@ -235,6 +235,15 @@ export const MCP_AGENTS: Record<string, AgentDef> = {
     presenceCli: 'codex',
     presenceDirs: ['~/.codex/'],
   },
+  'antigravity': {
+    name: 'Antigravity',
+    project: '.antigravity/mcp_config.json',
+    global: '~/.gemini/antigravity/mcp_config.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'agy',
+    presenceDirs: ['~/.gemini/antigravity/'],
+  },
 };
 
 /**
@@ -261,6 +270,7 @@ export const SKILL_AGENT_REGISTRY: Record<string, SkillAgentRegistration> = {
   'roo': { mode: 'additional', skillAgentName: 'roo' },
   'github-copilot': { mode: 'universal' },
   'codex': { mode: 'universal' },
+  'antigravity': { mode: 'additional', skillAgentName: 'antigravity' },
 };
 
 export interface SkillWorkspaceProfile {