@hirey/hi-agent-delivery 0.1.4 → 0.1.5

package/dist/payloads.d.ts

@@ -6,6 +6,16 @@ export type SharedAgentDeliveryEventEnvelope = {
     preview?: Record<string, unknown> | null;
     payload?: Record<string, unknown> | null;
     resource_ref?: Record<string, unknown> | null;
+    reply_route_snapshot?: {
+        installation_id: string;
+        session_key?: string | null;
+        delivery_context?: {
+            channel?: string | null;
+            to?: string | null;
+            account_id?: string | null;
+            thread_id?: string | null;
+        } | null;
+    } | null;
 };
 export declare function buildGenericEventWebhookPayload(event: SharedAgentDeliveryEventEnvelope): {
     profile: string;

package/dist/payloads.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../src/payloads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gCAAgC,EAChC,2BAA2B,EAC5B,MAAM,2BAA2B,CAAC;AAGnC,MAAM,MAAM,gCAAgC,GAAG;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC/C,CAAC;AAWF,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,gCAAgC;;;;;;;EAUtF;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,KAAK,EAAE,gCAAgC,CAAC;IACxC,MAAM,CAAC,EAAE,gCAAgC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5E;;;;;;;;;;;;EAsBA;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,KAAK,EAAE,gCAAgC,CAAC;IACxC,MAAM,EAAE,2BAA2B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/D;;;;;;EAiBA"}
+{"version":3,"file":"payloads.d.ts","sourceRoot":"","sources":["../src/payloads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gCAAgC,EAChC,2BAA2B,EAC5B,MAAM,2BAA2B,CAAC;AAGnC,MAAM,MAAM,gCAAgC,GAAG;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC9C,oBAAoB,CAAC,EAAE;QACrB,eAAe,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,gBAAgB,CAAC,EAAE;YACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YACnB,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;YAC3B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;SAC3B,GAAG,IAAI,CAAC;KACV,GAAG,IAAI,CAAC;CACV,CAAC;AAcF,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,gCAAgC;;;;;;;EAUtF;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,KAAK,EAAE,gCAAgC,CAAC;IACxC,MAAM,CAAC,EAAE,gCAAgC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5E;;;;;;;;;;;;EA+BA;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,KAAK,EAAE,gCAAgC,CAAC;IACxC,MAAM,EAAE,2BAA2B,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/D;;;;;;EAiBA"}

package/dist/payloads.js

@@ -1,12 +1,16 @@
 import { normalizeText } from '@hirey/hi-agent-contracts';
-function stringifyEventSummary(event) {
+function buildOpenClawContinuationMessage(event, messagePrefix) {
+    const parts = [];
+    if (messagePrefix)
+        parts.push(messagePrefix);
     if (event.preview?.text)
-        return String(event.preview.text);
-    return JSON.stringify({
+        parts.push(String(event.preview.text));
+    parts.push(JSON.stringify({
         topic: event.topic,
         payload: event.payload || {},
         resource_ref: event.resource_ref || {},
-    });
+    }));
+    return parts.filter(Boolean).join('\n\n');
 }
 export function buildGenericEventWebhookPayload(event) {
     // generic webhook 始终直接转发 canonical event envelope，不额外塞宿主私货。
@@ -21,22 +25,29 @@ export function buildGenericEventWebhookPayload(event) {
 }
 export function buildOpenClawHookPayload(args) {
     const config = (args.config || {});
-    const messagePrefix = normalizeText(config.message_prefix);
-    const eventSummary = stringifyEventSummary(args.event);
-    const message = [messagePrefix, eventSummary].filter(Boolean).join('\n\n') || eventSummary;
+    const routeSnapshot = args.event.reply_route_snapshot && typeof args.event.reply_route_snapshot === 'object'
+        ? args.event.reply_route_snapshot
+        : {};
+    const deliveryContext = routeSnapshot.delivery_context && typeof routeSnapshot.delivery_context === 'object'
+        ? routeSnapshot.delivery_context
+        : {};
+    const messagePrefix = normalizeText(config.message_prefix) || null;
+    const explicitSessionKey = normalizeText(routeSnapshot.session_key || config.session_key) || null;
     // OpenClaw 默认禁用外部 /hooks/agent request 自带 sessionKey。
-    // 普通用户路径只在显式声明 send_session_key=true 时才发送它，避免默认 400。
-    const shouldSendSessionKey = config.send_session_key === true;
+    // 普通用户路径只在显式声明 send_session_key=true 且没有显式 route truth 时才发送 legacy key。
+    const shouldSendSessionKey = config.send_session_key === true && !explicitSessionKey;
     const sessionKeyPrefix = normalizeText(config.session_key_prefix) || 'hi';
     return {
-        message,
+        message: buildOpenClawContinuationMessage(args.event, messagePrefix),
         name: normalizeText(config.name) || 'Hi',
         agentId: normalizeText(config.agent_id) || undefined,
-        ...(shouldSendSessionKey ? { sessionKey: `${sessionKeyPrefix}:${args.event.event_id}` } : {}),
+        ...(explicitSessionKey
+            ? { sessionKey: explicitSessionKey }
+            : (shouldSendSessionKey ? { sessionKey: `${sessionKeyPrefix}:${args.event.event_id}` } : {})),
         wakeMode: normalizeText(config.wake_mode) || 'now',
         deliver: config.deliver !== false,
-        channel: normalizeText(config.channel) || undefined,
-        to: normalizeText(config.to) || undefined,
+        channel: normalizeText(deliveryContext.channel || config.channel) || undefined,
+        to: normalizeText(deliveryContext.to || config.to) || undefined,
         model: normalizeText(config.model) || undefined,
         thinking: normalizeText(config.thinking) || undefined,
         timeoutSeconds: Number(config.timeout_seconds || 0) || undefined,

package/dist/payloads.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=payloads.test.d.ts.map

package/dist/payloads.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"payloads.test.d.ts","sourceRoot":"","sources":["../src/payloads.test.ts"],"names":[],"mappings":""}

package/dist/payloads.test.js

@@ -0,0 +1,39 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { buildOpenClawHookPayload } from './payloads.js';
+test('buildOpenClawHookPayload prefers explicit reply route over legacy generated session key', () => {
+    const payload = buildOpenClawHookPayload({
+        event: {
+            event_id: 'evt_123',
+            target_agent_id: 'agent_main',
+            topic: 'pairing.updated',
+            preview: { text: 'Timeline updated' },
+            payload: { status: 'contacted' },
+            resource_ref: { resource_type: 'pairing', resource_id: 'pair_123' },
+            reply_route_snapshot: {
+                installation_id: 'agit_123',
+                session_key: 'sess_visible_thread',
+                delivery_context: {
+                    channel: 'imessage',
+                    to: '+15550001111',
+                },
+            },
+        },
+        config: {
+            name: 'Hirey Hi',
+            agent_id: 'main',
+            send_session_key: true,
+            session_key_prefix: 'legacy',
+            message_prefix: '[Hi Event]',
+            channel: 'sms',
+            to: '+15550002222',
+        },
+    });
+    assert.equal(payload.sessionKey, 'sess_visible_thread');
+    assert.equal(payload.channel, 'imessage');
+    assert.equal(payload.to, '+15550001111');
+    assert.match(String(payload.message), /\[Hi Event\]/);
+    assert.match(String(payload.message), /Timeline updated/);
+    assert.match(String(payload.message), /"topic":"pairing\.updated"/);
+    assert.match(String(payload.message), /"resource_id":"pair_123"/);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hirey/hi-agent-delivery",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "private": false,
   "type": "module",
   "main": "dist/index.js",
@@ -22,19 +22,21 @@
   "scripts": {
     "clean": "node -e \"require('node:fs').rmSync('dist', { recursive: true, force: true })\"",
     "build": "npm run clean && tsc -p tsconfig.json",
+    "test": "node --test --import tsx src/**/*.test.ts",
     "prepack": "npm run build"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@hirey/hi-agent-contracts": "^0.1.9",
+    "@hirey/hi-agent-contracts": "^0.1.12",
     "nanoid": "^5.0.7",
     "pg": "^8.11.3"
   },
   "devDependencies": {
     "@types/node": "^20.11.30",
     "@types/pg": "^8.6.6",
+    "tsx": "^4.21.0",
     "typescript": "^5.4.5"
   }
 }