@2en/clawly-plugins 1.30.0-beta.7 → 1.30.0-beta.9

package/clawly-config-defaults.json5

@@ -134,7 +134,7 @@
         mode: "cache-ttl",
       },
       heartbeat: {
-        model: "clawly-model-gateway/moonshotai/kimi-k2.5",
+        model: "clawly-model-gateway/auto",
         lightContext: true,
       },
       memorySearch: {

package/config-setup.ts

@@ -611,14 +611,12 @@ export function setupConfig(api: PluginApi): void {
     try {
       writeOpenclawConfig(configPath, config)
       api.logger.info('Config setup: patched openclaw.json.')
-      // Refresh the gateway's in-memory runtime config snapshot.
-      // The sync write above updates the file on disk, but the gateway
-      // caches config via runtimeConfigSnapshot (set during startup by
-      // the secrets system). Without this refresh, loadConfig() keeps
-      // returning the stale pre-patch config until the next restart.
-      void api.runtime.config.writeConfigFile(config).catch((err) => {
-        api.logger.warn(`Config setup: runtime snapshot refresh failed: ${(err as Error).message}`)
-      })
+      // NOTE: We intentionally do NOT call api.runtime.config.writeConfigFile()
+      // here. The raw config (from readOpenclawConfig / JSON.parse) lacks
+      // $include-resolved fields (e.g. models array) and always fails
+      // validation. The raw disk write above is sufficient — the first
+      // successful writeConfigFile call from an RPC (like setTimezone)
+      // will refresh the runtime snapshot.
     } catch (err) {
       api.logger.error(`Config setup failed: ${(err as Error).message}`)
     }

package/gateway/config-model.ts

@@ -15,6 +15,7 @@
 
 import type {PluginApi} from '../types'
 import type {OpenClawConfig} from '../types/openclaw'
+import {backfillDiskConfig} from '../model-gateway-setup'
 
 export function registerConfigModel(api: PluginApi) {
   api.registerGatewayMethod('clawly.config.setModel', async ({params, respond}) => {
@@ -53,8 +54,13 @@ export function registerConfigModel(api: PluginApi) {
     agents.defaults = defaults
     config.agents = agents
 
+    // Backfill fields written by setupConfig (which writes directly to disk)
+    // so writeConfigFile's merge-patch doesn't revert them.
+    const stateDir = api.runtime.state.resolveStateDir()
+    const configToWrite = stateDir ? backfillDiskConfig(stateDir, config) : config
+
     try {
-      await api.runtime.config.writeConfigFile(config)
+      await api.runtime.config.writeConfigFile(configToWrite)
       api.logger.info(`config-model: set model.primary to ${model}`)
       respond(true, {changed: true, model})
     } catch (err) {

package/gateway/config-timezone.ts

@@ -11,6 +11,7 @@
 
 import type {PluginApi} from '../types'
 import type {OpenClawConfig} from '../types/openclaw'
+import {backfillDiskConfig} from '../model-gateway-setup'
 
 export function registerConfigTimezone(api: PluginApi) {
   api.registerGatewayMethod('clawly.config.setTimezone', async ({params, respond}) => {
@@ -46,8 +47,13 @@ export function registerConfigTimezone(api: PluginApi) {
     agents.defaults = defaults
     config.agents = agents
 
+    // Backfill fields written by setupConfig (which writes directly to disk)
+    // so writeConfigFile's merge-patch doesn't revert them.
+    const stateDir = api.runtime.state.resolveStateDir()
+    const configToWrite = stateDir ? backfillDiskConfig(stateDir, config) : config
+
     try {
-      await api.runtime.config.writeConfigFile(config)
+      await api.runtime.config.writeConfigFile(configToWrite)
       api.logger.info(`config-timezone: set userTimezone to ${timezone}`)
       respond(true, {changed: true, timezone})
     } catch (err) {

package/lib/calendar-cache.ts

@@ -109,7 +109,12 @@ export function initCache(): void {
 }
 
 export function getCache(): CalendarCache | null {
-  if (!cachedData) cachedData = loadCache()
+  // Always read from disk to avoid returning stale in-memory state.
+  // After gateway restart or ESM/CJS dual-loading, gateway methods and
+  // agent tools may hold separate module instances with divergent
+  // cachedData. Disk is the shared source of truth. The file is small
+  // (<10 KB) and tool calls are infrequent, so the I/O cost is negligible.
+  cachedData = loadCache()
   return cachedData
 }
 

package/model-gateway-setup.ts

@@ -10,6 +10,7 @@
  */
 
 import fs from 'node:fs'
+import path from 'node:path'
 
 import type {PluginApi} from './index'
 import type {OpenClawConfig} from './types/openclaw'
@@ -67,3 +68,48 @@ export function patchModelGateway(config: OpenClawConfig, _api: PluginApi): bool
 
   return dirty
 }
+
+// ---------------------------------------------------------------------------
+// backfillDiskConfig — merge setupConfig's disk writes into a loadConfig() result
+// ---------------------------------------------------------------------------
+
+function isPlainObject(v: unknown): v is Record<string, unknown> {
+  return v !== null && typeof v === 'object' && !Array.isArray(v)
+}
+
+/**
+ * Deep-merge `source` into `target`, where source wins for any key it has.
+ * Arrays and primitives from source overwrite target.
+ * Plain objects recurse.
+ */
+function deepMerge(target: Record<string, unknown>, source: Record<string, unknown>): void {
+  for (const key of Object.keys(source)) {
+    if (key === '$include') continue // meta-directive, not a resolved config field
+    const sv = source[key]
+    const tv = target[key]
+    if (isPlainObject(sv) && isPlainObject(tv)) {
+      deepMerge(tv, sv)
+    } else {
+      target[key] = sv
+    }
+  }
+}
+
+/**
+ * Read the raw disk config (openclaw.json) and deep-merge its fields into a
+ * runtime config snapshot (from `loadConfig()`). This ensures that fields
+ * written by `setupConfig` (which writes directly to disk) are present in the
+ * config object before it's passed to `writeConfigFile`.
+ *
+ * Without this, `writeConfigFile`'s inner merge-patch sees the stale runtime
+ * snapshot (missing setupConfig's changes) and reverts them on disk.
+ */
+export function backfillDiskConfig(stateDir: string, config: OpenClawConfig): OpenClawConfig {
+  const configPath = path.join(stateDir, 'openclaw.json')
+  const diskConfig = readOpenclawConfig(configPath)
+  // Start from disk (setupConfig's fields) then overlay config (RPC handler's
+  // changes) so the caller's modifications win over stale disk values.
+  const merged = {...diskConfig} as Record<string, unknown>
+  deepMerge(merged, config as Record<string, unknown>)
+  return merged as OpenClawConfig
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2en/clawly-plugins",
-  "version": "1.30.0-beta.7",
+  "version": "1.30.0-beta.9",
   "module": "index.ts",
   "type": "module",
   "repository": {