@2en/clawly-plugins 1.26.1-beta.0 → 1.26.1-beta.1

package/config-setup.ts

@@ -44,8 +44,39 @@ export interface ConfigPluginConfig {
   posthogHost?: string
 }
 
-function toPC(api: PluginApi): ConfigPluginConfig {
-  return (api.pluginConfig ?? {}) as ConfigPluginConfig
+function asObj(value: unknown): Record<string, unknown> {
+  return value !== null && typeof value === 'object' && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {}
+}
+
+function readFilePluginConfig(config: Record<string, unknown>): ConfigPluginConfig {
+  const plugins = asObj(config.plugins)
+  const entries = asObj(plugins.entries)
+  const raw = asObj(entries['clawly-plugins'])
+  const fileConfig = raw?.config
+  return fileConfig && typeof fileConfig === 'object' && !Array.isArray(fileConfig)
+    ? (fileConfig as ConfigPluginConfig)
+    : {}
+}
+
+function mergeDefinedPluginConfig(
+  fileConfig: ConfigPluginConfig,
+  runtimeConfig: ConfigPluginConfig,
+): ConfigPluginConfig {
+  const merged = {...fileConfig}
+  for (const [key, value] of Object.entries(runtimeConfig)) {
+    if (value !== undefined) {
+      merged[key as keyof ConfigPluginConfig] = value
+    }
+  }
+  return merged
+}
+
+function toPC(api: PluginApi, config: Record<string, unknown>): ConfigPluginConfig {
+  const fileConfig = readFilePluginConfig(config)
+  const runtimeConfig = (api.pluginConfig ?? {}) as ConfigPluginConfig
+  return mergeDefinedPluginConfig(fileConfig, runtimeConfig)
 }
 
 const DEFAULT_MODEL = `${PROVIDER_NAME}/anthropic/claude-sonnet-4.6`
@@ -351,6 +382,58 @@ export function patchWebSearch(config: Record<string, unknown>, pc: ConfigPlugin
   return dirty
 }
 
+export function patchMemorySearch(
+  config: Record<string, unknown>,
+  pc: ConfigPluginConfig,
+): boolean {
+  if (!pc.modelGatewayBaseUrl || !pc.modelGatewayToken) return false
+
+  let dirty = false
+  const agents = (config.agents ?? {}) as Record<string, unknown>
+  const defaults = (agents.defaults ?? {}) as Record<string, unknown>
+  const ms = (defaults.memorySearch ?? {}) as Record<string, unknown>
+  const remote = (ms.remote ?? {}) as Record<string, unknown>
+  const batch = (remote.batch ?? {}) as Record<string, unknown>
+
+  // Provider: enforce (proxy mimics OpenAI API)
+  if (ms.provider !== 'openai') {
+    ms.provider = 'openai'
+    dirty = true
+  }
+
+  // Model: set-if-missing
+  if (ms.model === undefined) {
+    ms.model = 'text-embedding-3-small'
+    dirty = true
+  }
+
+  // Remote credentials: enforce
+  if (remote.baseUrl !== pc.modelGatewayBaseUrl) {
+    remote.baseUrl = pc.modelGatewayBaseUrl
+    dirty = true
+  }
+  if (remote.apiKey !== pc.modelGatewayToken) {
+    remote.apiKey = pc.modelGatewayToken
+    dirty = true
+  }
+
+  // Batch API not supported through proxy: enforce disabled
+  if (batch.enabled !== false) {
+    batch.enabled = false
+    dirty = true
+  }
+
+  if (dirty) {
+    remote.batch = batch
+    ms.remote = remote
+    defaults.memorySearch = ms
+    agents.defaults = defaults
+    config.agents = agents
+  }
+
+  return dirty
+}
+
 export function patchSession(config: Record<string, unknown>): boolean {
   let dirty = false
 
@@ -385,12 +468,6 @@ export function patchSession(config: Record<string, unknown>): boolean {
 const PLUGIN_ID = 'clawly-plugins'
 const NPM_PKG_NAME = '@2en/clawly-plugins'
 
-function asObj(value: unknown): Record<string, unknown> {
-  return value !== null && typeof value === 'object' && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : {}
-}
-
 /**
  * Self-healing: reconstruct missing `plugins.installs.clawly-plugins` record.
  * Older provisioned sprites had this record destroyed by a full-overwrite bug
@@ -470,7 +547,8 @@ function reconcileRuntimeConfig(
   dirty = patchSession(config) || dirty
   dirty = patchTts(config, pc) || dirty
   dirty = patchWebSearch(config, pc) || dirty
-  dirty = patchModelGateway(config, api) || dirty
+  dirty = patchMemorySearch(config, pc) || dirty
+  dirty = patchModelGateway(config, api, pc) || dirty
   return dirty
 }
 
@@ -487,7 +565,7 @@ export function setupConfig(api: PluginApi): void {
 
   const configPath = path.join(stateDir, 'openclaw.json')
   const config = readOpenclawConfig(configPath)
-  const pc = toPC(api)
+  const pc = toPC(api, config)
 
   let dirty = false
   dirty = repairLegacyProvisionState(api, config, stateDir) || dirty

package/gateway/config-timezone.ts

@@ -0,0 +1,56 @@
+/**
+ * Timezone sync RPC: writes agents.defaults.userTimezone to openclaw.json
+ * without triggering a gateway restart.
+ *
+ * Methods:
+ * - clawly.config.setTimezone({ timezone }) → { changed, timezone }
+ */
+
+import path from 'node:path'
+
+import type {PluginApi} from '../types'
+import {readOpenclawConfig, writeOpenclawConfig} from '../model-gateway-setup'
+
+export function registerConfigTimezone(api: PluginApi) {
+  api.registerGatewayMethod('clawly.config.setTimezone', async ({params, respond}) => {
+    const timezone = typeof params.timezone === 'string' ? params.timezone : ''
+    if (!timezone) {
+      respond(true, {changed: false, timezone: '', error: 'Missing timezone param'})
+      return
+    }
+
+    const stateDir = api.runtime.state.resolveStateDir()
+    if (!stateDir) {
+      respond(true, {changed: false, timezone, error: 'Cannot resolve state dir'})
+      return
+    }
+
+    const configPath = path.join(stateDir, 'openclaw.json')
+    const config = readOpenclawConfig(configPath)
+
+    const agents = (config.agents ?? {}) as Record<string, unknown>
+    const defaults = (agents.defaults ?? {}) as Record<string, unknown>
+    const current = defaults.userTimezone
+
+    if (current === timezone) {
+      respond(true, {changed: false, timezone})
+      return
+    }
+
+    defaults.userTimezone = timezone
+    agents.defaults = defaults
+    config.agents = agents
+
+    try {
+      writeOpenclawConfig(configPath, config)
+      api.logger.info(`config-timezone: set userTimezone to ${timezone}`)
+      respond(true, {changed: true, timezone})
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err)
+      api.logger.error(`config-timezone: write failed — ${msg}`)
+      respond(true, {changed: false, timezone, error: `Write failed: ${msg}`})
+    }
+  })
+
+  api.logger.info('config-timezone: registered clawly.config.setTimezone')
+}

package/gateway/index.ts

@@ -3,6 +3,7 @@ import {registerAgentSend} from './agent'
 import {registerAnalytics} from './analytics'
 import {registerClawhub2gateway} from './clawhub2gateway'
 import {registerConfigRepair} from './config-repair'
+import {registerConfigTimezone} from './config-timezone'
 
 import {registerSessionSanitize} from './session-sanitize'
 import {registerCronDelivery} from './cron-delivery'
@@ -56,6 +57,7 @@ export function registerGateway(api: PluginApi) {
   registerCronTelemetry(api)
   registerAnalytics(api)
   registerConfigRepair(api)
+  registerConfigTimezone(api)
   registerSessionSanitize(api)
   registerPairing(api)
   registerVersion(api)

package/model-gateway-setup.ts

@@ -13,6 +13,10 @@ import path from 'node:path'
 import type {PluginApi} from './index'
 
 export const PROVIDER_NAME = 'clawly-model-gateway'
+type ModelGatewayConfigInputs = {
+  modelGatewayBaseUrl?: string
+  modelGatewayToken?: string
+}
 
 /** Additional models available through the model gateway (beyond env-configured defaults). */
 export const EXTRA_GATEWAY_MODELS: Array<{
@@ -83,7 +87,17 @@ export function writeOpenclawConfig(configPath: string, config: Record<string, u
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n')
 }
 
-export function patchModelGateway(config: Record<string, unknown>, api: PluginApi): boolean {
+export function patchModelGateway(
+  config: Record<string, unknown>,
+  api: PluginApi,
+  inputs?: ModelGatewayConfigInputs,
+): boolean {
+  const cfg =
+    inputs ??
+    (api.pluginConfig as Record<string, unknown> | undefined as
+      | ModelGatewayConfigInputs
+      | undefined)
+
   // If provider already exists, check if extra models or aliases need updating.
   // This runs before the credentials check because provisioned sprites have
   // credentials in openclaw.json directly, not in pluginConfig.
@@ -116,7 +130,6 @@ export function patchModelGateway(config: Record<string, unknown>, api: PluginAp
 
     // Backfill pluginConfig from existing provider credentials (legacy sprites
     // provisioned before plugin config was written during configure phase).
-    const cfg = api.pluginConfig as Record<string, unknown> | undefined
     if (
       existingProvider.baseUrl &&
       existingProvider.apiKey &&
@@ -149,7 +162,6 @@ export function patchModelGateway(config: Record<string, unknown>, api: PluginAp
   }
 
   // No existing provider — need pluginConfig credentials to create one
-  const cfg = api.pluginConfig as Record<string, unknown> | undefined
   const baseUrl =
     typeof cfg?.modelGatewayBaseUrl === 'string' ? cfg.modelGatewayBaseUrl.replace(/\/$/, '') : ''
   const token = typeof cfg?.modelGatewayToken === 'string' ? cfg.modelGatewayToken : ''
@@ -212,7 +224,13 @@ export function patchModelGateway(config: Record<string, unknown>, api: PluginAp
   return true
 }
 
-/** Standalone wrapper — reads config, patches, writes. Used by tests. */
+/**
+ * Standalone wrapper — reads config, patches, writes. Used by tests.
+ *
+ * This helper intentionally does not apply the file-backed pluginConfig fallback
+ * from setupConfig(); production startup should go through the full runtime
+ * reconcile path there.
+ */
 export function setupModelGateway(api: PluginApi): void {
   const stateDir = api.runtime.state.resolveStateDir()
   if (!stateDir) {

package/package.json

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