@2en/clawly-plugins 1.21.1 → 1.21.3

package/cron-hook.ts

@@ -2,7 +2,7 @@
  * before_tool_call hook for cron (action=add) — ensures delivery fields are
  * always set correctly, even when the LLM omits them.
  *
- * Forces: delivery.mode = "none" (agent uses clawly_send_message/push tools)
+ * Forces: delivery.mode = "none" (agent uses clawly_send_message tool)
  * Appends: delivery instructions to payload.message
  * Patches: payload.kind "systemEvent" → "agentTurn"
  *
@@ -25,8 +25,6 @@ const DELIVERY_SUFFIX = [
   'DELIVERY INSTRUCTIONS (mandatory):',
   'When done, you MUST deliver your result to the user:',
   '1. Call the clawly_send_message tool with role="assistant" and a brief, natural summary of your result.',
-  '2. Call clawly_is_user_online to check if the user is online.',
-  '3. If offline, also call clawly_send_app_push with a short notification.',
 ].join('\n')
 
 function patchJob(job: UnknownRecord): UnknownRecord {

package/index.ts

@@ -36,6 +36,7 @@ import {registerEmail} from './email'
 import {registerGateway} from './gateway'
 import {getGatewayConfig} from './gateway-fetch'
 import {setupModelGateway} from './model-gateway-setup'
+import {setupSession} from './session-setup'
 import {registerOutboundHook, registerOutboundHttpRoute, registerOutboundMethods} from './outbound'
 import {registerSkillCommandRestore} from './skill-command-restore'
 import {registerTools} from './tools'
@@ -120,6 +121,7 @@ export default {
     registerGateway(api)
     registerAutoPair(api)
     setupModelGateway(api)
+    setupSession(api)
 
     // Email & calendar (optional — requires skillGatewayBaseUrl + skillGatewayToken in config)
     const gw = getGatewayConfig(api)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2en/clawly-plugins",
-  "version": "1.21.1",
+  "version": "1.21.3",
   "module": "index.ts",
   "type": "module",
   "repository": {
@@ -24,6 +24,8 @@
     "gateway-fetch.ts",
     "outbound.ts",
     "model-gateway-setup.ts",
+    "session-setup.ts",
+    "skill-command-restore.ts",
     "openclaw.plugin.json"
   ],
   "publishConfig": {

package/session-setup.ts

@@ -0,0 +1,42 @@
+/**
+ * On plugin init, patches openclaw.json to set `session.dmScope` to
+ * "per-channel-peer".  This isolates Telegram (and other channel) DMs from the
+ * Clawly mobile session so messages don't leak across channels.
+ *
+ * Runs synchronously during plugin registration, same pattern as
+ * model-gateway-setup.ts.
+ */
+
+import path from 'node:path'
+
+import type {PluginApi} from './index'
+import {readOpenclawConfig, resolveStateDir, writeOpenclawConfig} from './model-gateway-setup'
+
+const DESIRED_DM_SCOPE = 'per-channel-peer'
+
+export function setupSession(api: PluginApi): void {
+  const stateDir = resolveStateDir(api)
+  if (!stateDir) {
+    api.logger.warn('Cannot resolve state dir — session setup skipped.')
+    return
+  }
+
+  const configPath = path.join(stateDir, 'openclaw.json')
+  const config = readOpenclawConfig(configPath)
+
+  const session = ((config.session as Record<string, unknown>) ?? {}) as Record<string, unknown>
+
+  if (session.dmScope === DESIRED_DM_SCOPE) {
+    return
+  }
+
+  session.dmScope = DESIRED_DM_SCOPE
+  config.session = session
+
+  try {
+    writeOpenclawConfig(configPath, config)
+    api.logger.info(`Session: set dmScope to "${DESIRED_DM_SCOPE}".`)
+  } catch (err) {
+    api.logger.error(`Failed to update session config: ${(err as Error).message}`)
+  }
+}

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),
+        },
+      }
+    },
+  )
+}