coding-tool-x 3.6.13 → 3.7.0

package/src/server/services/prompts-service.js

@@ -16,17 +16,22 @@ const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homed
 const PROMPTS_FILE = PATHS.prompts;
 
 // 各平台提示词文件路径
-const CLAUDE_PROMPT_PATH = path.join(HOME_DIR, '.claude', 'CLAUDE.md');
+const CLAUDE_CONFIG_DIR = NATIVE_PATHS.claude.dir || path.dirname(NATIVE_PATHS.claude.settings);
+const CLAUDE_PROMPT_PATH = NATIVE_PATHS.claude.prompt || path.join(CLAUDE_CONFIG_DIR, 'CLAUDE.md');
 const CODEX_PROMPT_PATH = path.join(HOME_DIR, '.codex', 'AGENTS.md');
 const GEMINI_PROMPT_PATH = path.join(HOME_DIR, '.gemini', 'GEMINI.md');
 const OPENCODE_PROMPT_PATH = path.join(NATIVE_PATHS.opencode.config, 'AGENTS.md');
+const PI_PROMPTS_DIR = NATIVE_PATHS.pi?.prompts
+  || path.join(NATIVE_PATHS.pi?.dir || path.join(HOME_DIR, '.omp', 'agent'), 'prompts');
+const MANAGED_OMP_PROMPTS_DIR = path.join(PI_PROMPTS_DIR, 'coding-tool-x');
 
