@2en/clawly-plugins 1.21.3 → 1.21.5

package/gateway/offline-push.test.ts

@@ -76,11 +76,11 @@ describe('offline-push', () => {
     registerOfflinePush(api)
 
     const handler = handlers.get('agent_end')!
-    await handler({}, {sessionKey: 'sess-1'})
+    await handler({}, {sessionKey: 'agent:clawly:main'})
 
     expect(logs).toContainEqual({
       level: 'info',
-      msg: expect.stringContaining('notified (session=sess-1)'),
+      msg: expect.stringContaining('notified (session=agent:clawly:main)'),
     })
   })
 
@@ -89,7 +89,7 @@ describe('offline-push', () => {
     const {api, logs, handlers} = createMockApi()
     registerOfflinePush(api)
 
-    await handlers.get('agent_end')!({}, {sessionKey: 'sess-1'})
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:main'})
 
     expect(logs.filter((l) => l.msg.includes('notified'))).toHaveLength(0)
     expect(logs.filter((l) => l.msg.includes('skipped'))).toHaveLength(0)
@@ -101,12 +101,25 @@ describe('offline-push', () => {
 
     const handler = handlers.get('agent_end')!
 
-    await handler({}, {sessionKey: 'sess-1'})
-    await handler({}, {sessionKey: 'sess-1'})
+    await handler({}, {sessionKey: 'agent:clawly:main'})
+    await handler({}, {sessionKey: 'agent:clawly:main'})
 
     expect(logs.filter((l) => l.msg.includes('notified'))).toHaveLength(2)
   })
 
+  test('skips push for non-main session (e.g. telegram)', async () => {
+    const {api, logs, handlers} = createMockApi()
+    registerOfflinePush(api)
+
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:telegram:12345'})
+
+    expect(logs).toContainEqual({
+      level: 'info',
+      msg: expect.stringContaining('skipped (non-main session: agent:clawly:telegram:12345)'),
+    })
+    expect(logs.filter((l) => l.msg.includes('notified'))).toHaveLength(0)
+  })
+
   test('sends push when ctx is missing', async () => {
     const {api, logs, handlers} = createMockApi()
     registerOfflinePush(api)
@@ -124,7 +137,7 @@ describe('offline-push', () => {
     const {api, handlers} = createMockApi()
     registerOfflinePush(api)
 
-    await handlers.get('agent_end')!({}, {sessionKey: 'sess-1', agentId: 'luna'})
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:main', agentId: 'luna'})
 
     expect(lastPushOpts?.agentId).toBe('luna')
   })
@@ -133,7 +146,7 @@ describe('offline-push', () => {
     const {api, handlers} = createMockApi()
     registerOfflinePush(api)
 
-    await handlers.get('agent_end')!({}, {sessionKey: 'sess-1'})
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:main'})
 
     expect(lastPushOpts?.title).toBeUndefined()
   })
@@ -149,7 +162,7 @@ describe('offline-push', () => {
           {role: 'assistant', content: 'Hi there! How can I help you today?'},
         ],
       },
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(lastPushOpts?.body).toBe('Hi there! How can I help you today?')
@@ -159,7 +172,7 @@ describe('offline-push', () => {
     const {api, handlers} = createMockApi()
     registerOfflinePush(api)
 
-    await handlers.get('agent_end')!({}, {sessionKey: 'sess-1'})
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:main'})
 
     expect(lastPushOpts?.body).toBe('Your response is ready')
   })
@@ -170,7 +183,7 @@ describe('offline-push', () => {
 
     await handlers.get('agent_end')!(
       {messages: [{role: 'user', content: 'Hello'}]},
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(lastPushOpts?.body).toBe('Your response is ready')
@@ -291,7 +304,7 @@ describe('offline-push with filtered messages', () => {
 
     await handlers.get('agent_end')!(
       {messages: [{role: 'assistant', content: 'NO_REPLY'}]},
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(logs).toContainEqual({
@@ -307,7 +320,7 @@ describe('offline-push with filtered messages', () => {
 
     await handlers.get('agent_end')!(
       {messages: [{role: 'assistant', content: 'HEARTBEAT_OK'}]},
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(logs).toContainEqual({
@@ -323,7 +336,7 @@ describe('offline-push with filtered messages', () => {
 
     await handlers.get('agent_end')!(
       {messages: [{role: 'assistant', content: '   '}]},
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(logs).toContainEqual({
@@ -338,12 +351,12 @@ describe('offline-push with filtered messages', () => {
 
     await handlers.get('agent_end')!(
       {messages: [{role: 'assistant', content: 'I finished the task you asked about!'}]},
-      {sessionKey: 'sess-1'},
+      {sessionKey: 'agent:clawly:main'},
     )
 
     expect(logs).toContainEqual({
       level: 'info',
-      msg: expect.stringContaining('notified (session=sess-1)'),
+      msg: expect.stringContaining('notified (session=agent:clawly:main)'),
     })
   })
 
@@ -351,11 +364,11 @@ describe('offline-push with filtered messages', () => {
     const {api, logs, handlers} = createMockApi()
     registerOfflinePush(api)
 
-    await handlers.get('agent_end')!({}, {sessionKey: 'sess-1'})
+    await handlers.get('agent_end')!({}, {sessionKey: 'agent:clawly:main'})
 
     expect(logs).toContainEqual({
       level: 'info',
-      msg: expect.stringContaining('notified (session=sess-1)'),
+      msg: expect.stringContaining('notified (session=agent:clawly:main)'),
     })
   })
 })

package/gateway/offline-push.ts

@@ -111,6 +111,13 @@ export function registerOfflinePush(api: PluginApi) {
       const sessionKey = typeof ctx?.sessionKey === 'string' ? ctx.sessionKey : undefined
       const agentId = typeof ctx?.agentId === 'string' ? ctx.agentId : undefined
 
+      // Only send push for the main clawly mobile session — skip channel
+      // sessions (telegram, slack, discord, etc.) which have their own delivery.
+      if (sessionKey !== undefined && sessionKey !== 'agent:clawly:main') {
+        api.logger.info(`offline-push: skipped (non-main session: ${sessionKey})`)
+        return
+      }
+
       const preview = fullText && fullText.length > 140 ? `${fullText.slice(0, 140)}…` : fullText
       const body = preview ?? 'Your response is ready'
 

package/package.json

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

package/session-setup.ts

@@ -1,7 +1,10 @@
 /**
- * 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.
+ * On plugin init, patches openclaw.json to:
+ * 1. Set `session.dmScope` to "per-channel-peer" — isolates Telegram (and
+ *    other channel) DMs from the Clawly mobile session.
+ * 2. Set `tools.sessions.visibility` to "agent" — lets the agent read
+ *    conversation history from other sessions under the same agent (e.g.
+ *    reference recent Telegram chats from the mobile session).
  *
  * Runs synchronously during plugin registration, same pattern as
  * model-gateway-setup.ts.
@@ -13,6 +16,7 @@ import type {PluginApi} from './index'
 import {readOpenclawConfig, resolveStateDir, writeOpenclawConfig} from './model-gateway-setup'
 
 const DESIRED_DM_SCOPE = 'per-channel-peer'
+const DESIRED_SESSION_VISIBILITY = 'agent'
 
 export function setupSession(api: PluginApi): void {
   const stateDir = resolveStateDir(api)
@@ -24,18 +28,33 @@ export function setupSession(api: PluginApi): void {
   const configPath = path.join(stateDir, 'openclaw.json')
   const config = readOpenclawConfig(configPath)
 
+  let dirty = false
+
+  // 1. dmScope
   const session = ((config.session as Record<string, unknown>) ?? {}) as Record<string, unknown>
+  if (session.dmScope !== DESIRED_DM_SCOPE) {
+    session.dmScope = DESIRED_DM_SCOPE
+    config.session = session
+    dirty = true
+  }
 
-  if (session.dmScope === DESIRED_DM_SCOPE) {
-    return
+  // 2. tools.sessions.visibility
+  const tools = ((config.tools as Record<string, unknown>) ?? {}) as Record<string, unknown>
+  const sessions = ((tools.sessions as Record<string, unknown>) ?? {}) as Record<string, unknown>
+  if (sessions.visibility !== DESIRED_SESSION_VISIBILITY) {
+    sessions.visibility = DESIRED_SESSION_VISIBILITY
+    tools.sessions = sessions
+    config.tools = tools
+    dirty = true
   }
 
-  session.dmScope = DESIRED_DM_SCOPE
-  config.session = session
+  if (!dirty) return
 
   try {
     writeOpenclawConfig(configPath, config)
-    api.logger.info(`Session: set dmScope to "${DESIRED_DM_SCOPE}".`)
+    api.logger.info(
+      `Session: dmScope="${DESIRED_DM_SCOPE}", tools.sessions.visibility="${DESIRED_SESSION_VISIBILITY}".`,
+    )
   } catch (err) {
     api.logger.error(`Failed to update session config: ${(err as Error).message}`)
   }