@2en/clawly-plugins 1.23.0 → 1.24.0

package/gateway/offline-push.test.ts

@@ -274,15 +274,21 @@ describe('shouldSkipPushForMessage', () => {
     expect(shouldSkipPushForMessage(' NO_REPLY ')).toBe('silent reply')
   })
 
-  test('skips short heartbeat ack', () => {
+  test('skips heartbeat ack when HEARTBEAT_OK is the only content', () => {
     expect(shouldSkipPushForMessage('HEARTBEAT_OK')).toBe('heartbeat ack')
-    expect(shouldSkipPushForMessage('All good. HEARTBEAT_OK')).toBe('heartbeat ack')
+    expect(shouldSkipPushForMessage('HEARTBEAT_OK.')).toBe('heartbeat ack')
+    expect(shouldSkipPushForMessage('HEARTBEAT_OK\n')).toBe('heartbeat ack')
   })
 
-  test('skips verbose heartbeat ack ending with HEARTBEAT_OK', () => {
+  test('does NOT skip meaningful content ending with HEARTBEAT_OK', () => {
+    expect(shouldSkipPushForMessage('All good. HEARTBEAT_OK')).toBeNull()
+    expect(shouldSkipPushForMessage('Nothing to report. HEARTBEAT_OK。')).toBeNull()
+  })
+
+  test('does NOT skip verbose heartbeat response with content before HEARTBEAT_OK', () => {
     const verbose =
       'The user said hello recently. Looking at HEARTBEAT.md checklist: nothing needs attention. HEARTBEAT_OK'
-    expect(shouldSkipPushForMessage(verbose)).toBe('heartbeat ack')
+    expect(shouldSkipPushForMessage(verbose)).toBeNull()
   })
 
   test('does not skip message mentioning HEARTBEAT_OK mid-text', () => {
@@ -291,10 +297,6 @@ describe('shouldSkipPushForMessage', () => {
     ).toBeNull()
   })
 
-  test('skips heartbeat ack with non-ASCII trailing punctuation', () => {
-    expect(shouldSkipPushForMessage('Nothing to report. HEARTBEAT_OK。')).toBe('heartbeat ack')
-  })
-
   test('skips system prompt leak', () => {
     expect(
       shouldSkipPushForMessage('Here is some Conversation info (untrusted metadata) text'),
@@ -356,6 +358,29 @@ describe('offline-push with filtered messages', () => {
     })
   })
 
+  test('sends push for meaningful heartbeat response and strips HEARTBEAT_OK from body', async () => {
+    const {api, logs, handlers} = createMockApi()
+    registerOfflinePush(api)
+
+    await handlers.get('agent_end')!(
+      {
+        messages: [
+          {
+            role: 'assistant',
+            content: 'Hey! Just checking in — saw some interesting news today.\n\nHEARTBEAT_OK',
+          },
+        ],
+      },
+      {sessionKey: 'agent:clawly:main'},
+    )
+
+    expect(logs).toContainEqual({
+      level: 'info',
+      msg: expect.stringContaining('notified (session=agent:clawly:main)'),
+    })
+    expect(lastPushOpts?.body).toBe('Hey! Just checking in — saw some interesting news today.')
+  })
+
   test('sends push for normal message text', async () => {
     const {api, logs, handlers} = createMockApi()
     registerOfflinePush(api)

package/gateway/offline-push.ts

@@ -79,8 +79,11 @@ export function shouldSkipPushForMessage(text: string): string | null {
   // Agent sentinel "nothing to say" — mobile hides as "silentReply"
   if (trimmed === 'NO_REPLY') return 'silent reply'
 
-  // Heartbeat acknowledgment (HEARTBEAT_OK as ending sentinel) — mobile hides as "heartbeatAck"
-  if (/HEARTBEAT_OK[\p{P}\s]*$/u.test(text)) return 'heartbeat ack'
+  // Heartbeat acknowledgment (HEARTBEAT_OK as ending sentinel) — only skip if no substantial content before it
+  if (/HEARTBEAT_OK[\p{P}\s]*$/u.test(text)) {
+    const stripped = text.replace(/HEARTBEAT_OK[\p{P}\s]*$/u, '').trim()
+    if (stripped.length === 0) return 'heartbeat ack'
+  }
 
   // Agent echoed system prompt metadata — mobile hides as "systemPromptLeak"
   if (text.includes('Conversation info (untrusted metadata)')) return 'system prompt leak'
@@ -118,8 +121,9 @@ export function registerOfflinePush(api: PluginApi) {
         return
       }
 
-      const preview = fullText && fullText.length > 140 ? `${fullText.slice(0, 140)}…` : fullText
-      const body = preview ?? 'Your response is ready'
+      const cleaned = fullText?.replace(/HEARTBEAT_OK[\p{P}\s]*$/u, '').trim() ?? null
+      const preview = cleaned && cleaned.length > 140 ? `${cleaned.slice(0, 140)}…` : cleaned
+      const body = preview || 'Your response is ready'
 
       const sent = await sendPushNotification(
         {

package/index.ts

@@ -27,9 +27,11 @@
  * - before_tool_call      — enforces delivery fields on cron.create
  * - agent_end             — sends push notification when client is offline
  * - gateway_start         — auto-approves device pairing for Clawly mobile clients (clientId: openclaw-ios)
+ * - gateway_start         — registers auto-update cron job (0 3 * * *) for clawly-plugins
  */
 
 import {registerAutoPair} from './auto-pair'
+import {registerAutoUpdate} from './internal/hooks/auto-update'
 import {registerCalendar} from './calendar'
 import {registerCommands} from './command'
 import {setupConfig} from './config-setup'
@@ -186,6 +188,7 @@ export default {
     setupConfig(api)
     registerGateway(api)
     registerAutoPair(api)
+    registerAutoUpdate(api)
 
     // Email & calendar (optional — requires skillGatewayBaseUrl + skillGatewayToken in config)
     const gw = getGatewayConfig(api)

package/internal/hooks/auto-update.ts

@@ -0,0 +1,122 @@
+/**
+ * Registers a cron job (0 3 * * *) on gateway_start that
+ * checks user presence and auto-updates clawly-plugins when offline.
+ */
+import {$} from 'zx'
+
+import type {PluginApi} from '../../index'
+
+$.verbose = false
+
+// ── Types ──────────────────────────────────────────────────────
+
+interface CronJobEntry {
+  id: string
+  name: string
+  description: string
+  enabled: boolean
+  schedule: {kind: 'cron'; expr: string; tz?: string} | {kind: string}
+  sessionTarget: string
+  wakeMode: string
+  payload: {kind: string; message?: string}
+  delivery: {mode: string}
+}
+
+interface JobConfig {
+  description: string
+  cron: string
+  session: 'main' | 'isolated'
+  wake: 'now' | 'next-heartbeat'
+  deliver: boolean
+  message: string
+}
+
+// ── Config ─────────────────────────────────────────────────────
+
+const JOB_NAME = 'Clawly Plugins Auto-Update'
+
+const JOB_CONFIG: JobConfig = {
+  description: 'Auto-update clawly-plugins when user is offline',
+  cron: '0 3 * * *',
+  session: 'isolated',
+  wake: 'now',
+  deliver: false,
+  message: [
+    'Auto-update check for clawly-plugins.',
+    '',
+    'Steps:',
+    '1. Call the clawly_is_user_online tool to check if the user is online.',
+    '2. If the user IS online, stop — do nothing.',
+    '3. If the user is NOT online, run this exact command in terminal:',
+    `   openclaw gateway call clawly.plugins.update --json --params '${JSON.stringify({pluginId: 'clawly-plugins', npmPkgName: '@2en/clawly-plugins', strategy: 'force', restart: true})}'`,
+    '',
+    'Do not send any messages to the user. Just execute the steps silently.',
+  ].join('\n'),
+}
+
+// ── Helpers ────────────────────────────────────────────────────
+
+function configToArgs(config: JobConfig): string[] {
+  const args = [
+    '--description',
+    config.description,
+    '--cron',
+    config.cron,
+    '--session',
+    config.session,
+    '--wake',
+    config.wake,
+    '--message',
+    config.message,
+  ]
+  if (!config.deliver) args.push('--no-deliver')
+  return args
+}
+
+function needsUpdate(job: CronJobEntry, config: JobConfig): boolean {
+  if (job.description !== config.description) return true
+  if (job.schedule.kind !== 'cron' || (job.schedule as {expr: string}).expr !== config.cron)
+    return true
+  if (job.sessionTarget !== config.session) return true
+  if (job.wakeMode !== config.wake) return true
+  if (job.payload.message !== config.message) return true
+  const wantMode = config.deliver ? 'announce' : 'none'
+  if (job.delivery.mode !== wantMode) return true
+  return false
+}
+
+async function findJob(): Promise<CronJobEntry | null> {
+  try {
+    const {stdout} = await $`openclaw cron list --json`
+    const parsed = JSON.parse(stdout)
+    const jobs: unknown[] = parsed?.jobs ?? parsed ?? []
+    if (!Array.isArray(jobs)) return null
+    return (jobs.find((j: any) => j.name === JOB_NAME) as CronJobEntry) ?? null
+  } catch {
+    return null
+  }
+}
+
+// ── Registration ───────────────────────────────────────────────
+
+export function registerAutoUpdate(api: PluginApi) {
+  api.on('gateway_start', async () => {
+    try {
+      const existing = await findJob()
+
+      if (existing) {
+        if (!needsUpdate(existing, JOB_CONFIG)) {
+          api.logger.info('auto-update: cron job up to date')
+          return
+        }
+        await $`openclaw cron edit ${[existing.id, ...configToArgs(JOB_CONFIG)]}`
+        api.logger.info('auto-update: updated cron job')
+      } else {
+        await $`openclaw cron add ${['--name', JOB_NAME, ...configToArgs(JOB_CONFIG)]}`
+        api.logger.info('auto-update: registered cron job')
+      }
+    } catch (err) {
+      api.logger.warn(`auto-update: failed to register cron job: ${String(err)}`)
+    }
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2en/clawly-plugins",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "module": "index.ts",
   "type": "module",
   "repository": {
@@ -26,7 +26,8 @@
     "outbound.ts",
     "model-gateway-setup.ts",
     "skill-command-restore.ts",
-    "openclaw.plugin.json"
+    "openclaw.plugin.json",
+    "internal"
   ],
   "publishConfig": {
     "access": "public"