@2en/clawly-plugins 1.4.1 → 1.6.0

package/lib/semver.test.ts

@@ -0,0 +1,88 @@
+import {describe, expect, test} from 'bun:test'
+import {compareSemVer, isUpdateAvailable, parseSemVer} from './semver'
+
+describe('parseSemVer', () => {
+  test('parses simple version', () => {
+    const v = parseSemVer('1.2.3')
+    expect(v).toEqual({major: 1, minor: 2, patch: 3, prerelease: undefined, raw: '1.2.3'})
+  })
+
+  test('parses version with v prefix', () => {
+    const v = parseSemVer('v1.2.3')
+    expect(v).toEqual({major: 1, minor: 2, patch: 3, prerelease: undefined, raw: 'v1.2.3'})
+  })
+
+  test('parses version with prerelease', () => {
+    const v = parseSemVer('1.2.3-beta.1')
+    expect(v).toEqual({major: 1, minor: 2, patch: 3, prerelease: 'beta.1', raw: '1.2.3-beta.1'})
+  })
+
+  test('returns null for invalid input', () => {
+    expect(parseSemVer('')).toBeNull()
+    expect(parseSemVer('abc')).toBeNull()
+    expect(parseSemVer('1.2')).toBeNull()
+    expect(parseSemVer('1.2.3.4')).toBeNull()
+  })
+
+  test('trims whitespace', () => {
+    const v = parseSemVer('  1.0.0  ')
+    expect(v?.major).toBe(1)
+  })
+})
+
+describe('compareSemVer', () => {
+  test('equal versions return 0', () => {
+    expect(compareSemVer('1.0.0', '1.0.0')).toBe(0)
+  })
+
+  test('major difference', () => {
+    expect(compareSemVer('2.0.0', '1.0.0')).toBe(1)
+    expect(compareSemVer('1.0.0', '2.0.0')).toBe(-1)
+  })
+
+  test('minor difference', () => {
+    expect(compareSemVer('1.1.0', '1.0.0')).toBe(1)
+    expect(compareSemVer('1.0.0', '1.1.0')).toBe(-1)
+  })
+
+  test('patch difference', () => {
+    expect(compareSemVer('1.0.1', '1.0.0')).toBe(1)
+    expect(compareSemVer('1.0.0', '1.0.1')).toBe(-1)
+  })
+
+  test('release > prerelease at same version', () => {
+    expect(compareSemVer('1.0.0', '1.0.0-beta.1')).toBe(1)
+    expect(compareSemVer('1.0.0-beta.1', '1.0.0')).toBe(-1)
+  })
+
+  test('two prereleases at same version return 0', () => {
+    expect(compareSemVer('1.0.0-alpha', '1.0.0-beta')).toBe(0)
+  })
+
+  test('returns null for invalid input', () => {
+    expect(compareSemVer('abc', '1.0.0')).toBeNull()
+    expect(compareSemVer('1.0.0', 'abc')).toBeNull()
+  })
+})
+
+describe('isUpdateAvailable', () => {
+  test('returns true when latest > current', () => {
+    expect(isUpdateAvailable('1.0.0', '1.1.0')).toBe(true)
+    expect(isUpdateAvailable('1.0.0', '2.0.0')).toBe(true)
+    expect(isUpdateAvailable('1.5.0', '1.5.1')).toBe(true)
+  })
+
+  test('returns false when latest <= current', () => {
+    expect(isUpdateAvailable('1.0.0', '1.0.0')).toBe(false)
+    expect(isUpdateAvailable('2.0.0', '1.0.0')).toBe(false)
+  })
+
+  test('returns false when latest is prerelease', () => {
+    expect(isUpdateAvailable('1.0.0', '2.0.0-beta.1')).toBe(false)
+  })
+
+  test('returns false for invalid input', () => {
+    expect(isUpdateAvailable('abc', '1.0.0')).toBe(false)
+    expect(isUpdateAvailable('1.0.0', 'abc')).toBe(false)
+  })
+})

package/lib/semver.ts