-function normalizeApps(apps = {}, defaults = { claude: true, codex: true, gemini: true, opencode: false }) {
+function normalizeApps(apps = {}, defaults = { claude: true, codex: true, gemini: true, opencode: false, pi: false }) {
   return {
     claude: apps.claude !== undefined ? !!apps.claude : defaults.claude,
     codex: apps.codex !== undefined ? !!apps.codex : defaults.codex,
     gemini: apps.gemini !== undefined ? !!apps.gemini : defaults.gemini,
-    opencode: apps.opencode !== undefined ? !!apps.opencode : defaults.opencode
+    opencode: apps.opencode !== undefined ? !!apps.opencode : defaults.opencode,
+    pi: apps.pi !== undefined ? !!apps.pi : defaults.pi
   };
 }
 
@@ -211,7 +216,7 @@ function initPromptsData() {
         name: '当前使用',
         description: '从现有配置导入',
         content: existingContent,
-        apps: normalizeApps({ claude: true, codex: false, gemini: false, opencode: false }),
+        apps: normalizeApps({ claude: true, codex: false, gemini: false, opencode: false, pi: false }),
         isBuiltin: false,
         isImported: true,
         createdAt: Date.now(),
@@ -234,6 +239,7 @@ function initPromptsData() {
       preset.apps.codex !== normalizedApps.codex ||
       preset.apps.gemini !== normalizedApps.gemini ||
       preset.apps.opencode !== normalizedApps.opencode
+      || preset.apps.pi !== normalizedApps.pi
     ) {
       preset.apps = normalizedApps;
       updated = true;
@@ -307,6 +313,7 @@ function savePreset(preset) {
 
   const data = initPromptsData();
   const existing = data.presets[preset.id];
+  const wasActive = data.activePresetId === preset.id;
 
   // 内置模板不允许修改
   if (existing && existing.isBuiltin) {
@@ -325,6 +332,13 @@ function savePreset(preset) {
   data.presets[preset.id] = preset;
   writeJsonFile(PROMPTS_FILE, data);
 
+  if (wasActive) {
+    if (existing && normalizeApps(existing.apps).pi && !preset.apps.pi) {
+      deleteOmpPromptTemplate(existing);
+    }
+    syncPresetToAllPlatforms(preset);
+  }
+
   return preset;
 }
 
@@ -348,6 +362,10 @@ function deletePreset(id) {
     data.activePresetId = null;
   }
 
+  if (normalizeApps(preset.apps).pi) {
+    deleteOmpPromptTemplate(preset);
+  }
+
   delete data.presets[id];
   writeJsonFile(PROMPTS_FILE, data);
 
@@ -360,6 +378,7 @@ function deletePreset(id) {
 async function activatePreset(id) {
   const data = initPromptsData();
   const preset = data.presets[id];
+  const previousPreset = data.activePresetId ? data.presets[data.activePresetId] : null;
 
   if (!preset) {
     throw new Error(`预设 "${id}" 不存在`);
@@ -369,6 +388,10 @@ async function activatePreset(id) {
   data.activePresetId = id;
   writeJsonFile(PROMPTS_FILE, data);
 
+  if (previousPreset && previousPreset.id !== id && normalizeApps(previousPreset.apps).pi) {
+    deleteOmpPromptTemplate(previousPreset);
+  }
+
   // 同步到各平台
   await syncPresetToAllPlatforms(preset);
 
@@ -380,6 +403,7 @@ async function activatePreset(id) {
  */
 async function deactivatePrompt() {
   const data = initPromptsData();
+  const activePreset = data.activePresetId ? data.presets[data.activePresetId] : null;
 
   // 清空激活状态
   data.activePresetId = null;
@@ -390,7 +414,10 @@ async function deactivatePrompt() {
     claude: deleteFile(CLAUDE_PROMPT_PATH),
     codex: deleteFile(CODEX_PROMPT_PATH),
     gemini: deleteFile(GEMINI_PROMPT_PATH),
-    opencode: deleteFile(OPENCODE_PROMPT_PATH)
+    opencode: deleteFile(OPENCODE_PROMPT_PATH),
+    pi: activePreset && normalizeApps(activePreset.apps).pi
+      ? deleteOmpPromptTemplate(activePreset)
+      : false
   };
 
   console.log('[Prompts] Deactivated and removed prompt files:', results);
@@ -405,7 +432,7 @@ async function deactivatePrompt() {
 /**
  * 同步预设到所有已启用的平台
  */
-async function syncPresetToAllPlatforms(preset) {
+function syncPresetToAllPlatforms(preset) {
   const apps = normalizeApps(preset.apps);
   const { content } = preset;
 
@@ -428,6 +455,43 @@ async function syncPresetToAllPlatforms(preset) {
     writeTextFile(OPENCODE_PROMPT_PATH, content);
     console.log('[Prompts] Synced to OpenCode:', OPENCODE_PROMPT_PATH);
   }
+
+  if (apps.pi) {
+    const targetPath = writeOmpPromptTemplate(preset);
+    console.log('[Prompts] Synced to OMP:', targetPath);
+  }
+}
+
+function buildOmpPromptFileName(preset) {
+  const rawId = (preset?.id || 'preset').toString().trim();
+  const safeId = rawId.replace(/[^a-zA-Z0-9_-]/g, '-').replace(/-+/g, '-').slice(0, 100) || 'preset';
+  return `${safeId}.md`;
+}
+
+function getOmpPromptTemplatePath(preset) {
+  return path.join(MANAGED_OMP_PROMPTS_DIR, buildOmpPromptFileName(preset));
+}
+
+function escapeFrontmatterValue(value) {
+  return String(value || '')
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\r?\n/g, ' ');
+}
+
+function buildOmpPromptTemplateContent(preset) {
+  const description = escapeFrontmatterValue(preset.description || preset.name || preset.id);
+  return `---\ndescription: "${description}"\n---\n\n${preset.content || ''}`;
+}
+
+function writeOmpPromptTemplate(preset) {
+  const filePath = getOmpPromptTemplatePath(preset);
+  writeTextFile(filePath, buildOmpPromptTemplateContent(preset));
+  return filePath;
+}
+
+function deleteOmpPromptTemplate(preset) {
+  return deleteFile(getOmpPromptTemplatePath(preset));
 }
 
 /**
@@ -443,11 +507,46 @@ function readPlatformPrompt(platform) {
       return readTextFile(GEMINI_PROMPT_PATH, '');
     case 'opencode':
       return readTextFile(OPENCODE_PROMPT_PATH, '');
+    case 'pi':
+      throw new Error('OMP 使用 prompts/ 目录中的模板文件，请通过平台状态查看模板列表');
     default:
       throw new Error(`无效的平台: ${platform}`);
   }
 }
 
+function listOmpPromptTemplates() {
+  if (!fs.existsSync(PI_PROMPTS_DIR)) {
+    return [];
+  }
+
+  const results = [];
+  const walk = (dir) => {
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (entry.name.startsWith('.')) continue;
+      const fullPath = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        walk(fullPath);
+      } else if (entry.isFile() && path.extname(entry.name).toLowerCase() === '.md') {
+        const relativePath = path.relative(PI_PROMPTS_DIR, fullPath);
+        results.push({
+          name: path.basename(entry.name, '.md'),
+          path: fullPath,
+          relativePath,
+          managed: relativePath.split(path.sep)[0] === 'coding-tool-x'
+        });
+      }
+    }
+  };
+
+  try {
+    walk(PI_PROMPTS_DIR);
+  } catch (err) {
+    console.error(`[Prompts] Failed to list OMP prompt templates:`, err.message);
+  }
+
+  return results.sort((a, b) => a.relativePath.localeCompare(b.relativePath));
+}
+
 /**
  * 获取各平台当前的提示词状态
  */
@@ -472,6 +571,12 @@ function getPlatformStatus() {
       path: OPENCODE_PROMPT_PATH,
       exists: fs.existsSync(OPENCODE_PROMPT_PATH),
       content: readTextFile(OPENCODE_PROMPT_PATH, '')
+    },
+    pi: {
+      path: PI_PROMPTS_DIR,
+      managedPath: MANAGED_OMP_PROMPTS_DIR,
+      exists: fs.existsSync(PI_PROMPTS_DIR),
+      templates: listOmpPromptTemplates()
     }
   };
 }
@@ -494,7 +599,7 @@ function importFromPlatform(platform, presetName) {
     name: presetName || `从 ${platform} 导入`,
     description: `从 ${platform} 导入的提示词`,
     content,
-    apps: normalizeApps({ claude: false, codex: false, gemini: false, opencode: false }),
+    apps: normalizeApps({ claude: false, codex: false, gemini: false, opencode: false, pi: false }),
     isBuiltin: false,
     createdAt: Date.now(),
     updatedAt: Date.now()

package/src/server/services/proxy-log-helper.js

@@ -9,6 +9,7 @@ function normalizeToolSource(source = '') {
   if (normalized === 'codex') return 'codex';
   if (normalized === 'gemini') return 'gemini';
   if (normalized === 'opencode') return 'opencode';
+  if (normalized === 'pi' || normalized === 'pi-agent') return 'pi';
   return 'claude';
 }
 

package/src/server/services/proxy-runtime.js

@@ -11,7 +11,11 @@ const PROXY_START_LOG_PATTERNS = {
   ],
   codex: [/Codex proxy server started on http:\/\/127\.0\.0\.1:\d+/],
   gemini: [/Gemini proxy server started on http:\/\/127\.0\.0\.1:\d+/],
-  opencode: [/OpenCode proxy server started on http:\/\/127\.0\.0\.1:\d+/]
+  opencode: [/OpenCode proxy server started on http:\/\/127\.0\.0\.1:\d+/],
+  pi: [
+    /OMP models\.yml provider config enabled, port: \d+/,
+    /OMP models\.yml 受管 provider 已自动启用，端口: \d+/
+  ]
 };
 
 function getRuntimeFilePath(proxyType) {

package/src/server/services/sessions.js

@@ -17,17 +17,6 @@ const CLAUDE_PROJECTS_DIR = NATIVE_PATHS.claude.projects;
 const CODEX_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.codex.config), 'projects');
 const GEMINI_PROJECTS_DIR = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'projects');
 
-function resolveProjectsDir(config = {}) {
-  return config.projectsDir || CLAUDE_PROJECTS_DIR;
-}
-
-function withResolvedProjectsDir(config = {}) {
-  return {
-    ...config,
-    projectsDir: resolveProjectsDir(config)
-  };
-}
-
 // Base directory for cc-tool data
 function getCcToolDir() {
   return PATHS.base;
@@ -193,7 +182,7 @@ function sliceClaudeSessionContentByUserMessage(content, afterUserMessageNumber)
 
 // Get all projects with stats (async version)
 async function getProjects(config) {
-  const projectsDir = resolveProjectsDir(config);
+  const projectsDir = config.projectsDir;
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -394,17 +383,16 @@ function extractCwdFromSessionHeader(sessionFile) {
 
 // Get projects with detailed stats (with caching) - async version
 async function getProjectsWithStats(config, options = {}) {
-  const resolvedConfig = withResolvedProjectsDir(config);
   if (!options.force) {
     // Check enhanced cache first
-    const cacheKey = `${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`;
+    const cacheKey = `${CacheKeys.PROJECTS}${config.projectsDir}`;
     const enhancedCached = globalCache.get(cacheKey);
     if (enhancedCached) {
       return enhancedCached;
     }
 
     // Check old cache
-    const cached = getCachedProjects(resolvedConfig);
+    const cached = getCachedProjects(config);
     if (cached) {
       globalCache.set(cacheKey, cached, 300000); // 5分钟
       return cached;
@@ -412,22 +400,22 @@ async function getProjectsWithStats(config, options = {}) {
   }
 
   try {
-    const data = await buildProjectsWithStats(resolvedConfig);
+    const data = await buildProjectsWithStats(config);
     if (!Array.isArray(data)) {
-      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${resolvedConfig.projectsDir}, returning empty array.`);
+      console.warn(`[getProjectsWithStats] Unexpected non-array result for ${config.projectsDir}, returning empty array.`);
       return [];
     }
-    setCachedProjects(resolvedConfig, data);
-    globalCache.set(`${CacheKeys.PROJECTS}${resolvedConfig.projectsDir}`, data, 300000);
+    setCachedProjects(config, data);
+    globalCache.set(`${CacheKeys.PROJECTS}${config.projectsDir}`, data, 300000);
     return data;
   } catch (err) {
-    console.error(`[getProjectsWithStats] Failed to build projects for ${resolvedConfig.projectsDir}:`, err);
+    console.error(`[getProjectsWithStats] Failed to build projects for ${config.projectsDir}:`, err);
     return [];
   }
 }
 
 async function buildProjectsWithStats(config) {
-  const projectsDir = resolveProjectsDir(config);
+  const projectsDir = config.projectsDir;
 
   if (!fs.existsSync(projectsDir)) {
     return [];
@@ -494,7 +482,7 @@ async function buildProjectsWithStats(config) {
 
 // 获取 Claude 项目/会话数量（轻量统计）
 function getProjectAndSessionCounts(config) {
-  const projectsDir = resolveProjectsDir(config);
+  const projectsDir = config.projectsDir;
   if (!fs.existsSync(projectsDir)) {
     return { projectCount: 0, sessionCount: 0 };
   }
@@ -682,8 +670,7 @@ async function getSessionsForProject(config, projectName) {
 
 // Delete a session
 function deleteSession(config, projectName, sessionId) {
-  const resolvedConfig = withResolvedProjectsDir(config);
-  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
+  const projectDir = path.join(config.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -691,15 +678,14 @@ function deleteSession(config, projectName, sessionId) {
   }
 
   fs.unlinkSync(sessionFile);
-  invalidateProjectsCache(resolvedConfig);
+  invalidateProjectsCache(config);
   invalidateSessionResultCache(projectName);
   return { success: true };
 }
 
 // Fork a session
 function forkSession(config, projectName, sessionId, options = {}) {
-  const resolvedConfig = withResolvedProjectsDir(config);
-  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
+  const projectDir = path.join(config.projectsDir, projectName);
   const sessionFile = path.join(projectDir, sessionId + '.jsonl');
 
   if (!fs.existsSync(sessionFile)) {
@@ -728,7 +714,7 @@ function forkSession(config, projectName, sessionId, options = {}) {
     const { setAlias } = require('./alias');
     setAlias(newSessionId, options.alias);
   }
-  invalidateProjectsCache(resolvedConfig);
+  invalidateProjectsCache(config);
   invalidateSessionResultCache(projectName);
 
   return {
@@ -780,8 +766,7 @@ function saveSessionOrder(projectName, order) {
 
 // Delete a project (remove the entire project directory)
 function deleteProject(config, projectName) {
-  const resolvedConfig = withResolvedProjectsDir(config);
-  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
+  const projectDir = path.join(config.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     throw new Error('Project not found');
@@ -791,20 +776,19 @@ function deleteProject(config, projectName) {
   fs.rmSync(projectDir, { recursive: true, force: true });
 
   // Remove from order file if exists
-  const order = getProjectOrder(resolvedConfig);
+  const order = getProjectOrder(config);
   const newOrder = order.filter(name => name !== projectName);
   if (newOrder.length !== order.length) {
-    saveProjectOrder(resolvedConfig, newOrder);
+    saveProjectOrder(config, newOrder);
   }
 
-  invalidateProjectsCache(resolvedConfig);
+  invalidateProjectsCache(config);
   return { success: true };
 }
 
 // Search sessions for keyword
 function searchSessions(config, projectName, keyword, contextLength = 15) {
-  const resolvedConfig = withResolvedProjectsDir(config);
-  const projectDir = path.join(resolvedConfig.projectsDir, projectName);
+  const projectDir = path.join(config.projectsDir, projectName);
 
   if (!fs.existsSync(projectDir)) {
     return [];

package/src/server/services/skill-service.js

@@ -25,7 +25,7 @@ const {
   resolveInsideRoot
 } = require('./config-artifact-paths');
 
-const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode', 'pi'];
 const SUPPORTED_REPO_PROVIDERS = ['github', 'gitlab', 'local'];
 const DEFAULT_GITHUB_HOST = 'https://github.com';
 const DEFAULT_GITLAB_HOST = 'https://gitlab.com';
@@ -173,12 +173,16 @@ const DEFAULT_REPOS_BY_PLATFORM = {
   claude: [],
   codex: [],
   gemini: [],
-  opencode: []
+  opencode: [],
+  pi: []
 };
 
+const CLAUDE_SKILLS_DIR = NATIVE_PATHS.claude.skills
+  || path.join(NATIVE_PATHS.claude.dir || path.dirname(NATIVE_PATHS.claude.settings), 'skills');
+
 const PLATFORM_CONFIG = {
   claude: {
-    installDir: path.join(HOME_DIR, '.claude', 'skills'),
+    installDir: CLAUDE_SKILLS_DIR,
     storageDir: PATHS.localSkills.claude,
     reposFile: PATHS.skillRepos.claude,
     cacheFile: PATHS.skillCaches.claude
@@ -200,6 +204,12 @@ const PLATFORM_CONFIG = {
     storageDir: PATHS.localSkills.opencode,
     reposFile: PATHS.skillRepos.opencode,
     cacheFile: PATHS.skillCaches.opencode
+  },
+  pi: {
+    installDir: NATIVE_PATHS.pi.skills,
+    storageDir: PATHS.localSkills.pi,
+    reposFile: PATHS.skillRepos.pi,
+    cacheFile: PATHS.skillCaches.pi
   }
 };
 

package/src/server/services/speed-test.js

@@ -13,6 +13,7 @@ const { getEffectiveApiKey: getClaudeEffectiveApiKey } = require('./channels');
 const { getEffectiveApiKey: getCodexEffectiveApiKey } = require('./codex-channels');
 const { getEffectiveApiKey: getGeminiEffectiveApiKey } = require('./gemini-channels');
 const { getEffectiveApiKey: getOpenCodeEffectiveApiKey } = require('./opencode-channels');
+const { getEffectiveApiKey: getPiEffectiveApiKey } = require('./pi-channels');
 const { loadClaudeRequestTemplate } = require('./request-logger');
 
 // 测试结果缓存
@@ -102,6 +103,8 @@ function resolveExplicitModel(channel, model) {
 
 function resolveEffectiveApiKey(channel, channelType) {
   switch (channelType) {
+    case 'pi':
+      return getPiEffectiveApiKey(channel);
     case 'codex':
       return getCodexEffectiveApiKey(channel);
     case 'gemini':
@@ -376,11 +379,14 @@ function extractJsonPayloads(responseData) {
  * 测试单个渠道的连接速度和 API 功能
  * @param {Object} channel - 渠道配置
  * @param {number} timeout - 超时时间（毫秒）
- * @param {string} channelType - 渠道类型：'claude' | 'codex' | 'gemini'
+ * @param {string} channelType - 请求格式类型：'claude' | 'codex' | 'gemini' | 'opencode'
+ * @param {Object} options - 可选行为
+ * @param {string} options.authSourceType - API key 来源平台；OMP 使用 'pi'，请求格式仍由 channelType 决定
  * @returns {Promise<Object>} 测试结果
  */
-async function testChannelSpeed(channel, timeout = DEFAULT_TIMEOUT, channelType = 'claude') {
+async function testChannelSpeed(channel, timeout = DEFAULT_TIMEOUT, channelType = 'claude', options = {}) {
   const sanitizedTimeout = sanitizeTimeout(timeout);
+  const authSourceType = options?.authSourceType || channelType;
 
   try {
     if (!channel.baseUrl) {
@@ -416,7 +422,7 @@ async function testChannelSpeed(channel, timeout = DEFAULT_TIMEOUT, channelType
       };
     }
 
-    const effectiveApiKey = resolveEffectiveApiKey(channel, channelType);
+    const effectiveApiKey = resolveEffectiveApiKey(channel, authSourceType);
     if (!effectiveApiKey) {
       return {
         channelId: channel.id,

package/src/server/services/ui-config.js

@@ -1,6 +1,11 @@
 const fs = require('fs');
 const path = require('path');
 const { PATHS } = require('../../config/paths');
+const {
+  DEFAULT_HOME_CLI_COLUMNS,
+  normalizeCustomCliPlatforms,
+  normalizeHomeCliColumns
+} = require('../../shared/platforms');
 
 const UI_CONFIG_FILE = PATHS.uiConfig;
 
@@ -17,18 +22,27 @@ const DEFAULT_UI_CONFIG = {
   channelLocks: {
     claude: false,
     codex: false,
-    gemini: false
+    gemini: false,
+    opencode: false,
+    pi: false
   },
   channelCollapse: {
     claude: [],
     codex: [],
-    gemini: []
+    gemini: [],
+    opencode: [],
+    pi: []
   },
   channelOrder: {
     claude: [],
     codex: [],
-    gemini: []
-  }
+    gemini: [],
+    opencode: [],
+    pi: []
+  },
+  dashboardChannelOrder: DEFAULT_HOME_CLI_COLUMNS,
+  homeCliColumns: DEFAULT_HOME_CLI_COLUMNS,
+  customCliPlatforms: []
 };
 
 // 内存缓存
@@ -55,7 +69,7 @@ function readUIConfigFromFile() {
     const content = fs.readFileSync(UI_CONFIG_FILE, 'utf8');
     const data = JSON.parse(content);
     // Merge with defaults to ensure all keys exist
-    return {
+    return normalizeUIConfig({
       ...DEFAULT_UI_CONFIG,
       ...data,
       theme: data.theme || DEFAULT_UI_CONFIG.theme,
@@ -64,13 +78,34 @@ function readUIConfigFromFile() {
       channelLocks: { ...DEFAULT_UI_CONFIG.channelLocks, ...data.channelLocks },
       channelCollapse: { ...DEFAULT_UI_CONFIG.channelCollapse, ...data.channelCollapse },
       channelOrder: { ...DEFAULT_UI_CONFIG.channelOrder, ...data.channelOrder }
-    };
+    });
   } catch (error) {
     console.error('Error loading UI config:', error);
-    return { ...DEFAULT_UI_CONFIG };
+    return normalizeUIConfig({ ...DEFAULT_UI_CONFIG });
   }
 }
 
+function normalizeUIConfig(config = {}) {
+  const customCliPlatforms = normalizeCustomCliPlatforms(config.customCliPlatforms);
+  const legacyOrder = Array.isArray(config.homeCliColumns)
+    ? config.homeCliColumns
+    : config.dashboardChannelOrder;
+  const homeCliColumns = normalizeHomeCliColumns(legacyOrder, customCliPlatforms);
+
+  return {
+    ...DEFAULT_UI_CONFIG,
+    ...config,
+    panelVisibility: { ...DEFAULT_UI_CONFIG.panelVisibility, ...(config.panelVisibility || {}) },
+    channelBalance: { ...DEFAULT_UI_CONFIG.channelBalance, ...(config.channelBalance || {}) },
+    channelLocks: { ...DEFAULT_UI_CONFIG.channelLocks, ...(config.channelLocks || {}) },
+    channelCollapse: { ...DEFAULT_UI_CONFIG.channelCollapse, ...(config.channelCollapse || {}) },
+    channelOrder: { ...DEFAULT_UI_CONFIG.channelOrder, ...(config.channelOrder || {}) },
+    dashboardChannelOrder: homeCliColumns,
+    homeCliColumns,
+    customCliPlatforms
+  };
+}
+
 // 初始化缓存（延迟初始化）
 function initializeCache() {
   if (cacheInitialized) return;
@@ -100,9 +135,10 @@ function saveUIConfig(config) {
   ensureConfigDir();
 
   try {
-    fs.writeFileSync(UI_CONFIG_FILE, JSON.stringify(config, null, 2), 'utf8');
+    const normalizedConfig = normalizeUIConfig(config);
+    fs.writeFileSync(UI_CONFIG_FILE, JSON.stringify(normalizedConfig, null, 2), 'utf8');
     // 同时更新缓存
-    uiConfigCache = JSON.parse(JSON.stringify(config));
+    uiConfigCache = JSON.parse(JSON.stringify(normalizedConfig));
   } catch (error) {
     console.error('Error saving UI config:', error);
     throw error;
@@ -114,7 +150,7 @@ function updateUIConfig(key, value) {
   const config = loadUIConfig();
   config[key] = value;
   saveUIConfig(config);
-  return config;
+  return loadUIConfig();
 }
 
 // Update nested config
@@ -125,12 +161,14 @@ function updateNestedUIConfig(parentKey, childKey, value) {
   }
   config[parentKey][childKey] = value;
   saveUIConfig(config);
-  return config;
+  return loadUIConfig();
 }
 
 module.exports = {
   loadUIConfig,
   saveUIConfig,
   updateUIConfig,
-  updateNestedUIConfig
+  updateNestedUIConfig,
+  normalizeUIConfig,
+  DEFAULT_UI_CONFIG
 };