@geminilight/mindos 0.6.7 → 0.6.12

package/app/lib/fs.ts

@@ -585,6 +585,7 @@ export type { MindSpaceSummary } from './core';
 export type { ContentChangeEvent, ContentChangeInput, ContentChangeSummary, ContentChangeSource } from './core';
 
 export function findBacklinks(targetPath: string): BacklinkEntry[] {
-  return coreFindBacklinks(getMindRoot(), targetPath);
+  const { allFiles } = ensureCache();
+  return coreFindBacklinks(getMindRoot(), targetPath, allFiles);
 }
 

package/app/lib/i18n-en.ts

@@ -72,12 +72,15 @@ export const en = {
     agents: 'Agents',
     echo: 'Echo',
     discover: 'Discover',
+    history: 'History',
     help: 'Help',
     syncLabel: 'Sync',
     collapseTitle: 'Collapse sidebar',
     expandTitle: 'Expand sidebar',
     collapseLevel: 'Collapse one level',
     expandLevel: 'Expand one level',
+    importFile: 'Import file',
+    newFile: 'New file',
     sync: {
       synced: 'Synced',
       unpushed: 'awaiting push',
@@ -105,6 +108,7 @@ export const en = {
   },
   ask: {
     title: 'MindOS Agent',
+    fabLabel: 'Ask AI',
     placeholder: 'Ask a question... @ files, / skills',
     emptyPrompt: 'Ask anything about your knowledge base',
     send: 'send',
@@ -118,13 +122,17 @@ export const en = {
     skillsHint: 'skills',
     attachCurrent: 'attach current file',
     stopTitle: 'Stop',
-    connecting: 'Thinking with your mind...',
+    cancelReconnect: 'Cancel reconnect',
+    connecting: 'Thinking with you...',
     thinking: 'Thinking...',
     thinkingLabel: 'Thinking',
     searching: 'Searching knowledge base...',
     generating: 'Generating response...',
     stopped: 'Generation stopped.',
     errorNoResponse: 'No response from AI. Please check your API key and provider settings.',
+    reconnecting: (attempt: number, max: number) => `Connection lost. Reconnecting (${attempt}/${max})...`,
+    reconnectFailed: 'Connection failed after multiple attempts.',
+    retry: 'Retry',
     suggestions: [
       'Summarize this document',
       'List all action items and TODOs',
@@ -637,6 +645,8 @@ export const en = {
     },
     detailSubtitle: '',
     detailNotFound: 'Agent not found — it may have been removed or renamed.',
+    detailNotFoundHint: 'The agent may have disconnected or its configuration file was moved. Try restarting the agent or check the MCP configuration.',
+    detailNotFoundSuggestion: 'Connected agents you can explore:',
   },
   shortcutPanel: {
     title: 'Keyboard Shortcuts',
@@ -718,10 +728,56 @@ export const en = {
     dropOverlay: 'Drop files to import into knowledge base',
     dropOverlayFormats: 'Supports .md .txt .pdf .csv .json .yaml .html',
     onboardingHint: 'Already have notes? Import files →',
-    digestPromptSingle: (name: string) => `Please read ${name}, extract key information and organize it into the appropriate place in my knowledge base.`,
-    digestPromptMulti: (n: number) => `Please read these ${n} files, extract key information and organize each into the appropriate place in my knowledge base.`,
+    digestPromptSingle: (name: string, targetSpace?: string) => {
+      const loc = targetSpace ? ` under the "${targetSpace}" space` : '';
+      return `The user uploaded "${name}". You MUST:\n1. Read the content from the "USER-UPLOADED FILES" section above\n2. Extract and reorganize the key information into well-structured Markdown notes\n3. Save the result${loc} in the knowledge base — create new files or update existing ones as appropriate\n\nDo NOT just reply with a text summary. You must actually write to the knowledge base.`;
+    },
+    digestPromptMulti: (n: number, targetSpace?: string) => {
+      const loc = targetSpace ? ` under the "${targetSpace}" space` : '';
+      return `The user uploaded ${n} files. You MUST:\n1. Read their content from the "USER-UPLOADED FILES" section above\n2. Extract and reorganize the key information into well-structured Markdown notes\n3. Save the results${loc} in the knowledge base — create new files or update existing ones as appropriate\n\nDo NOT just reply with a text summary. You must actually write to the knowledge base.`;
+    },
     arrowTo: '→',
     remove: 'Remove',
+    conflictsFound: (n: number) => `${n} file${n !== 1 ? 's' : ''} already exist${n === 1 ? 's' : ''}`,
+    organizeTitle: 'AI Organizing',
+    organizeProcessing: 'AI is analyzing and organizing your files...',
+    organizeConnecting: 'Connecting to AI...',
+    organizeAnalyzing: 'AI is analyzing your files...',
+    organizeReading: (detail?: string) => detail ? `Reading ${detail}...` : 'Reading files...',
+    organizeThinking: 'AI is thinking deeply...',
+    organizeWriting: (detail?: string) => detail ? `Writing ${detail}...` : 'Writing files...',
+    organizeElapsed: (seconds: number) => {
+      const m = Math.floor(seconds / 60);
+      const s = seconds % 60;
+      return `${m}:${s.toString().padStart(2, '0')}`;
+    },
+    organizeCancel: 'Cancel',
+    organizeMinimize: 'Continue browsing',
+    organizeExpand: 'View',
+    organizeCreating: (path: string) => `Creating ${path}`,
+    organizeUpdating: (path: string) => `Updating ${path}`,
+    organizeReviewTitle: 'Organization Complete',
+    organizeErrorTitle: 'Organization Failed',
+    organizeReviewDesc: (n: number) => `AI organized your files into ${n} change${n !== 1 ? 's' : ''}`,
+    organizeCreated: 'Created',
+    organizeUpdated: 'Updated',
+    organizeFailed: 'Failed',
+    organizeNoChanges: 'AI analyzed your files but made no changes.',
+    organizeToolCallsInfo: (n: number) => `AI executed ${n} operation${n > 1 ? 's' : ''} — check knowledge base for updates`,
+    organizeError: 'Organization failed',
+    organizeRetry: 'Retry',
+    organizeDone: 'Done',
+    organizeUndoAll: 'Undo All',
+    organizeUndoOne: 'Undo',
+    organizeUndone: 'Undone',
+    organizeViewFile: 'View file',
+    organizeUndoSuccess: (n: number) => `Reverted ${n} file${n !== 1 ? 's' : ''}`,
+  },
+  importHistory: {
+    title: 'Import History',
+    clearAll: 'Clear history',
+    emptyTitle: 'No import history yet',
+    emptyDesc: 'AI organize results will appear here',
   },
   dirView: {
     gridView: 'Grid view',
@@ -741,7 +797,7 @@ export const en = {
   },
   settings: {
     title: 'Settings',
-    tabs: { ai: 'AI', appearance: 'Appearance', knowledge: 'General', sync: 'Sync', mcp: 'MCP & Skills', plugins: 'Plugins', shortcuts: 'Shortcuts', monitoring: 'Monitoring', agents: 'Agents', update: 'Update' },
+    tabs: { ai: 'AI', appearance: 'Appearance', knowledge: 'General', sync: 'Sync', mcp: 'MCP & Skills', plugins: 'Plugins', shortcuts: 'Shortcuts', monitoring: 'Monitoring', agents: 'Agents', update: 'Update', uninstall: 'Uninstall' },
     ai: {
       provider: 'Provider',
       model: 'Model',
@@ -776,6 +832,8 @@ export const en = {
       thinkingHint: "Show Claude's reasoning process (uses more tokens)",
       thinkingBudget: 'Thinking Budget',
       thinkingBudgetHint: 'Max tokens for reasoning (1000-50000)',
+      reconnectRetries: 'Auto Reconnect',
+      reconnectRetriesHint: 'When connection drops, automatically retry this many times before giving up (0 = disabled)',
     },
     appearance: {
       readingFont: 'Reading font',
@@ -1000,6 +1058,29 @@ export const en = {
       desktopRestart: 'Restart Now',
       desktopHint: 'Updates are delivered through the Desktop app auto-updater.',
     },
+    uninstall: {
+      title: 'Uninstall MindOS',
+      descCli: 'Remove MindOS CLI, background services, and configuration files from this machine.',
+      descDesktop: 'Remove MindOS Desktop, background services, and configuration files from this machine.',
+      warning: 'Select what to clean up. Your knowledge base files are always kept safe.',
+      stopServices: 'Stop services & remove daemon',
+      stopServicesDesc: 'Stop all running MindOS processes and remove the background daemon.',
+      removeConfig: 'Remove configuration',
+      removeConfigDesc: 'Delete ~/.mindos/ directory (config, logs, PID files).',
+      removeNpm: 'Uninstall CLI package',
+      removeNpmDesc: 'Run npm uninstall -g @geminilight/mindos.',
+      removeApp: 'Move Desktop app to Trash',
+      removeAppDesc: 'Move MindOS.app to Trash. You can restore it later if needed.',
+      confirmTitle: 'Confirm Uninstall',
+      confirmButton: 'Uninstall',
+      cancelButton: 'Cancel',
+      running: 'Uninstalling...',
+      success: 'MindOS has been uninstalled.',
+      successDesktop: 'MindOS has been uninstalled. The app will quit now.',
+      error: 'Uninstall failed. You can run `mindos uninstall` in terminal manually.',
+      nothingSelected: 'Select at least one item to uninstall.',
+      kbSafe: 'Your knowledge base files are always safe — they are never deleted by this action.',
+    },
   },
   onboarding: {
     subtitle: 'Your knowledge base is empty. Pick a starter template to get going.',

package/app/lib/i18n-zh.ts

@@ -97,12 +97,15 @@ export const zh = {
     agents: '智能体',
     echo: '回响',
     discover: '探索',
+    history: '历史',
     help: '帮助',
     syncLabel: '同步',
     collapseTitle: '收起侧栏',
     expandTitle: '展开侧栏',
     collapseLevel: '折叠一级',
     expandLevel: '展开一级',
+    importFile: '导入文件',
+    newFile: '新建文件',
     sync: {
       synced: '已同步',
       unpushed: '待推送',
@@ -130,6 +133,7 @@ export const zh = {
   },
   ask: {
     title: 'MindOS Agent',
+    fabLabel: 'AI 助手',
     placeholder: '输入问题… @ 附加文件，/ 技能',
     emptyPrompt: '可以问任何关于知识库的问题',
     send: '发送',
@@ -143,13 +147,17 @@ export const zh = {
     skillsHint: '技能',
     attachCurrent: '附加当前文件',
     stopTitle: '停止',
-    connecting: '正在与你的心智一起思考...',
+    cancelReconnect: '取消重连',
+    connecting: '正在和你一起思考...',
     thinking: '思考中...',
     thinkingLabel: '思考中',
     searching: '正在搜索知识库...',
     generating: '正在生成回复...',
     stopped: '已停止生成。',
     errorNoResponse: 'AI 未返回响应，请检查 API Key 和服务商设置。',
+    reconnecting: (attempt: number, max: number) => `连接中断，正在重连 (${attempt}/${max})...`,
+    reconnectFailed: '多次重连失败，请检查网络后重试。',
+    retry: '重试',
     suggestions: [
       '总结这篇文档',
       '列出所有待办事项',
@@ -661,6 +669,8 @@ export const zh = {
     },
     detailSubtitle: '',
     detailNotFound: '未找到该 Agent，可能已移除或重命名。',
+    detailNotFoundHint: '该 Agent 可能已断开连接或配置文件已移动。请尝试重启 Agent 或检查 MCP 配置。',
+    detailNotFoundSuggestion: '已连接的 Agent：',
   },
   shortcutPanel: {
     title: '快捷键',
@@ -742,10 +752,56 @@ export const zh = {
     dropOverlay: '松开鼠标，导入文件到知识库',
     dropOverlayFormats: '支持 .md .txt .pdf .csv .json .yaml .html',
     onboardingHint: '已有笔记？导入文件到知识库 →',
-    digestPromptSingle: (name: string) => `请阅读 ${name}，提取关键信息整理到知识库中合适的位置。`,
-    digestPromptMulti: (n: number) => `请阅读这 ${n} 个文件，提取关键信息分别整理到知识库中合适的位置。`,
+    digestPromptSingle: (name: string, targetSpace?: string) => {
+      const loc = targetSpace ? `"${targetSpace}" 空间下` : '知识库中合适的位置';
+      return `用户上传了「${name}」。你必须：\n1. 从上方「USER-UPLOADED FILES」区域读取文件内容\n2. 提取和重新整理关键信息为结构清晰的 Markdown 笔记\n3. 将整理后的内容保存到${loc}——可以创建新文件，也可以更新已有文件\n\n不要只做文字回复。你必须实际写入知识库。`;
+    },
+    digestPromptMulti: (n: number, targetSpace?: string) => {
+      const loc = targetSpace ? `"${targetSpace}" 空间下` : '知识库中合适的位置';
+      return `用户上传了 ${n} 个文件。你必须：\n1. 从上方「USER-UPLOADED FILES」区域读取它们的内容\n2. 提取和重新整理关键信息为结构清晰的 Markdown 笔记\n3. 将整理后的内容保存到${loc}——可以创建新文件，也可以更新已有文件\n\n不要只做文字回复。你必须实际写入知识库。`;
+    },
     arrowTo: '→',
     remove: '移除',
+    conflictsFound: (n: number) => `${n} 个文件已存在`,
+    organizeTitle: 'AI 整理中',
+    organizeProcessing: 'AI 正在分析和整理你的文件...',
+    organizeConnecting: '正在连接 AI...',
+    organizeAnalyzing: 'AI 正在分析你的文件...',
+    organizeReading: (detail?: string) => detail ? `正在阅读 ${detail}...` : '正在阅读文件...',
+    organizeThinking: 'AI 正在深度思考...',
+    organizeWriting: (detail?: string) => detail ? `正在写入 ${detail}...` : '正在写入文件...',
+    organizeElapsed: (seconds: number) => {
+      const m = Math.floor(seconds / 60);
+      const s = seconds % 60;
+      return `${m}:${s.toString().padStart(2, '0')}`;
+    },
+    organizeCancel: '取消',
+    organizeMinimize: '继续浏览',
+    organizeExpand: '查看',
+    organizeCreating: (path: string) => `正在创建 ${path}`,
+    organizeUpdating: (path: string) => `正在更新 ${path}`,
+    organizeReviewTitle: '整理完成',
+    organizeErrorTitle: '整理失败',
+    organizeReviewDesc: (n: number) => `AI 整理了 ${n} 处变更`,
+    organizeCreated: '已创建',
+    organizeUpdated: '已更新',
+    organizeFailed: '失败',
+    organizeNoChanges: 'AI 分析了你的文件，但没有做任何更改。',
+    organizeToolCallsInfo: (n: number) => `AI 执行了 ${n} 个操作 — 请检查知识库查看更新`,
+    organizeError: '整理失败',
+    organizeRetry: '重试',
+    organizeDone: '完成',
+    organizeUndoAll: '撤销全部',
+    organizeUndoOne: '撤销',
+    organizeUndone: '已撤销',
+    organizeViewFile: '查看文件',
+    organizeUndoSuccess: (n: number) => `已撤销 ${n} 个文件`,
+  },
+  importHistory: {
+    title: '导入历史',
+    clearAll: '清空历史',
+    emptyTitle: '暂无导入记录',
+    emptyDesc: 'AI 整理的结果会出现在这里',
   },
   dirView: {
     gridView: '网格视图',
@@ -765,7 +821,7 @@ export const zh = {
   },
   settings: {
     title: '设置',
-    tabs: { ai: 'AI', appearance: '外观', knowledge: '通用', sync: '同步', mcp: 'MCP & Skills', plugins: '插件', shortcuts: '快捷键', monitoring: '监控', agents: 'Agents', update: '更新' },
+    tabs: { ai: 'AI', appearance: '外观', knowledge: '通用', sync: '同步', mcp: 'MCP & Skills', plugins: '插件', shortcuts: '快捷键', monitoring: '监控', agents: 'Agents', update: '更新', uninstall: '卸载' },
     ai: {
       provider: '服务商',
       model: '模型',
@@ -800,6 +856,8 @@ export const zh = {
       thinkingHint: '显示 Claude 的推理过程（消耗更多 token）',
       thinkingBudget: '思考预算',
       thinkingBudgetHint: '推理最大 token 数（1000-50000）',
+      reconnectRetries: '自动重连',
+      reconnectRetriesHint: '连接断开时自动重试次数，重试耗尽后停止（0 = 关闭）',
     },
     appearance: {
       readingFont: '正文字体',
@@ -1024,6 +1082,29 @@ export const zh = {
       desktopRestart: '立即重启',
       desktopHint: '更新通过桌面端自动更新推送。',
     },
+    uninstall: {
+      title: '卸载 MindOS',
+      descCli: '从本机移除 MindOS CLI、后台服务和配置文件。',
+      descDesktop: '从本机移除 MindOS Desktop、后台服务和配置文件。',
+      warning: '选择要清理的内容。你的知识库文件始终是安全的。',
+      stopServices: '停止服务并移除守护进程',
+      stopServicesDesc: '停止所有运行中的 MindOS 进程并移除后台守护进程。',
+      removeConfig: '移除配置',
+      removeConfigDesc: '删除 ~/.mindos/ 目录（配置、日志、PID 文件）。',
+      removeNpm: '卸载 CLI 包',
+      removeNpmDesc: '执行 npm uninstall -g @geminilight/mindos。',
+      removeApp: '将 Desktop 移入废纸篓',
+      removeAppDesc: '将 MindOS.app 移入废纸篓，之后可以恢复。',
+      confirmTitle: '确认卸载',
+      confirmButton: '卸载',
+      cancelButton: '取消',
+      running: '正在卸载...',
+      success: 'MindOS 已卸载。',
+      successDesktop: 'MindOS 已卸载，应用即将退出。',
+      error: '卸载失败，可在终端手动运行 `mindos uninstall`。',
+      nothingSelected: '请至少选择一项要卸载的内容。',
+      kbSafe: '你的知识库文件始终是安全的——此操作绝不会删除它们。',
+    },
   },
   onboarding: {
     subtitle: '知识库为空，选择一个模板快速开始。',

package/app/lib/organize-history.ts

@@ -0,0 +1,74 @@
+'use client';
+
+// ---------------------------------------------------------------------------
+// Organize History — localStorage persistence for past AI organize operations
+// ---------------------------------------------------------------------------
+
+export interface OrganizeHistoryFile {
+  action: 'create' | 'update' | 'unknown';
+  path: string;
+  ok: boolean;
+  /** Undone by user (deleted for create / restored for update) */
+  undone?: boolean;
+}
+
+export interface OrganizeHistoryEntry {
+  id: string;
+  /** Unix ms */
+  timestamp: number;
+  /** Original uploaded file names */
+  sourceFiles: string[];
+  files: OrganizeHistoryFile[];
+  status: 'completed' | 'partial' | 'undone';
+}
+
+const STORAGE_KEY = 'mindos:organize-history';
+const MAX_ENTRIES = 50;
+
+export function loadHistory(): OrganizeHistoryEntry[] {
+  if (typeof window === 'undefined') return [];
+  try {
+    const raw = localStorage.getItem(STORAGE_KEY);
+    if (!raw) return [];
+    return JSON.parse(raw) as OrganizeHistoryEntry[];
+  } catch {
+    return [];
+  }
+}
+
+export function saveHistory(entries: OrganizeHistoryEntry[]): void {
+  if (typeof window === 'undefined') return;
+  try {
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(entries.slice(0, MAX_ENTRIES)));
+  } catch { /* quota exceeded — silently drop oldest */ }
+}
+
+export function appendEntry(entry: OrganizeHistoryEntry): OrganizeHistoryEntry[] {
+  const all = loadHistory();
+  all.unshift(entry);
+  const trimmed = all.slice(0, MAX_ENTRIES);
+  saveHistory(trimmed);
+  return trimmed;
+}
+
+export function updateEntry(id: string, patch: Partial<OrganizeHistoryEntry>): OrganizeHistoryEntry[] {
+  const all = loadHistory();
+  const idx = all.findIndex(e => e.id === id);
+  if (idx >= 0) {
+    all[idx] = { ...all[idx], ...patch };
+    saveHistory(all);
+  }
+  return all;
+}
+
+export function clearHistory(): void {
+  if (typeof window === 'undefined') return;
+  try {
+    localStorage.removeItem(STORAGE_KEY);
+  } catch { /* ignore */ }
+}
+
+let _idCounter = 0;
+export function generateEntryId(): string {
+  return `org-${Date.now()}-${++_idCounter}`;
+}

package/app/lib/settings.ts

@@ -23,6 +23,7 @@ export interface AgentConfig {
   enableThinking?: boolean;   // default false, Anthropic only
   thinkingBudget?: number;    // default 5000
   contextStrategy?: 'auto' | 'off'; // default 'auto'
+  reconnectRetries?: number;  // default 3, range 0-10 (0 = disabled)
 }
 
 export interface GuideState {
@@ -128,6 +129,7 @@ function parseAgent(raw: unknown): AgentConfig | undefined {
   if (typeof obj.enableThinking === 'boolean') result.enableThinking = obj.enableThinking;
   if (typeof obj.thinkingBudget === 'number') result.thinkingBudget = Math.min(50000, Math.max(1000, obj.thinkingBudget));
   if (obj.contextStrategy === 'auto' || obj.contextStrategy === 'off') result.contextStrategy = obj.contextStrategy;
+  if (typeof obj.reconnectRetries === 'number') result.reconnectRetries = Math.min(10, Math.max(0, obj.reconnectRetries));
   return Object.keys(result).length > 0 ? result : undefined;
 }
 

package/app/lib/types.ts

@@ -41,6 +41,8 @@ export interface Message {
   timestamp?: number;
   /** Structured parts for assistant messages (tool calls + text segments) */
   parts?: MessagePart[];
+  /** Skill name used for this user message (rendered as a capsule in the UI) */
+  skillName?: string;
 }
 
 export interface LocalAttachment {

package/app/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/app/next.config.ts

@@ -1,21 +1,39 @@
 import type { NextConfig } from "next";
 import path from "path";
 
+// When MindOS is installed globally via npm, the entire project lives
+// under node_modules/@geminilight/mindos/. Next.js skips tsconfig path
+// resolution and SWC TypeScript compilation for files inside node_modules.
+// We detect this at config time and apply the necessary overrides.
+const projectDir = path.resolve(__dirname);
+const inNodeModules = projectDir.includes('node_modules');
+
 const nextConfig: NextConfig = {
-  transpilePackages: ['github-slugger'],
+  transpilePackages: [
+    'github-slugger',
+    // Self-reference: ensures the SWC loader compiles our own TypeScript
+    // when the project is inside node_modules (global npm install).
+    ...(inNodeModules ? ['@geminilight/mindos'] : []),
+  ],
   serverExternalPackages: ['chokidar', 'openai', '@mariozechner/pi-ai', '@mariozechner/pi-agent-core', '@mariozechner/pi-coding-agent', 'mcporter'],
   output: 'standalone',
-  outputFileTracingRoot: path.join(__dirname),
+  outputFileTracingRoot: projectDir,
   turbopack: {
-    root: path.join(__dirname),
+    root: projectDir,
   },
-  // Disable client-side router cache for dynamic layouts so that
-  // router.refresh() always fetches a fresh file tree from the server.
   experimental: {
     staleTimes: {
       dynamic: 0,
     },
   },
+  webpack: (config) => {
+    if (inNodeModules) {
+      config.resolve = config.resolve ?? {};
+      config.resolve.alias = config.resolve.alias ?? {};
+      (config.resolve.alias as Record<string, string>)['@'] = projectDir;
+    }
+    return config;
+  },
 };
 
 export default nextConfig;

package/app/package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev -p ${MINDOS_WEB_PORT:-3456}",
     "prebuild": "node ../scripts/gen-renderer-index.js",
-    "build": "next build",
+    "build": "next build --webpack",
     "start": "next start -p ${MINDOS_WEB_PORT:-3456}",
     "lint": "eslint",
     "test": "vitest run",

package/bin/cli.js

@@ -40,7 +40,7 @@
 
 import { execSync, spawn as nodeSpawn } from 'node:child_process';
 import { existsSync, readFileSync, writeFileSync, rmSync, cpSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { dirname, resolve } from 'node:path';
 import { homedir } from 'node:os';
 
 import { ROOT, CONFIG_PATH, BUILD_STAMP, LOG_PATH, MINDOS_DIR } from './lib/constants.js';
@@ -57,6 +57,7 @@ import { stopMindos } from './lib/stop.js';
 import { getPlatform, ensureMindosDir, waitForHttp, waitForPortFree, runGatewayCommand } from './lib/gateway.js';
 import { printStartupInfo, getLocalIP } from './lib/startup.js';
 import { spawnMcp } from './lib/mcp-spawn.js';
+import { ensureMcpBundle } from './lib/mcp-build.js';
 import { mcpInstall } from './lib/mcp-install.js';
 import { initSync, startSyncDaemon, stopSyncDaemon, getSyncStatus, manualSync, listConflicts, setSyncEnabled } from './lib/sync.js';
 
@@ -140,7 +141,7 @@ if (cmd === '--version' || cmd === '-v') {
 
 const isDaemon  = process.argv.includes('--daemon') || (!cmd && isDaemonMode());
 const isVerbose = process.argv.includes('--verbose');
-const extra     = process.argv.slice(3).filter(a => a !== '--daemon' && a !== '--verbose').join(' ');
+const extra     = process.argv.slice(3).filter(a => a !== '--daemon' && a !== '--verbose' && a !== '--turbo').join(' ');
 
 const commands = {
   // ── onboard ────────────────────────────────────────────────────────────────
@@ -267,10 +268,12 @@ const commands = {
   // ── dev ────────────────────────────────────────────────────────────────────
   dev: async () => {
     loadConfig();
+    if (!process.env.MINDOS_WEB_PORT) process.env.MINDOS_WEB_PORT = '3456';
+    if (!process.env.MINDOS_MCP_PORT) process.env.MINDOS_MCP_PORT = '8781';
     process.env.MINDOS_CLI_PATH = resolve(ROOT, 'bin', 'cli.js');
     process.env.MINDOS_NODE_BIN = process.execPath;
-    const webPort = process.env.MINDOS_WEB_PORT || '3456';
-    const mcpPort = process.env.MINDOS_MCP_PORT || '8781';
+    const webPort = process.env.MINDOS_WEB_PORT;
+    const mcpPort = process.env.MINDOS_MCP_PORT;
     await assertPortFree(Number(webPort), 'web');
     await assertPortFree(Number(mcpPort), 'mcp');
     ensureAppDeps();
@@ -303,8 +306,10 @@ const commands = {
         console.warn(yellow('Warning: daemon mode not supported on this platform. Falling back to foreground.'));
       } else {
         loadConfig();
-        const webPort = process.env.MINDOS_WEB_PORT || '3456';
-        const mcpPort = process.env.MINDOS_MCP_PORT || '8781';
+        if (!process.env.MINDOS_WEB_PORT) process.env.MINDOS_WEB_PORT = '3456';
+        if (!process.env.MINDOS_MCP_PORT) process.env.MINDOS_MCP_PORT = '8781';
+        const webPort = process.env.MINDOS_WEB_PORT;
+        const mcpPort = process.env.MINDOS_MCP_PORT;
         console.log(cyan(`Installing MindOS as a background service (${platform})...`));
         await runGatewayCommand('install');
         // install() already starts the service via launchctl bootstrap + RunAtLoad=true.
@@ -334,8 +339,10 @@ const commands = {
       }
     }
     loadConfig();
-    const webPort = process.env.MINDOS_WEB_PORT || '3456';
-    const mcpPort = process.env.MINDOS_MCP_PORT || '8781';
+    if (!process.env.MINDOS_WEB_PORT) process.env.MINDOS_WEB_PORT = '3456';
+    if (!process.env.MINDOS_MCP_PORT) process.env.MINDOS_MCP_PORT = '8781';
+    const webPort = process.env.MINDOS_WEB_PORT;
+    const mcpPort = process.env.MINDOS_MCP_PORT;
 
     // ── Auto-migrate user-rules.md to root user-skill-rules.md ─────────────
     try {
@@ -382,7 +389,7 @@ const commands = {
       console.log(yellow('Building MindOS (first run or new version detected)...\n'));
       cleanNextDir();
       run('node scripts/gen-renderer-index.js', ROOT);
-      run(`${NEXT_BIN} build`, resolve(ROOT, 'app'));
+      run(`${NEXT_BIN} build --webpack`, resolve(ROOT, 'app'));
       writeBuildStamp();
     }
     const mcp = spawnMcp(isVerbose);
@@ -397,7 +404,7 @@ const commands = {
     run(
       `${NEXT_BIN} start -p ${webPort} ${extra}`,
       resolve(ROOT, 'app'),
-      process.env.HOSTNAME ? undefined : { HOSTNAME: '127.0.0.1' }
+      { HOSTNAME: '127.0.0.1' }
     );
   },
 
@@ -406,7 +413,7 @@ const commands = {
     ensureAppDeps();
     cleanNextDir();
     run('node scripts/gen-renderer-index.js', ROOT);
-    run(`${NEXT_BIN} build ${extra}`, resolve(ROOT, 'app'));
+    run(`${NEXT_BIN} build --webpack ${extra}`, resolve(ROOT, 'app'));
     writeBuildStamp();
   },
 
@@ -416,11 +423,7 @@ const commands = {
     const hasInstallFlags = restArgs.some(a => ['-g', '--global', '-y', '--yes'].includes(a));
     if (sub === 'install' || hasInstallFlags) { await mcpInstall(); return; }
     loadConfig();
-    const mcpSdk = resolve(ROOT, 'mcp', 'node_modules', '@modelcontextprotocol', 'sdk', 'package.json');
-    if (!existsSync(mcpSdk)) {
-      console.log(yellow('Installing MCP dependencies (first run)...\n'));
-      npmInstall(resolve(ROOT, 'mcp'), '--no-workspaces');
-    }
+    ensureMcpBundle();
     // `mindos mcp` is the entry point for MCP clients (Claude Code, Cursor, etc.)
     // which communicate over stdin/stdout. Default to stdio; HTTP is handled by
     // `mindos start` via spawnMcp(). Callers can still override via env.
@@ -784,7 +787,7 @@ ${dim('Shortcut: mindos start --daemon  →  install + start in one step')}
       const webPort = updateConfig.port ?? 3456;
       const mcpPort = updateConfig.mcpPort ?? 8781;
       console.log(dim('  (Waiting for Web UI to come back up — first run after update includes a rebuild...)'));
-      const ready = await waitForHttp(Number(webPort), { retries: 120, intervalMs: 2000, label: 'Web UI', logFile: LOG_PATH });
+      const ready = await waitForHttp(Number(webPort), { retries: 180, intervalMs: 2000, label: 'Web UI', logFile: LOG_PATH });
       if (ready) {
         const localIP = getLocalIP();
         console.log(`\n${'─'.repeat(53)}`);
@@ -843,7 +846,7 @@ ${dim('Shortcut: mindos start --daemon  →  install + start in one step')}
         child.unref();
 
         console.log(dim('  (Waiting for Web UI to come back up...)'));
-        const ready = await waitForHttp(webPort, { retries: 120, intervalMs: 2000, label: 'Web UI', logFile: LOG_PATH });
+        const ready = await waitForHttp(webPort, { retries: 180, intervalMs: 2000, label: 'Web UI', logFile: LOG_PATH });
         if (ready) {
           const localIP = getLocalIP();
           console.log(`\n${'─'.repeat(53)}`);