chore: release v3.3.14-beta.3

Author: 2ue

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccmam",
-  "version": "3.3.14-beta.2",
+  "version": "3.3.14-beta.3",
   "private": true,
   "description": "Manage Codex, Claude Code, Gemini CLI, and MCP API service provider configurations",
   "scripts": {

packages/aicoding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2ue/aicoding",
-  "version": "3.3.14-beta.2",
+  "version": "3.3.14-beta.3",
   "description": "一键配置 GMN 到 Codex、OpenCode、OpenClaw",
   "type": "module",
   "bin": {

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccman",
-  "version": "3.3.14-beta.2",
+  "version": "3.3.14-beta.3",
   "type": "module",
   "description": "Manage Codex, Claude Code, Gemini CLI, OpenCode, OpenClaw, and MCP API service provider configurations",
   "main": "./dist/index.js",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccman/core",
-  "version": "3.3.14-beta.2",
+  "version": "3.3.14-beta.3",
   "type": "module",
   "description": "Core business logic for ccman - Manage Codex, Claude Code, Gemini CLI, OpenCode, OpenClaw, and MCP configurations",
   "main": "./dist/index.js",

packages/core/src/writers/openclaw.test.ts

@@ -61,7 +61,7 @@ describe('OpenClaw Writer', () => {
     expect(provider.models?.[0]?.id).toBe('gpt-5.3-codex')
   })
 
-  it('should always overwrite target files instead of merging existing content', () => {
+  it('should merge openclaw fields incrementally instead of full overwrite', () => {
     const configPath = getOpenClawConfigPath()
     const modelsPath = getOpenClawModelsPath()
 
@@ -72,12 +72,23 @@ describe('OpenClaw Writer', () => {
       configPath,
       JSON.stringify(
         {
+          meta: { keep: true },
+          models: {
+            mode: 'merge',
+            providers: {
+              legacy: {
+                baseUrl: 'https://legacy.example.com/v1',
+                apiKey: 'legacy-key',
+              },
+            },
+          },
           agents: {
             defaults: {
               workspace: '/tmp/custom',
               model: {
                 primary: 'legacy/model',
               },
+              maxConcurrent: 8,
             },
           },
           customField: 'legacy-value',
@@ -111,9 +122,16 @@ describe('OpenClaw Writer', () => {
     const openclawConfig = JSON.parse(fs.readFileSync(configPath, 'utf-8'))
     const modelsConfig = JSON.parse(fs.readFileSync(modelsPath, 'utf-8'))
 
-    expect(openclawConfig.customField).toBeUndefined()
-    expect(modelsConfig.customField).toBeUndefined()
-    expect(modelsConfig.providers?.legacy).toBeUndefined()
+    expect(openclawConfig.customField).toBe('legacy-value')
+    expect(openclawConfig.meta?.keep).toBe(true)
+    expect(openclawConfig.models?.providers?.legacy?.baseUrl).toBe('https://legacy.example.com/v1')
+    expect(openclawConfig.models?.providers?.GMN?.apiKey).toBe('sk-new-openclaw')
+    expect(openclawConfig.agents?.defaults?.workspace).toBe('/tmp/custom')
+    expect(openclawConfig.agents?.defaults?.maxConcurrent).toBe(8)
+    expect(openclawConfig.agents?.defaults?.model?.primary).toBe('GMN/gpt-5.3-codex')
+
+    expect(modelsConfig.customField).toBe('legacy-models-value')
+    expect(modelsConfig.providers?.legacy?.baseUrl).toBe('https://old.example.com')
     expect(modelsConfig.providers?.GMN?.apiKey).toBe('sk-new-openclaw')
   })
 

packages/core/src/writers/openclaw.ts

@@ -3,22 +3,23 @@ import * as path from 'path'
 import { fileURLToPath } from 'url'
 import type { Provider } from '../tool-manager.js'
 import { getOpenClawConfigPath, getOpenClawDir, getOpenClawModelsPath } from '../paths.js'
-import { ensureDir, writeJSON } from '../utils/file.js'
-import { replaceVariables } from '../utils/template.js'
+import { ensureDir, fileExists, readJSON, writeJSON } from '../utils/file.js'
+import { deepMerge, replaceVariables } from '../utils/template.js'
 
 interface OpenClawModelsFile {
   providers?: Record<string, unknown>
   [key: string]: unknown
 }
 
 interface OpenClawConfigFile {
-  models?: {
-    providers?: Record<string, unknown>
-    [key: string]: unknown
-  }
+  models?: Record<string, unknown>
   agents?: {
     defaults?: {
       workspace?: string
+      model?: {
+        primary?: string
+        [key: string]: unknown
+      }
       [key: string]: unknown
     }
     [key: string]: unknown
@@ -157,12 +158,22 @@ function resolveProviderName(provider: Provider): string {
   return DEFAULT_PROVIDER_NAME
 }
 
+function loadExistingJSON<T extends object>(filePath: string): T | null {
+  if (!fileExists(filePath)) return null
+  try {
+    return readJSON<T>(filePath)
+  } catch {
+    return null
+  }
+}
+
 /**
  * 写入 OpenClaw 配置
  *
  * 策略：
  * 1. 模板优先 + 内置回退
- * 2. 每次切换 provider 直接覆盖写入 openclaw.json / models.json
+ * 2. openclaw.json: models 增量覆盖 + agents 智能合并（强制切换 primary）
+ * 3. models.json: providers 增量补充（仅更新当前 provider）
  * 3. 路径基于 HOME_DIR（通过 paths.ts 统一管理）
  */
 export function writeOpenClawConfig(provider: Provider): void {
@@ -191,18 +202,52 @@ export function writeOpenClawConfig(provider: Provider): void {
 
   const nextOpenClawConfig = replaceVariables(rawConfigTemplate, variables) as OpenClawConfigFile
   const nextModelsConfig = replaceVariables(rawModelsTemplate, variables) as OpenClawModelsFile
-  const currentAgents = nextOpenClawConfig.agents || {}
-  const defaults = currentAgents.defaults || {}
+  const existingOpenClawConfig = loadExistingJSON<OpenClawConfigFile>(configPath) || {}
+  const existingModelsConfig = loadExistingJSON<OpenClawModelsFile>(modelsPath) || {}
 
-  nextOpenClawConfig.agents = {
-    ...currentAgents,
-    defaults: {
-      ...defaults,
-      workspace: homeDir,
+  const mergedConfigModels = deepMerge(
+    existingOpenClawConfig.models || {},
+    nextOpenClawConfig.models || {}
+  )
+
+  const mergedAgents = deepMerge(
+    nextOpenClawConfig.agents || {},
+    existingOpenClawConfig.agents || {}
+  )
+  const mergedDefaults = mergedAgents.defaults || {}
+  const mergedModel = mergedDefaults.model || {}
+  const templatePrimary =
+    nextOpenClawConfig.agents?.defaults?.model?.primary || `${providerName}/gpt-5.3-codex`
+  const workspace =
+    typeof mergedDefaults.workspace === 'string' && mergedDefaults.workspace.trim()
+      ? mergedDefaults.workspace
+      : homeDir
+
+  const finalOpenClawConfig: OpenClawConfigFile = {
+    ...existingOpenClawConfig,
+    models: mergedConfigModels,
+    agents: {
+      ...mergedAgents,
+      defaults: {
+        ...mergedDefaults,
+        workspace,
+        model: {
+          ...mergedModel,
+          primary: templatePrimary,
+        },
+      },
     },
   }
 
-  // 直接覆盖写入（不读取/不合并现有文件）
-  writeJSON(configPath, nextOpenClawConfig)
-  writeJSON(modelsPath, nextModelsConfig)
+  const mergedProviders = deepMerge(
+    existingModelsConfig.providers || {},
+    nextModelsConfig.providers || {}
+  )
+  const finalModelsConfig: OpenClawModelsFile = {
+    ...existingModelsConfig,
+    providers: mergedProviders,
+  }
+
+  writeJSON(configPath, finalOpenClawConfig)
+  writeJSON(modelsPath, finalModelsConfig)
 }

packages/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccman/desktop",
-  "version": "3.3.14-beta.2",
+  "version": "3.3.14-beta.3",
   "description": "ccman Desktop GUI application",
   "main": "./dist/main/index.js",
   "scripts": {