@2en/clawly-plugins 1.22.2 → 1.22.3

package/gateway/offline-push.test.ts

@@ -274,14 +274,27 @@ 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('does not skip long message containing HEARTBEAT_OK', () => {
-    const longMsg = 'HEARTBEAT_OK ' + 'x'.repeat(400)
-    expect(shouldSkipPushForMessage(longMsg)).toBeNull()
+  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)).toBeNull()
+  })
+
+  test('does not skip message mentioning HEARTBEAT_OK mid-text', () => {
+    expect(
+      shouldSkipPushForMessage('HEARTBEAT_OK is a status code I output after each check.'),
+    ).toBeNull()
   })
 
   test('skips system prompt leak', () => {
@@ -345,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'
 
-  // Short heartbeat acknowledgment — mobile hides as "heartbeatAck"
-  if (text.includes('HEARTBEAT_OK') && text.length < 400) 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/package.json

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