@2en/clawly-plugins 1.7.1 → 1.8.0

package/channel.ts

@@ -1,39 +1,12 @@
 /**
- * Clawly cron delivery channel — registers a minimal channel plugin so that
- * cron jobs using `delivery: { channel: "clawly-cron" }` have a valid target.
+ * Clawly cron delivery channel — minimal no-op channel registration.
  *
- * When a cron job delivers text, the channel routes it through the agent via
- * `openclaw agent --message` (LLM round-trip) so the response appears as a
- * natural assistant message, then sends a push notification if the mobile
- * client is offline.
+ * With delivery.mode = "none", OpenClaw does not call sendText. This
+ * registration exists so that any existing cron jobs referencing
+ * channel "clawly-cron" still have a valid target and don't error out.
  */
 
-import {$} from 'zx'
 import type {PluginApi} from './index'
-import {sendPushNotification} from './gateway/notification'
-import {isClientOnline} from './gateway/presence'
-
-$.verbose = false
-
-async function deliverAndNotify(text: string, api: PluginApi): Promise<void> {
-  try {
-    const config = api.pluginConfig as Record<string, unknown> | undefined
-    const agentId = typeof config?.agentId === 'string' ? config.agentId : 'clawly'
-
-    await $`openclaw agent --agent ${agentId} --message ${text}`
-    api.logger.info(`clawly-cron: delivered message (${text.length} chars) to agent ${agentId}`)
-
-    // Push notification if client is offline
-    const online = await isClientOnline()
-    if (!online) {
-      const pushSent = await sendPushNotification({body: text}, api)
-      api.logger.info(`clawly-cron: push notification sent=${pushSent}`)
-    }
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err)
-    api.logger.error(`clawly-cron: failed to deliver message — ${msg}`)
-  }
-}
 
 export function registerClawlyCronChannel(api: PluginApi) {
   const channelRegistration = {
@@ -44,7 +17,7 @@ export function registerClawlyCronChannel(api: PluginApi) {
         label: 'Clawly Cron',
         selectionLabel: 'Clawly Cron (webchat)',
         docsPath: '',
-        blurb: 'Webchat-only cron delivery channel',
+        blurb: 'No-op cron delivery channel (delivery.mode = none)',
       },
       capabilities: {chatTypes: ['dm'] as const},
       config: {
@@ -68,18 +41,10 @@ export function registerClawlyCronChannel(api: PluginApi) {
       },
       outbound: {
         deliveryMode: 'direct' as const,
-        sendText: async (...args: unknown[]) => {
-          const firstArg = args[0] as Record<string, unknown> | undefined
-          const text = typeof firstArg?.text === 'string' ? firstArg.text : ''
-          api.logger.info(`clawly-cron sendText: text=${text.length} chars`)
-          if (text) {
-            // Fire-and-forget — delivery system may not await sendText
-            deliverAndNotify(text, api).catch(() => {})
-          }
+        sendText: async () => {
           return {channel: 'clawly-cron', messageId: crypto.randomUUID()}
         },
-        sendMedia: async (...args: unknown[]) => {
-          api.logger.info(`clawly-cron sendMedia: ${JSON.stringify(args)}`)
+        sendMedia: async () => {
           return {channel: 'clawly-cron', messageId: crypto.randomUUID()}
         },
       },
@@ -87,5 +52,5 @@ export function registerClawlyCronChannel(api: PluginApi) {
   }
 
   api.registerChannel(channelRegistration)
-  api.logger.info('channel: registered clawly-cron delivery channel')
+  api.logger.info('channel: registered clawly-cron delivery channel (no-op)')
 }

package/cron-hook.ts

@@ -2,7 +2,8 @@
  * before_tool_call hook for cron (action=add) — ensures delivery fields are
  * always set correctly, even when the LLM omits them.
  *
- * Forces: delivery.channel = "clawly-cron", delivery.to = "self", delivery.mode = "announce"
+ * Forces: delivery.mode = "none" (agent uses clawly_send_message/push tools)
+ * Appends: delivery instructions to payload.message
  * Patches: payload.kind "systemEvent" → "agentTurn"
  *
  * The cron tool name is "cron" (not "cron.create"). The LLM passes
@@ -18,21 +19,33 @@ function isRecord(v: unknown): v is UnknownRecord {
   return typeof v === 'object' && v !== null && !Array.isArray(v)
 }
 
+const DELIVERY_SUFFIX = [
+  '',
+  '---',
+  'DELIVERY INSTRUCTIONS (mandatory):',
+  'When done, you MUST deliver your result to the user:',
+  '1. Call the clawly_send_message tool with 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 {
   const patched: UnknownRecord = {...job}
 
-  // Force delivery fields
-  const delivery = isRecord(job.delivery) ? job.delivery : {}
-  patched.delivery = {
-    ...delivery,
-    mode: 'announce',
-    channel: 'clawly-cron',
-    to: 'self',
+  // Force delivery.mode = "none" — agent reports via tools explicitly
+  patched.delivery = {mode: 'none'}
+
+  // Append delivery instructions to payload.message
+  if (isRecord(job.payload) && typeof job.payload.message === 'string') {
+    patched.payload = {
+      ...job.payload,
+      message: job.payload.message + DELIVERY_SUFFIX,
+    }
   }
 
   // Patch payload.kind: systemEvent → agentTurn
-  if (isRecord(job.payload) && job.payload.kind === 'systemEvent') {
-    patched.payload = {...job.payload, kind: 'agentTurn'}
+  if (isRecord(patched.payload) && (patched.payload as UnknownRecord).kind === 'systemEvent') {
+    patched.payload = {...(patched.payload as UnknownRecord), kind: 'agentTurn'}
   }
 
   return patched

package/index.ts

@@ -15,6 +15,7 @@
  * Agent tools:
  * - clawly_is_user_online    — check if user's device is connected
  * - clawly_send_app_push     — send a push notification to user's device
+ * - clawly_send_message      — send a message to user via main session agent
  *
  * Commands:
  * - /clawly_echo          — echo text back without LLM

package/package.json

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

package/tools/clawly-send-message.ts

@@ -0,0 +1,54 @@
+/**
+ * Agent tool: clawly_send_message — send a message to the main session
+ * agent from an isolated context (e.g. cron job).
+ *
+ * Runs `openclaw agent --agent <agent> --message <message>` which delivers
+ * the text as a natural assistant response in the user's chat.
+ */
+
+import {$} from 'zx'
+import type {PluginApi} from '../index'
+
+$.verbose = false
+
+const TOOL_NAME = 'clawly_send_message'
+
+const parameters: Record<string, unknown> = {
+  type: 'object',
+  required: ['message'],
+  properties: {
+    message: {type: 'string', description: 'The message to send to the user'},
+    agent: {type: 'string', description: 'Target agent ID (default: "clawly")'},
+  },
+}
+
+export function registerSendMessageTool(api: PluginApi) {
+  api.registerTool({
+    name: TOOL_NAME,
+    description:
+      'Send a message to the user via the main session agent. Use this from cron jobs or isolated sessions to deliver results to the user.',
+    parameters,
+    async execute(_toolCallId, params) {
+      const message = typeof params.message === 'string' ? params.message.trim() : ''
+      if (!message) {
+        return {content: [{type: 'text', text: JSON.stringify({error: 'message is required'})}]}
+      }
+
+      const agent = typeof params.agent === 'string' ? params.agent.trim() : 'clawly'
+
+      try {
+        await $`openclaw agent --agent ${agent} --message ${message}`
+        api.logger.info(
+          `${TOOL_NAME}: delivered message (${message.length} chars) to agent ${agent}`,
+        )
+        return {content: [{type: 'text', text: JSON.stringify({sent: true})}]}
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err)
+        api.logger.error(`${TOOL_NAME}: failed — ${msg}`)
+        return {content: [{type: 'text', text: JSON.stringify({sent: false, error: msg})}]}
+      }
+    },
+  })
+
+  api.logger.info(`tool: registered ${TOOL_NAME} agent tool`)
+}

package/tools/index.ts

@@ -1,8 +1,10 @@
 import type {PluginApi} from '../index'
 import {registerIsUserOnlineTool} from './clawly-is-user-online'
 import {registerSendAppPushTool} from './clawly-send-app-push'
+import {registerSendMessageTool} from './clawly-send-message'
 
 export function registerTools(api: PluginApi) {
   registerIsUserOnlineTool(api)
   registerSendAppPushTool(api)
+  registerSendMessageTool(api)
 }