@@ -0,0 +1,46 @@
+export interface SemVer {
+  major: number
+  minor: number
+  patch: number
+  prerelease: string | undefined
+  raw: string
+}
+
+const SEMVER_RE = /^v?(\d+)\.(\d+)\.(\d+)(?:-(.+))?$/
+
+export function parseSemVer(version: string): SemVer | null {
+  const m = version.trim().match(SEMVER_RE)
+  if (!m) return null
+  return {
+    major: Number(m[1]),
+    minor: Number(m[2]),
+    patch: Number(m[3]),
+    prerelease: m[4] ?? undefined,
+    raw: version.trim(),
+  }
+}
+
+export function compareSemVer(a: string, b: string): -1 | 0 | 1 | null {
+  const pa = parseSemVer(a)
+  const pb = parseSemVer(b)
+  if (!pa || !pb) return null
+
+  for (const key of ['major', 'minor', 'patch'] as const) {
+    if (pa[key] > pb[key]) return 1
+    if (pa[key] < pb[key]) return -1
+  }
+
+  // Both equal in major.minor.patch — compare prerelease
+  // A release (no prerelease) is greater than a prerelease
+  if (!pa.prerelease && pb.prerelease) return 1
+  if (pa.prerelease && !pb.prerelease) return -1
+
+  return 0
+}
+
+export function isUpdateAvailable(current: string, latest: string): boolean {
+  const pl = parseSemVer(latest)
+  if (!pl || pl.prerelease) return false // latest must be stable
+  const cmp = compareSemVer(latest, current)
+  return cmp === 1
+}

package/lib/stripCliLogs.test.ts

@@ -0,0 +1,71 @@
+import {describe, expect, test} from 'bun:test'
+import {stripCliLogs} from './stripCliLogs'
+
+describe('stripCliLogs', () => {
+  test('strips leading log lines', () => {
+    const input = [
+      '11:40:09 [plugins] echo: registered /clawly_echo command',
+      '11:40:09 [plugins] tool: registered clawly_is_user_online agent tool',
+      '11:40:09 [plugins] tool: registered clawly_send_app_push agent tool',
+      '[{"id":"clawly-plugins","version":"1.5.0"}]',
+    ].join('\n')
+    expect(stripCliLogs(input)).toBe('[{"id":"clawly-plugins","version":"1.5.0"}]')
+  })
+
+  test('returns unchanged when no log lines', () => {
+    const input = '{"ok":true}'
+    expect(stripCliLogs(input)).toBe('{"ok":true}')
+  })
+
+  test('handles single-digit hour', () => {
+    const input = '9:05:01 [core] init\n{"data":1}'
+    expect(stripCliLogs(input)).toBe('{"data":1}')
+  })
+
+  test('returns empty string when all lines are logs', () => {
+    const input = '11:00:00 [a] foo\n12:00:00 [b] bar'
+    expect(stripCliLogs(input)).toBe('')
+  })
+
+  test('preserves multiline JSON after logs', () => {
+    const input = ['11:40:09 [plugins] loading', '{', '  "version": "1.0.0"', '}'].join('\n')
+    expect(stripCliLogs(input)).toBe('{\n  "version": "1.0.0"\n}')
+  })
+
+  test('handles empty input', () => {
+    expect(stripCliLogs('')).toBe('')
+  })
+
+  test('does not strip lines that merely contain a timestamp mid-line', () => {
+    const input = 'some prefix 11:40:09 [x] y\n{"ok":true}'
+    expect(stripCliLogs(input)).toBe('some prefix 11:40:09 [x] y\n{"ok":true}')
+  })
+
+  test('strips ANSI color codes from log lines', () => {
+    const input = [
+      '\x1b[35m12:46:24 [plugins] presence: registered clawly.isOnline method',
+      '\x1b[35m12:46:24 [plugins] registered clawly.plugins.version',
+      '[{"id":"clawly-plugins","version":"1.5.0"}]',
+    ].join('\n')
+    expect(stripCliLogs(input)).toBe('[{"id":"clawly-plugins","version":"1.5.0"}]')
+  })
+
+  test('strips log lines without timestamps (after ANSI stripping)', () => {
+    const input = [
+      '\x1b[35m[plugins] echo: registered /clawly_echo command',
+      '\x1b[35m[plugins] tool: registered clawly_send_app_push agent tool',
+      '[{"id":"clawly-plugins"}]',
+    ].join('\n')
+    expect(stripCliLogs(input)).toBe('[{"id":"clawly-plugins"}]')
+  })
+
+  test('strips plain log lines without timestamps', () => {
+    const input = '[plugins] Loaded clawly-plugins plugin.\n{"ok":true}'
+    expect(stripCliLogs(input)).toBe('{"ok":true}')
+  })
+
+  test('preserves JSON arrays (not confused with log prefixes)', () => {
+    const input = '[{"id":"test"}]'
+    expect(stripCliLogs(input)).toBe('[{"id":"test"}]')
+  })
+})

package/lib/stripCliLogs.ts

