@2en/clawly-plugins 1.20.1 → 1.21.1

package/gateway/index.ts

@@ -1,6 +1,5 @@
 import type {PluginApi} from '../index'
 import {registerAgentSend} from './agent'
-import {registerChannelsConfigure} from './channels-configure'
 import {registerClawhub2gateway} from './clawhub2gateway'
 import {registerConfigRepair} from './config-repair'
 import {registerPairing} from './pairing'
@@ -17,7 +16,6 @@ export function registerGateway(api: PluginApi) {
   registerMemoryBrowser(api)
   registerClawhub2gateway(api)
   registerPlugins(api)
-  registerChannelsConfigure(api)
   registerOfflinePush(api)
   registerConfigRepair(api)
   registerPairing(api)

package/index.ts

@@ -21,6 +21,7 @@
  * - /clawly_echo          — echo text back without LLM
  *
  * Hooks:
+ * - before_message_write — restores original /skill command in user messages (undoes gateway rewrite)
  * - tool_result_persist   — copies TTS audio to persistent outbound directory
  * - before_tool_call      — enforces delivery fields on cron.create
  * - agent_end             — sends push notification when client is offline
@@ -36,6 +37,7 @@ import {registerGateway} from './gateway'
 import {getGatewayConfig} from './gateway-fetch'
 import {setupModelGateway} from './model-gateway-setup'
 import {registerOutboundHook, registerOutboundHttpRoute, registerOutboundMethods} from './outbound'
+import {registerSkillCommandRestore} from './skill-command-restore'
 import {registerTools} from './tools'
 
 type PluginRuntime = {
@@ -108,6 +110,7 @@ export default {
   name: 'Clawly Plugins',
   description: 'Clawly utility RPC methods (clawly.*).',
   register(api: PluginApi) {
+    registerSkillCommandRestore(api)
     registerOutboundHook(api)
     registerOutboundMethods(api)
     registerOutboundHttpRoute(api)

package/package.json

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

package/gateway/channels-configure.ts

@@ -1,151 +0,0 @@
-/**
- * Channel configuration management via openclaw.json.
- *
- * Methods:
- * - clawly.channels.configure — add/update a channel account config
- * - clawly.channels.disconnect — remove a channel account config
- */
-
-import fs from 'node:fs'
-import path from 'node:path'
-
-import type {PluginApi} from '../index'
-
-const TOKEN_CHANNELS = new Set(['telegram', 'discord', 'slack', 'irc', 'googlechat'])
-
-function resolveStateDir(api: PluginApi): string {
-  return api.runtime.state?.resolveStateDir?.(process.env) ?? process.env.OPENCLAW_STATE_DIR ?? ''
-}
-
-function readOpenclawConfig(configPath: string): Record<string, unknown> {
-  try {
-    return JSON.parse(fs.readFileSync(configPath, 'utf-8'))
-  } catch {
-    return {}
-  }
-}
-
-function writeOpenclawConfig(configPath: string, config: Record<string, unknown>) {
-  fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n')
-}
-
-export function registerChannelsConfigure(api: PluginApi) {
-  // ── clawly.channels.configure ──────────────────────────────────
-
-  api.registerGatewayMethod('clawly.channels.configure', async ({params, respond}) => {
-    const channel = typeof params.channel === 'string' ? params.channel.trim() : ''
-    const accountId = typeof params.accountId === 'string' ? params.accountId.trim() : 'default'
-    const config =
-      params.config && typeof params.config === 'object' && !Array.isArray(params.config)
-        ? (params.config as Record<string, unknown>)
-        : null
-
-    if (!channel) {
-      respond(false, undefined, {code: 'invalid_params', message: 'channel is required'})
-      return
-    }
-
-    if (!TOKEN_CHANNELS.has(channel)) {
-      respond(false, undefined, {
-        code: 'invalid_params',
-        message: `unsupported channel: ${channel}. Supported: ${[...TOKEN_CHANNELS].join(', ')}`,
-      })
-      return
-    }
-
-    if (!config) {
-      respond(false, undefined, {code: 'invalid_params', message: 'config object is required'})
-      return
-    }
-
-    const stateDir = resolveStateDir(api)
-    if (!stateDir) {
-      respond(false, undefined, {code: 'internal', message: 'cannot resolve openclaw state dir'})
-      return
-    }
-
-    const configPath = path.join(stateDir, 'openclaw.json')
-
-    try {
-      const ocConfig = readOpenclawConfig(configPath)
-
-      // Ensure channels.<channel>.accounts.<accountId> path exists
-      if (!ocConfig.channels || typeof ocConfig.channels !== 'object') {
-        ocConfig.channels = {}
-      }
-      const channels = ocConfig.channels as Record<string, unknown>
-
-      if (!channels[channel] || typeof channels[channel] !== 'object') {
-        channels[channel] = {}
-      }
-      const channelConfig = channels[channel] as Record<string, unknown>
-
-      if (!channelConfig.accounts || typeof channelConfig.accounts !== 'object') {
-        channelConfig.accounts = {}
-      }
-      const accounts = channelConfig.accounts as Record<string, unknown>
-
-      // Merge config with enabled: true
-      accounts[accountId] = {
-        ...((accounts[accountId] as Record<string, unknown>) ?? {}),
-        ...config,
-        enabled: true,
-      }
-
-      writeOpenclawConfig(configPath, ocConfig)
-      api.logger.info(`channels.configure: wrote ${channel}/${accountId} to openclaw.json`)
-
-      respond(true, {ok: true, channel, accountId})
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err)
-      api.logger.error(`channels.configure: failed — ${msg}`)
-      respond(false, undefined, {code: 'internal', message: msg})
-    }
-  })
-
-  // ── clawly.channels.disconnect ─────────────────────────────────
-
-  api.registerGatewayMethod('clawly.channels.disconnect', async ({params, respond}) => {
-    const channel = typeof params.channel === 'string' ? params.channel.trim() : ''
-    const accountId = typeof params.accountId === 'string' ? params.accountId.trim() : 'default'
-
-    if (!channel) {
-      respond(false, undefined, {code: 'invalid_params', message: 'channel is required'})
-      return
-    }
-
-    const stateDir = resolveStateDir(api)
-    if (!stateDir) {
-      respond(false, undefined, {code: 'internal', message: 'cannot resolve openclaw state dir'})
-      return
-    }
-
-    const configPath = path.join(stateDir, 'openclaw.json')
-
-    try {
-      const ocConfig = readOpenclawConfig(configPath)
-      const channels = ocConfig.channels as Record<string, unknown> | undefined
-
-      if (channels && typeof channels === 'object') {
-        const channelConfig = channels[channel] as Record<string, unknown> | undefined
-        if (channelConfig && typeof channelConfig === 'object') {
-          const accounts = channelConfig.accounts as Record<string, unknown> | undefined
-          if (accounts && typeof accounts === 'object' && accountId in accounts) {
-            delete accounts[accountId]
-          }
-        }
-      }
-
-      writeOpenclawConfig(configPath, ocConfig)
-      api.logger.info(`channels.disconnect: removed ${channel}/${accountId} from openclaw.json`)
-
-      respond(true, {ok: true, channel, accountId})
-    } catch (err) {
-      const msg = err instanceof Error ? err.message : String(err)
-      api.logger.error(`channels.disconnect: failed — ${msg}`)
-      respond(false, undefined, {code: 'internal', message: msg})
-    }
-  })
-
-  api.logger.info('channels: registered clawly.channels.configure + clawly.channels.disconnect')
-}