@geminilight/mindos 0.6.60 → 0.6.61

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

@@ -20,7 +20,7 @@ import fs from 'fs';
 import path from 'path';
 import { getFileContent, getMindRoot, collectAllFiles } from '@/lib/fs';
 import { getModelConfig, hasImages } from '@/lib/agent/model';
-import { isProviderId, type ProviderId } from '@/lib/agent/providers';
+import { isProviderId, type ProviderId, toPiProvider } from '@/lib/agent/providers';
 import { getRequestScopedTools, getOrganizeTools, getChatTools, WRITE_TOOLS, truncate } from '@/lib/agent/tools';
 import { AGENT_SYSTEM_PROMPT, ORGANIZE_SYSTEM_PROMPT, CHAT_SYSTEM_PROMPT } from '@/lib/agent/prompt';
 import type { AskModeApi } from '@/lib/types';
@@ -1016,7 +1016,7 @@ export async function POST(req: NextRequest) {
     const customTools = toPiCustomToolDefinitions(requestTools);
 
     const authStorage = AuthStorage.create();
-    authStorage.setRuntimeApiKey(provider, requestApiKey);
+    authStorage.setRuntimeApiKey(toPiProvider(provider), requestApiKey);
     const modelRegistry = new ModelRegistry(authStorage);
     const settingsManager = SettingsManager.inMemory({
       enableSkillCommands: true,

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

@@ -2,8 +2,9 @@ export const dynamic = 'force-dynamic';
 import { NextRequest, NextResponse } from 'next/server';
 import fs from 'fs';
 import path from 'path';
-import { MCP_AGENTS, expandHome, resolveSkillWorkspaceProfile } from '@/lib/mcp-agents';
+import { MCP_AGENTS, SKILL_AGENT_REGISTRY, expandHome, resolveSkillWorkspaceProfile } from '@/lib/mcp-agents';
 import { readSettings, recordSkillInstall } from '@/lib/settings';
+import { copyDir, dirExists } from '@/lib/file-ops';
 
 /** Parse JSONC — strips comments before JSON.parse. Returns {} for empty/whitespace-only input. */
 function parseJsonc(text: string): Record<string, unknown> {
@@ -213,6 +214,21 @@ export async function POST(req: NextRequest) {
           const activeSkill = settings.disabledSkills?.includes('mindos') ? 'mindos-zh' : 'mindos';
           const skillPath = path.join(skillProfile.workspacePath, activeSkill, 'SKILL.md');
           recordSkillInstall(key, activeSkill, skillPath);
+
+          // Auto-copy skill for unsupported agents (QClaw, WorkBuddy, Lingma, etc.)
+          const reg = SKILL_AGENT_REGISTRY[key];
+          if (reg?.mode === 'unsupported') {
+            const projectRoot = process.env.MINDOS_PROJECT_ROOT || path.resolve(process.cwd(), '..');
+            const candidates = [
+              path.join(projectRoot, 'skills', activeSkill),
+              path.join(projectRoot, 'app', 'data', 'skills', activeSkill),
+            ];
+            const skillSrc = candidates.find(p => dirExists(p));
+            const targetDir = path.join(skillProfile.workspacePath, activeSkill);
+            if (skillSrc && !dirExists(targetDir)) {
+              await copyDir(skillSrc, targetDir);
+            }
+          }
         } catch { /* best-effort, don't fail the install */ }
 
         // Verify http connections

package/app/components/Panel.tsx

@@ -324,6 +324,20 @@ export default function Panel({
         >
           <FileTree nodes={fileTree} onNavigate={onNavigate} maxOpenDepth={maxOpenDepth} onImport={onImport} />
         </div>
+        {/* Inbox quick entry — always visible above sync bar */}
+        <button
+          type="button"
+          onClick={() => router.push('/view/Inbox/')}
+          className="flex items-center gap-2 mx-2 px-2 py-1.5 text-sm rounded-md transition-colors hover:bg-muted group border-t border-border/40 shrink-0"
+        >
+          <Inbox size={14} className="shrink-0 text-[var(--amber)]" />
+          <span className="flex-1 text-left text-muted-foreground group-hover:text-foreground transition-colors text-xs">
+            {t.sidebar.capture}
+          </span>
+          {inboxCount > 0 && (
+            <span className="text-xs font-medium text-[var(--amber)] tabular-nums">{inboxCount}</span>
+          )}
+        </button>
         <SyncStatusBar collapsed={false} onOpenSyncSettings={onOpenSyncSettings} />
       </div>
 

package/app/components/home/InboxSection.tsx

@@ -15,7 +15,13 @@ import {
   Check,
   Clock,
   ChevronDown,
+  X,
+  ExternalLink,
+  Copy,
+  Trash2,
 } from 'lucide-react';
+import { useRouter } from 'next/navigation';
+import { toast } from '@/lib/toast';
 import { useLocale } from '@/lib/stores/locale-store';
 import { encodePath } from '@/lib/utils';
 import { quickDropToInbox } from '@/lib/inbox-upload';
@@ -55,6 +61,22 @@ export function InboxSection({ isOrganizing: externalOrganizing = false }: Inbox
     );
   }, [files, isOrganizing]);
 
+  const handleDeleteFile = useCallback(async (name: string) => {
+    try {
+      const res = await fetch('/api/inbox', {
+        method: 'DELETE',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ names: [name] }),
+      });
+      if (!res.ok) throw new Error('Failed to delete');
+      setFiles(prev => prev.filter(f => f.name !== name));
+      window.dispatchEvent(new Event('mindos:inbox-updated'));
+      toast.success(t.inbox.fileRemoved);
+    } catch {
+      toast.error(t.inbox.fileRemoveFailed);
+    }
+  }, [t]);
+
   const handleUpload = useCallback((selected: FileList | null) => {
     if (!selected || selected.length === 0) return;
     quickDropToInbox(Array.from(selected), t);
@@ -208,7 +230,7 @@ export function InboxSection({ isOrganizing: externalOrganizing = false }: Inbox
         <>
           <div className="flex flex-col gap-0.5 mb-3">
             {visibleFiles.map((file) => (
-              <InboxFileRow key={file.path} file={file} />
+              <InboxFileRow key={file.path} file={file} onDelete={handleDeleteFile} />
             ))}
           </div>
           {overflowCount > 0 && (
@@ -312,45 +334,139 @@ export function InboxSection({ isOrganizing: externalOrganizing = false }: Inbox
   );
 }
 
-function InboxFileRow({ file }: { file: InboxFile }) {
+function InboxFileRow({ file, onDelete }: { file: InboxFile; onDelete: (name: string) => void }) {
   const { t } = useLocale();
+  const router = useRouter();
   const isCSV = file.name.endsWith('.csv');
   const age = formatRelativeTime(file.modifiedAt, t.home.relativeTime);
+  const [ctxMenu, setCtxMenu] = useState<{ x: number; y: number } | null>(null);
+
+  const handleNavigate = () => {
+    router.push(`/view/${encodePath(file.path)}`);
+  };
+
+  const handleDelete = (e: React.MouseEvent) => {
+    e.stopPropagation();
+    e.preventDefault();
+    onDelete(file.name);
+  };
+
+  const handleContextMenu = (e: React.MouseEvent) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setCtxMenu({ x: e.clientX, y: e.clientY });
+  };
 
   return (
-    <Link
-      href={`/view/${encodePath(file.path)}`}
-      className="flex items-center gap-3 px-3 py-2 rounded-lg transition-all duration-100 hover:translate-x-0.5 hover:bg-muted group"
-    >
-      <span
-        className={`w-1.5 h-1.5 rounded-full shrink-0 ${
-          file.isAging ? 'bg-[var(--amber)]/60' : 'bg-[var(--amber)]'
-        }`}
-      />
-      {isCSV ? (
-        <Table size={12} className="shrink-0 text-success" />
-      ) : (
-        <FileText size={12} className="shrink-0 text-muted-foreground" />
-      )}
-      <span
-        className="text-sm truncate flex-1 text-foreground"
-        title={file.name}
-        suppressHydrationWarning
+    <>
+      <div
+        role="button"
+        tabIndex={0}
+        onClick={handleNavigate}
+        onKeyDown={(e) => { if (e.key === 'Enter') handleNavigate(); }}
+        onContextMenu={handleContextMenu}
+        className="flex items-center gap-3 px-3 py-2 rounded-lg transition-all duration-100 hover:translate-x-0.5 hover:bg-muted group cursor-pointer"
       >
-        {file.name}
-      </span>
-      <span className="text-2xs text-muted-foreground/50 tabular-nums shrink-0">
-        {age}
-      </span>
-      {file.isAging && (
-        <span title="7+ days">
-          <AlertCircle
-            size={11}
-            className="shrink-0 text-[var(--amber)]/60"
-          />
+        <span
+          className={`w-1.5 h-1.5 rounded-full shrink-0 ${
+            file.isAging ? 'bg-[var(--amber)]/60' : 'bg-[var(--amber)]'
+          }`}
+        />
+        {isCSV ? (
+          <Table size={12} className="shrink-0 text-success" />
+        ) : (
+          <FileText size={12} className="shrink-0 text-muted-foreground" />
+        )}
+        <span
+          className="text-sm truncate flex-1 text-foreground"
+          title={file.name}
+          suppressHydrationWarning
+        >
+          {file.name}
+        </span>
+        <span className="text-2xs text-muted-foreground/50 tabular-nums shrink-0 group-hover:hidden">
+          {age}
         </span>
+        {file.isAging && (
+          <span title="7+ days" className="group-hover:hidden">
+            <AlertCircle
+              size={11}
+              className="shrink-0 text-[var(--amber)]/60"
+            />
+          </span>
+        )}
+        {/* Hover delete button */}
+        <button
+          type="button"
+          onClick={handleDelete}
+          className="hidden group-hover:flex items-center justify-center w-5 h-5 rounded shrink-0 text-muted-foreground/50 hover:text-destructive hover:bg-destructive/10 transition-colors"
+          title={t.inbox.removeFile}
+        >
+          <X size={12} />
+        </button>
+      </div>
+      {ctxMenu && (
+        <InboxFileContextMenu
+          x={ctxMenu.x}
+          y={ctxMenu.y}
+          file={file}
+          onDelete={() => { setCtxMenu(null); onDelete(file.name); }}
+          onClose={() => setCtxMenu(null)}
+        />
       )}
-    </Link>
+    </>
+  );
+}
+
+/** Right-click context menu for Inbox file items */
+function InboxFileContextMenu({ x, y, file, onDelete, onClose }: {
+  x: number; y: number; file: InboxFile; onDelete: () => void; onClose: () => void;
+}) {
+  const menuRef = useRef<HTMLDivElement>(null);
+  const router = useRouter();
+  const { t } = useLocale();
+
+  useEffect(() => {
+    const handleClick = (e: MouseEvent) => {
+      if (menuRef.current && !menuRef.current.contains(e.target as Node)) onClose();
+    };
+    const handleKey = (e: KeyboardEvent) => { if (e.key === 'Escape') onClose(); };
+    document.addEventListener('mousedown', handleClick);
+    document.addEventListener('keydown', handleKey);
+    return () => { document.removeEventListener('mousedown', handleClick); document.removeEventListener('keydown', handleKey); };
+  }, [onClose]);
+
+  const adjX = typeof window !== 'undefined' ? Math.min(x, window.innerWidth - 200) : x;
+  const adjY = typeof window !== 'undefined' ? Math.min(y, window.innerHeight - 120) : y;
+
+  const menuItemClass = 'w-full flex items-center gap-2 px-3 py-1.5 text-sm text-foreground hover:bg-muted transition-colors text-left';
+
+  return (
+    <div
+      ref={menuRef}
+      className="fixed z-50 min-w-[160px] bg-card border border-border rounded-lg shadow-lg py-1"
+      style={{ top: adjY, left: adjX }}
+    >
+      <button
+        className={menuItemClass}
+        onClick={() => { router.push(`/view/${encodePath(file.path)}`); onClose(); }}
+      >
+        <ExternalLink size={14} className="shrink-0" /> {t.inbox.openFile}
+      </button>
+      <button
+        className={menuItemClass}
+        onClick={() => { navigator.clipboard.writeText(file.name); toast.copy(); onClose(); }}
+      >
+        <Copy size={14} className="shrink-0" /> {t.inbox.copyName}
+      </button>
+      <div className="border-t border-border my-1" />
+      <button
+        className={`${menuItemClass} text-destructive hover:text-destructive`}
+        onClick={onDelete}
+      >
+        <Trash2 size={14} className="shrink-0" /> {t.inbox.removeFile}
+      </button>
+    </div>
   );
 }
 

package/app/lib/acp/agent-descriptors.ts

@@ -128,6 +128,9 @@ export const AGENT_DESCRIPTORS: Record<string, AcpAgentDescriptor> = {
   'qwen-code':       { binary: 'qwen-code',       cmd: 'qwen-code', args: [], installCmd: 'npm install -g @qwen-code/qwen-code',
     displayName: 'Qwen Code',
     description: '阿里通义千问 Qwen 编程智能体。基于 Qwen 大模型，支持代码生成、审查和多语言编程，深度适配中文开发场景。' },
+  'lingma':          { binary: 'lingma',           cmd: 'lingma',    args: [],
+    displayName: 'Lingma',
+    description: '阿里通义灵码智能编程助手。提供代码补全、智能问答、多文件修改和编程智能体能力，支持 MCP 工具扩展。' },
 };
 
 /* ── Resolution ────────────────────────────────────────────────────────── */

package/app/lib/acp/subprocess.ts

@@ -27,6 +27,10 @@ export interface AcpProcess {
   agentId: string;
   proc: ChildProcess;
   alive: boolean;
+  /** Set when the process fails to spawn or exits with an error. */
+  spawnError?: string;
+  /** Exit code when the process has terminated. */
+  exitCode?: number | null;
 }
 
 type MessageCallback = (msg: AcpJsonRpcResponse) => void;
@@ -119,15 +123,18 @@ export function spawnAcpAgent(
 
   proc.on('close', (code) => {
     acpProc.alive = false;
-    if (code && code !== 0 && stderrBuf.trim()) {
-      console.error(`[ACP] ${entry.id} exited with code ${code}: ${stderrBuf.trim().slice(0, 500)}`);
+    acpProc.exitCode = code;
+    if (code && code !== 0) {
+      acpProc.spawnError = stderrBuf.trim().slice(0, 500) || `Process exited with code ${code}`;
+      console.error(`[ACP] ${entry.id} exited with code ${code}: ${acpProc.spawnError}`);
     }
-    messageListeners.delete(id);
-    requestListeners.delete(id);
+    // Do NOT delete listeners here — sendAndWait still needs them to reject.
+    // Listeners are cleaned up in killAgent() and by individual unsub calls.
   });
 
   proc.on('error', (err) => {
     acpProc.alive = false;
+    acpProc.spawnError = err.message;
     console.error(`[ACP] ${entry.id} spawn error:`, err.message);
   });
 
@@ -176,20 +183,61 @@ export function sendAndWait(
   timeoutMs = 30_000,
 ): Promise<AcpJsonRpcResponse> {
   return new Promise((resolve, reject) => {
-    const rpcId = sendMessage(acpProc, method, params);
+    // Fail fast if process is already dead (e.g. binary not found).
+    if (!acpProc.alive) {
+      const reason = acpProc.spawnError || 'Process is not alive';
+      reject(new Error(
+        `Agent "${acpProc.agentId}" is not running: ${reason}. ` +
+        `Please check that the agent is installed and available on your PATH.`,
+      ));
+      return;
+    }
 
-    const timer = setTimeout(() => {
+    let rpcId: string;
+    try {
+      rpcId = sendMessage(acpProc, method, params);
+    } catch (err) {
+      reject(err);
+      return;
+    }
+
+    const cleanup = () => {
+      clearTimeout(timer);
       unsub();
+      acpProc.proc.removeListener('close', onClose);
+      acpProc.proc.removeListener('error', onError);
+    };
+
+    const timer = setTimeout(() => {
+      cleanup();
       reject(new Error(`ACP RPC timeout after ${timeoutMs}ms for method: ${method}`));
     }, timeoutMs);
 
     const unsub = onMessage(acpProc, (msg) => {
       if (String(msg.id) === rpcId) {
-        clearTimeout(timer);
-        unsub();
+        cleanup();
         resolve(msg);
       }
     });
+
+    // Reject immediately if the process dies while we're waiting.
+    const onClose = (code: number | null) => {
+      cleanup();
+      const reason = acpProc.spawnError || `Process exited with code ${code}`;
+      reject(new Error(
+        `Agent "${acpProc.agentId}" exited unexpectedly: ${reason}. ` +
+        `Please check that the agent is installed and available on your PATH.`,
+      ));
+    };
+    const onError = (err: Error) => {
+      cleanup();
+      reject(new Error(
+        `Agent "${acpProc.agentId}" failed to start: ${err.message}. ` +
+        `Please check that the agent is installed and available on your PATH.`,
+      ));
+    };
+    acpProc.proc.once('close', onClose);
+    acpProc.proc.once('error', onError);
   });
 }
 

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

@@ -119,6 +119,11 @@ export const knowledgeEn = {
     noMindRoot: 'Please configure your knowledge base first',
     saveFailed: 'Failed to save files. Check disk space and permissions.',
     organizeFailed: 'Could not read files for organizing. Check file permissions.',
+    removeFile: 'Remove from Inbox',
+    openFile: 'Open',
+    copyName: 'Copy Name',
+    fileRemoved: 'File removed from Inbox',
+    fileRemoveFailed: 'Failed to remove file',
   },
   pulse: {
     title: 'Your Agents',
@@ -498,6 +503,11 @@ export const knowledgeZh = {
     noMindRoot: '请先配置知识库路径',
     saveFailed: '保存文件失败，请检查磁盘空间和权限。',
     organizeFailed: '无法读取文件进行整理，请检查文件权限。',
+    removeFile: '从暂存台移除',
+    openFile: '打开',
+    copyName: '复制文件名',
+    fileRemoved: '文件已从暂存台移除',
+    fileRemoveFailed: '移除文件失败',
   },
   pulse: {
     title: '你的 Agent',

package/app/lib/mcp-agents.ts

@@ -262,6 +262,14 @@ export const MCP_AGENTS: Record<string, AgentDef> = {
     presenceCli: 'workbuddy',
     presenceDirs: ['~/.workbuddy/'],
   },
+  'lingma': {
+    name: 'Lingma',
+    project: null,
+    global: '~/.lingma/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.lingma/'],
+  },
 };
 
 /**
@@ -291,6 +299,7 @@ export const SKILL_AGENT_REGISTRY: Record<string, SkillAgentRegistration> = {
   'antigravity': { mode: 'additional', skillAgentName: 'antigravity' },
   'qclaw': { mode: 'unsupported' },
   'workbuddy': { mode: 'unsupported' },
+  'lingma': { mode: 'unsupported' },
 };
 
 export interface SkillWorkspaceProfile {

package/bin/lib/mcp-agents.js

@@ -1,6 +1,10 @@
 /**
  * Shared MCP agent definitions for CLI tools.
- * Mirrors app/lib/mcp-agents.ts — keep in sync manually.
+ *
+ * ⚠️  KEEP IN SYNC WITH:
+ *   - app/lib/mcp-agents.ts          (TypeScript source of truth)
+ *   - bin/lib/toml.js                 (TOML format support for agents with format: 'toml')
+ *   - app/app/api/mcp/install/route.ts (server-side install with TOML merge)
  *
  * Each agent entry includes presenceCli / presenceDirs for detecting
  * whether the agent is installed on the user's machine. To add a new
@@ -226,6 +230,32 @@ export const MCP_AGENTS = {
     presenceCli: 'agy',
     presenceDirs: ['~/.gemini/antigravity/'],
   },
+  'qclaw': {
+    name: 'QClaw',
+    project: null,
+    global: '~/.qclaw/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'qclaw',
+    presenceDirs: ['~/.qclaw/'],
+  },
+  'workbuddy': {
+    name: 'WorkBuddy',
+    project: null,
+    global: '~/.workbuddy/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceCli: 'workbuddy',
+    presenceDirs: ['~/.workbuddy/'],
+  },
+  'lingma': {
+    name: 'Lingma',
+    project: null,
+    global: '~/.lingma/mcp.json',
+    key: 'mcpServers',
+    preferredTransport: 'stdio',
+    presenceDirs: ['~/.lingma/'],
+  },
 };
 
 /**
@@ -253,6 +283,9 @@ export const SKILL_AGENT_REGISTRY = {
   'github-copilot': { mode: 'universal' },
   'codex': { mode: 'universal' },
   'antigravity': { mode: 'additional', skillAgentName: 'antigravity' },
+  'qclaw': { mode: 'unsupported' },
+  'workbuddy': { mode: 'unsupported' },
+  'lingma': { mode: 'unsupported' },
 };
 
 export function detectAgentPresence(agentKey) {

package/bin/lib/mcp-install.js

@@ -1,10 +1,62 @@
-import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
-import { resolve } from 'node:path';
-import { CONFIG_PATH } from './constants.js';
+import { existsSync, readFileSync, writeFileSync, mkdirSync, readdirSync, copyFileSync } from 'node:fs';
+import { resolve, join } from 'node:path';
+import { CONFIG_PATH, ROOT } from './constants.js';
 import { bold, dim, cyan, green, red, yellow } from './colors.js';
 import { expandHome } from './path-expand.js';
 import { parseJsonc } from './jsonc.js';
-import { MCP_AGENTS, detectAgentPresence } from './mcp-agents.js';
+import { MCP_AGENTS, SKILL_AGENT_REGISTRY, detectAgentPresence } from './mcp-agents.js';
+import { mergeTomlEntry } from './toml.js';
+
+/**
+ * Recursively copy a directory using pure Node.js (cross-platform).
+ * Uses cpSync on Node >=16.7, falls back to manual walk otherwise.
+ */
+function copyDirSync(src, dst) {
+  mkdirSync(dst, { recursive: true });
+  for (const entry of readdirSync(src, { withFileTypes: true })) {
+    const s = join(src, entry.name);
+    const d = join(dst, entry.name);
+    if (entry.isDirectory()) {
+      copyDirSync(s, d);
+    } else {
+      copyFileSync(s, d);
+    }
+  }
+}
+
+/**
+ * Auto-copy skill folder for agents with mode 'unsupported'.
+ * Called after MCP config is written. Best-effort, never throws.
+ */
+function autoInstallSkillForAgent(agentKey, skillName) {
+  const reg = SKILL_AGENT_REGISTRY[agentKey];
+  if (!reg || reg.mode !== 'unsupported') return null;
+
+  const agent = MCP_AGENTS[agentKey];
+  if (!agent) return null;
+
+  // Resolve skill source: project skills/ or app/data/skills/
+  const candidates = [
+    join(ROOT, 'skills', skillName),
+    join(ROOT, 'app', 'data', 'skills', skillName),
+  ];
+  const skillSrc = candidates.find(p => existsSync(p));
+  if (!skillSrc) return null;
+
+  // Resolve target: agent's presenceDirs[0]/skills/<skillName>
+  const agentRoot = (agent.presenceDirs ?? []).map(d => expandHome(d)).find(d => existsSync(d))
+    || resolve(expandHome(agent.global), '..');
+  const targetDir = join(agentRoot, 'skills', skillName);
+
+  if (existsSync(targetDir)) return 'exists';
+
+  try {
+    copyDirSync(skillSrc, targetDir);
+    return 'copied';
+  } catch {
+    return null;
+  }
+}
 
 export { MCP_AGENTS };
 
@@ -195,8 +247,15 @@ export async function mcpInstall() {
           const abs = expandHome(cfgPath);
           if (!existsSync(abs)) continue;
           try {
-            const config = parseJsonc(readFileSync(abs, 'utf-8'));
-            if (config[agent.key]?.mindos) { installed = true; break; }
+            const content = readFileSync(abs, 'utf-8');
+            if (agent.format === 'toml') {
+              // TOML: look for [section.mindos] header
+              installed = content.includes(`[${agent.key}.mindos]`);
+            } else {
+              const config = parseJsonc(content);
+              if (config[agent.key]?.mindos) installed = true;
+            }
+            if (installed) break;
           } catch {}
         }
         const hint = installed ? 'configured' : present ? 'detected' : 'not found';
@@ -312,24 +371,39 @@ export async function mcpInstall() {
 
     // read + merge — resolve to absolute path for cross-platform safety
     const absPath = resolve(expandHome(configPath));
-    let config = {};
-    if (existsSync(absPath)) {
-      try { config = parseJsonc(readFileSync(absPath, 'utf-8')); } catch {
-        console.error(red(`  Failed to parse existing config: ${absPath} — skipping.`));
-        continue;
-      }
-    }
-
-    if (!config[agent.key]) config[agent.key] = {};
-    const existed = !!config[agent.key].mindos;
-    config[agent.key].mindos = entry;
-
-    // write
     const dir = resolve(absPath, '..');
     if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-    writeFileSync(absPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+
+    let existed = false;
+
+    if (agent.format === 'toml') {
+      // TOML format (e.g. Codex): line-based merge preserving existing content
+      const existing = existsSync(absPath) ? readFileSync(absPath, 'utf-8') : '';
+      existed = existing.includes(`[${agent.key}.mindos]`);
+      const merged = mergeTomlEntry(existing, agent.key, 'mindos', entry);
+      writeFileSync(absPath, merged, 'utf-8');
+    } else {
+      // JSON format (default)
+      let config = {};
+      if (existsSync(absPath)) {
+        try { config = parseJsonc(readFileSync(absPath, 'utf-8')); } catch {
+          console.error(red(`  Failed to parse existing config: ${absPath} — skipping.`));
+          continue;
+        }
+      }
+      if (!config[agent.key]) config[agent.key] = {};
+      existed = !!config[agent.key].mindos;
+      config[agent.key].mindos = entry;
+      writeFileSync(absPath, JSON.stringify(config, null, 2) + '\n', 'utf-8');
+    }
 
     console.log(`${green('✔')} ${existed ? 'Updated' : 'Installed'} MindOS MCP for ${bold(agent.name)} ${dim(`→ ${absPath}`)}`);
+
+    // Auto-copy skill for unsupported agents
+    const skillResult = autoInstallSkillForAgent(agentKey, 'mindos');
+    if (skillResult === 'copied') {
+      console.log(`${green('✔')} Copied MindOS Skill for ${bold(agent.name)}`);
+    }
   }
 
   console.log(`\n${green('Done!')} ${agentKeys.length} agent(s) configured.`);