@@ -0,0 +1,25 @@
+/**
+ * Strip leading log lines from `openclaw ... --json` output.
+ *
+ * OpenClaw CLI may emit log lines (with or without ANSI colors / timestamps)
+ * before the actual JSON payload:
+ *
+ *   11:40:09 [plugins] echo: registered /clawly_echo command
+ *   \x1b[35m[plugins] tool: registered clawly_send_app_push agent tool
+ *   [{"id":"clawly-plugins", ...}]
+ *
+ * This function strips ANSI escape sequences, drops every line that looks
+ * like a log prefix (`HH:MM:SS [tag] ...` or `[tag] ...`), and returns the
+ * remaining text (the JSON body).
+ */
+
+const ANSI_RE = /\x1b\[[0-9;]*m/g
+const LOG_LINE_RE = /^(\d{1,2}:\d{2}:\d{2} )?\[\w[\w-]*\] /
+
+export function stripCliLogs(output: string): string {
+  const cleaned = output.replace(ANSI_RE, '')
+  const lines = cleaned.split('\n')
+  const firstNonLog = lines.findIndex((line) => !LOG_LINE_RE.test(line))
+  if (firstNonLog === -1) return ''
+  return lines.slice(firstNonLog).join('\n').trim()
+}

package/openclaw.plugin.json

@@ -1,12 +1,51 @@
 {
   "id": "clawly-plugins",
   "name": "Clawly Plugins",
-  "description": "Clawly utility RPC methods (clawly.*): file access, presence, push notifications, and agent messaging.",
+  "description": "Clawly utility RPC methods (clawly.*): file access, presence, push notifications, agent messaging, memory browser, and ClawHub CLI bridge.",
   "version": "0.2.0",
+  "uiHints": {
+    "memoryDir": {
+      "label": "Memory directory",
+      "help": "Absolute path to the memory directory containing .md files. Defaults to <OPENCLAW_WORKSPACE>/memory.",
+      "placeholder": "/data/memory"
+    },
+    "bin": {
+      "label": "clawhub binary",
+      "help": "Command to run (must be in PATH on the gateway host).",
+      "placeholder": "clawhub"
+    },
+    "defaultDir": {
+      "label": "Default skills dir",
+      "help": "Maps to `clawhub --dir` when not provided per-call.",
+      "placeholder": "skills"
+    },
+    "defaultNoInput": {
+      "label": "Default no-input",
+      "help": "If true, adds `--no-input` unless the tool call overrides it.",
+      "advanced": true
+    },
+    "defaultTimeoutMs": {
+      "label": "Default timeout (ms)",
+      "help": "Default command timeout for most tool calls.",
+      "advanced": true
+    },
+    "configPath": {
+      "label": "CLAWHUB_CONFIG_PATH",
+      "help": "Where the ClawHub CLI stores auth/config. Defaults to `<OPENCLAW_STATE_DIR>/clawhub/config.json`.",
+      "advanced": true,
+      "placeholder": "~/.openclaw/clawhub/config.json"
+    }
+  },
   "configSchema": {
     "type": "object",
     "additionalProperties": false,
     "properties": {
+      "memoryDir": { "type": "string", "minLength": 1 },
+      "bin": { "type": "string", "minLength": 1 },
+      "defaultDir": { "type": "string", "minLength": 1 },
+      "defaultNoInput": { "type": "boolean" },
+      "defaultTimeoutMs": { "type": "number", "minimum": 1000 },
+      "configPath": { "type": "string" },
       "gatewayBaseUrl": { "type": "string" },
       "gatewayToken": { "type": "string" }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2en/clawly-plugins",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "module": "index.ts",
   "type": "module",
   "repository": {
@@ -12,6 +12,9 @@
     "zx": "npm:zx@8.8.5-lite"
   },
   "files": [
+    "command",
+    "gateway",
+    "lib",
     "tools",
     "index.ts",
     "calendar.ts",
@@ -20,11 +23,6 @@
     "email.ts",
     "gateway-fetch.ts",
     "outbound.ts",
-    "echo.ts",
-    "presence.ts",
-    "notification.ts",
-    "agent-send.ts",
-    "tools.ts",
     "openclaw.plugin.json"
   ],
   "publishConfig": {

package/tools/clawly-is-user-online.ts

@@ -5,7 +5,7 @@
  */
 
 import type {PluginApi} from '../index'
-import {isClientOnline} from '../presence'
+import {isClientOnline} from '../gateway/presence'
 
 const TOOL_NAME = 'clawly_is_user_online'
 

package/tools/clawly-send-app-push.ts

@@ -7,7 +7,7 @@
  */
 
 import type {PluginApi} from '../index'
-import {sendPushNotification} from '../notification'
+import {sendPushNotification} from '../gateway/notification'
 
 const TOOL_NAME = 'clawly_send_app_push'
 

package/tools/index.ts

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

package/tools.ts

@@ -1,2 +0,0 @@
-export {registerIsUserOnlineTool} from './tools/clawly-is-user-online'
-export {registerSendAppPushTool} from './tools/clawly-send-app-push'