@2en/clawly-plugins 1.21.0 → 1.21.2

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.21.0",
+  "version": "1.21.2",
   "module": "index.ts",
   "type": "module",
   "repository": {
@@ -24,6 +24,7 @@
     "gateway-fetch.ts",
     "outbound.ts",
     "model-gateway-setup.ts",
+    "skill-command-restore.ts",
     "openclaw.plugin.json"
   ],
   "publishConfig": {

package/skill-command-restore.ts

@@ -0,0 +1,94 @@
+/**
+ * Hook: before_message_write — restore original /skill command in user messages.
+ *
+ * The OpenClaw gateway rewrites `/skill <name> <args>` into a formatted prompt:
+ *   Use the "<name>" skill for this request.
+ *
+ *   User input:
+ *   <args>
+ *
+ * This rewrite is useful for the LLM but pollutes chat history — the mobile app
+ * sees the rewritten text instead of what the user actually typed.
+ *
+ * This hook intercepts user messages before they're written to the session JSONL
+ * and restores the original `/skill <name> <args>` format.
+ */
+
+import type {PluginApi} from './index'
+
+const SKILL_REWRITE_RE = /^Use the "(.+?)" skill for this request\.(?:\n\nUser input:\n([\s\S]+))?$/
+
+type AgentMessage = {
+  role: string
+  content: unknown
+}
+
+type BeforeMessageWriteEvent = {
+  message: AgentMessage
+}
+
+type BeforeMessageWriteResult = {
+  message?: AgentMessage
+}
+
+function extractText(content: unknown): string {
+  if (typeof content === 'string') return content
+  if (Array.isArray(content)) {
+    return content
+      .map((part: unknown) => {
+        if (!part || typeof part !== 'object') return ''
+        const p = part as {type?: string; text?: string}
+        return p.type === 'text' && typeof p.text === 'string' ? p.text : ''
+      })
+      .filter(Boolean)
+      .join('')
+  }
+  return ''
+}
+
+function replaceText(content: unknown, newText: string): unknown {
+  if (typeof content === 'string') return newText
+  if (Array.isArray(content)) {
+    // Collapse all text parts into one to avoid duplicating the restored text
+    // when the original content was split across multiple text parts.
+    let replaced = false
+    return content.flatMap((part: unknown) => {
+      if (!part || typeof part !== 'object') return [part]
+      const p = part as {type?: string; text?: string}
+      if (p.type === 'text' && typeof p.text === 'string') {
+        if (!replaced) {
+          replaced = true
+          return [{...p, text: newText}]
+        }
+        return []
+      }
+      return [part]
+    })
+  }
+  return content
+}
+
+export function registerSkillCommandRestore(api: PluginApi) {
+  api.on(
+    'before_message_write',
+    (event: BeforeMessageWriteEvent): BeforeMessageWriteResult | void => {
+      const {message} = event
+      if (message.role !== 'user') return
+
+      const text = extractText(message.content)
+      const match = text.match(SKILL_REWRITE_RE)
+      if (!match) return
+
+      const skillName = match[1]
+      const args = match[2]?.trim()
+      const restored = args ? `/skill ${skillName} ${args}` : `/skill ${skillName}`
+
+      return {
+        message: {
+          ...message,
+          content: replaceText(message.content, restored),
+        },
+      }
+    },
+  )
+}