@2en/clawly-plugins 1.24.7 → 1.24.8-beta.0

package/config-setup.ts

@@ -19,7 +19,6 @@ import {
   PROVIDER_NAME,
   patchModelGateway,
   readOpenclawConfig,
-  resolveStateDir,
   writeOpenclawConfig,
 } from './model-gateway-setup'
 
@@ -29,7 +28,6 @@ export interface ConfigPluginConfig {
   workspaceDir?: string
   defaultModel?: string
   defaultImageModel?: string
-  sessionMainKey?: string
   elevenlabsApiKey?: string
   elevenlabsVoiceId?: string
   modelGatewayBaseUrl?: string
@@ -191,20 +189,6 @@ export function patchBrowser(config: Record<string, unknown>): boolean {
   return dirty
 }
 
-export function patchSessionMainKey(
-  config: Record<string, unknown>,
-  pc: ConfigPluginConfig,
-): boolean {
-  if (!pc.sessionMainKey) return false
-
-  const session = (config.session ?? {}) as Record<string, unknown>
-  if (session.mainKey === pc.sessionMainKey) return false
-
-  session.mainKey = pc.sessionMainKey
-  config.session = session
-  return true
-}
-
 export function patchTts(config: Record<string, unknown>, pc: ConfigPluginConfig): boolean {
   const useProxy = !!(pc.modelGatewayBaseUrl && pc.modelGatewayToken)
   const hasDirectKey = !!pc.elevenlabsApiKey
@@ -360,8 +344,15 @@ export function patchWebSearch(config: Record<string, unknown>, pc: ConfigPlugin
 export function patchSession(config: Record<string, unknown>): boolean {
   let dirty = false
 
-  // session.dmScope: enforce
+  // Remove deprecated session.mainKey (OpenClaw v2026.1.5 hardcoded it to "main")
   const session = (config.session ?? {}) as Record<string, unknown>
+  if (session.mainKey != null) {
+    delete session.mainKey
+    config.session = session
+    dirty = true
+  }
+
+  // session.dmScope: enforce
   if (session.dmScope !== 'per-channel-peer') {
     session.dmScope = 'per-channel-peer'
     config.session = session
@@ -386,7 +377,7 @@ export function patchSession(config: Record<string, unknown>): boolean {
 // ---------------------------------------------------------------------------
 
 export function setupConfig(api: PluginApi): void {
-  const stateDir = resolveStateDir(api)
+  const stateDir = api.runtime.state.resolveStateDir()
   if (!stateDir) {
     api.logger.warn('Cannot resolve state dir — config setup skipped.')
     return
@@ -400,7 +391,6 @@ export function setupConfig(api: PluginApi): void {
   dirty = patchAgent(config, pc) || dirty
   dirty = patchGateway(config) || dirty
   dirty = patchBrowser(config) || dirty
-  dirty = patchSessionMainKey(config, pc) || dirty
   dirty = patchSession(config) || dirty
   dirty = patchTts(config, pc) || dirty
   dirty = patchWebSearch(config, pc) || dirty

package/gateway/clawhub2gateway.ts

@@ -145,11 +145,7 @@ export function registerClawhub2gateway(api: PluginApi) {
   const defaultTimeoutMs = configNumber(cfg, 'defaultTimeoutMs', 60_000)
   const configPath = configString(cfg, 'configPath')
 
-  const stateDir =
-    api.runtime.state?.resolveStateDir?.(process.env) ??
-    process.env.OPENCLAW_STATE_DIR ??
-    process.env.CLAWDBOT_STATE_DIR ??
-    ''
+  const stateDir = api.runtime.state.resolveStateDir()
   const defaultConfigPath = stateDir ? path.join(stateDir, 'clawhub', 'config.json') : ''
 
   const resolveEnv = async (): Promise<Record<string, string | undefined>> => {

package/gateway/config-repair.ts

@@ -13,7 +13,6 @@ import {
   EXTRA_GATEWAY_MODELS,
   PROVIDER_NAME,
   readOpenclawConfig,
-  resolveStateDir,
   writeOpenclawConfig,
 } from '../model-gateway-setup'
 
@@ -21,7 +20,7 @@ export function registerConfigRepair(api: PluginApi) {
   api.registerGatewayMethod('clawly.config.repair', async ({params, respond}) => {
     const dryRun = params.dryRun === true
 
-    const stateDir = resolveStateDir(api)
+    const stateDir = api.runtime.state.resolveStateDir()
     if (!stateDir) {
       respond(true, {
         ...(dryRun ? {ok: false} : {repaired: false}),

package/gateway/memory.ts

@@ -40,10 +40,6 @@ function coercePluginConfig(api: PluginApi): Record<string, unknown> {
   return isRecord(api.pluginConfig) ? api.pluginConfig : {}
 }
 
-function resolveStateDir(api: PluginApi): string {
-  return api.runtime.state?.resolveStateDir?.(process.env) ?? process.env.OPENCLAW_STATE_DIR ?? ''
-}
-
 /** Read agents list from openclaw.json (cached). */
 let _cachedAgentsList:
   | Array<{id?: string; default?: boolean; workspace?: string}>
@@ -54,7 +50,7 @@ function readAgentsList(
 ): Array<{id?: string; default?: boolean; workspace?: string}> | null {
   if (_cachedAgentsList !== undefined) return _cachedAgentsList
   try {
-    const stateDir = resolveStateDir(api)
+    const stateDir = api.runtime.state.resolveStateDir()
     if (!stateDir) {
       _cachedAgentsList = null
       return null
@@ -101,7 +97,7 @@ function resolveWorkspaceRoot(api: PluginApi, profile?: string): string {
     if (agentWs) return agentWs
   }
 
-  const stateDir = resolveStateDir(api)
+  const stateDir = api.runtime.state.resolveStateDir()
   const baseDir =
     process.env.OPENCLAW_WORKSPACE ??
     readAgentWorkspace(api) ??

package/gateway/plugins.ts

@@ -27,10 +27,6 @@ interface NpmViewCache {
 
 const npmCache = new LruCache<NpmViewCache>({maxSize: 5, ttlMs: 5 * 60 * 1000})
 
-function resolveStateDir(api: PluginApi): string {
-  return api.runtime.state?.resolveStateDir?.(process.env) ?? process.env.OPENCLAW_STATE_DIR ?? ''
-}
-
 function readExtensionVersion(stateDir: string, pluginId: string): string | null {
   try {
     const pkgPath = path.join(stateDir, 'extensions', pluginId, 'package.json')
@@ -73,7 +69,7 @@ async function withPluginBackup<T>(
   pluginId: string,
   operation: () => Promise<T>,
 ): Promise<T> {
-  const stateDir = resolveStateDir(api)
+  const stateDir = api.runtime.state.resolveStateDir()
   if (!stateDir) return operation()
 
   const extensionDir = path.join(stateDir, 'extensions', pluginId)
@@ -145,7 +141,7 @@ export function registerPlugins(api: PluginApi) {
       return
     }
 
-    const stateDir = resolveStateDir(api)
+    const stateDir = api.runtime.state.resolveStateDir()
     api.logger.info(`plugins.version: checking ${pluginId} (${npmPkgName})`)
     let latestNpmVersion: string | null = null
     let allNpmVersions: string[] = []
@@ -227,7 +223,7 @@ export function registerPlugins(api: PluginApi) {
       let output = ''
 
       if (strategy === 'force') {
-        const stateDir = resolveStateDir(api)
+        const stateDir = api.runtime.state.resolveStateDir()
         if (!stateDir) throw new Error('cannot resolve openclaw state dir')
 
         const configPath = path.join(stateDir, 'openclaw.json')

package/model-gateway-setup.ts

@@ -67,10 +67,6 @@ export const EXTRA_GATEWAY_MODELS: Array<{
   },
 ]
 
-export function resolveStateDir(api: PluginApi): string {
-  return api.runtime.state?.resolveStateDir?.(process.env) ?? process.env.OPENCLAW_STATE_DIR ?? ''
-}
-
 export function readOpenclawConfig(configPath: string): Record<string, unknown> {
   try {
     return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
@@ -214,7 +210,7 @@ export function patchModelGateway(config: Record<string, unknown>, api: PluginAp
 
 /** Standalone wrapper — reads config, patches, writes. Used by tests. */
 export function setupModelGateway(api: PluginApi): void {
-  const stateDir = resolveStateDir(api)
+  const stateDir = api.runtime.state.resolveStateDir()
   if (!stateDir) {
     api.logger.warn('Cannot resolve state dir — model gateway setup skipped.')
     return

package/openclaw.plugin.json

@@ -55,7 +55,6 @@
       "workspaceDir": { "type": "string" },
       "defaultModel": { "type": "string" },
       "defaultImageModel": { "type": "string" },
-      "sessionMainKey": { "type": "string" },
       "elevenlabsApiKey": { "type": "string" },
       "elevenlabsVoiceId": { "type": "string" }
     },

package/package.json

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

package/types.ts

@@ -29,8 +29,8 @@ export type PluginRuntime = {
       killed: boolean
     }>
   }
-  state?: {
-    resolveStateDir?: (env?: NodeJS.ProcessEnv) => string
+  state: {
+    resolveStateDir: (env?: NodeJS.ProcessEnv) => string
   }
 }