@clawnitor/plugin 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +11 -2
- package/dist/hooks/lifecycle.d.ts.map +1 -1
- package/dist/hooks/lifecycle.js +14 -4
- package/dist/hooks/lifecycle.js.map +1 -1
- package/dist/hooks/llm.d.ts.map +1 -1
- package/dist/hooks/llm.js +7 -2
- package/dist/hooks/llm.js.map +1 -1
- package/dist/hooks/message.d.ts.map +1 -1
- package/dist/hooks/message.js +14 -5
- package/dist/hooks/message.js.map +1 -1
- package/dist/hooks/tool-call.d.ts.map +1 -1
- package/dist/hooks/tool-call.js +56 -27
- package/dist/hooks/tool-call.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +25 -3
- package/dist/index.js.map +1 -1
- package/dist/rule-cache.d.ts +1 -0
- package/dist/rule-cache.d.ts.map +1 -1
- package/dist/rule-cache.js +7 -0
- package/dist/rule-cache.js.map +1 -1
- package/dist/subagent-context.d.ts +24 -0
- package/dist/subagent-context.d.ts.map +1 -0
- package/dist/subagent-context.js +31 -0
- package/dist/subagent-context.js.map +1 -0
- package/package.json +12 -11
- package/LICENSE +0 -66
package/README.md
CHANGED
|
@@ -44,7 +44,7 @@ Get your API key at [clawnitor.io](https://clawnitor.io). Events appear on your
|
|
|
44
44
|
| LLM requests | `llm_input` / `llm_output` | Model, tokens, cost |
|
|
45
45
|
| Messages | `message_sending` / `message_sent` / `message_received` | Content (redacted). **Can block sends.** |
|
|
46
46
|
| Lifecycle | `session_start` / `session_end` / `agent_end` | Session tracking |
|
|
47
|
-
| Sub-agents | `subagent_spawning` / `subagent_ended` |
|
|
47
|
+
| Sub-agents | `subagent_spawning` / `subagent_ended` | Subagent ID attribution, parent-child tracking |
|
|
48
48
|
|
|
49
49
|
## Pre-action defense (3 layers + auto-kill)
|
|
50
50
|
|
|
@@ -52,7 +52,7 @@ Every tool call and message is checked **before execution**:
|
|
|
52
52
|
|
|
53
53
|
1. **Kill state** — server-triggered pause via WebSocket. Kill from anywhere — dashboard, API, any device.
|
|
54
54
|
2. **Local failsafe** — spend circuit breaker, rate limiter, tool blocklist. Always active, even offline.
|
|
55
|
-
3. **Cached rules** — your server-side rules fetched every 60s, evaluated locally. Keyword, rate, threshold — all pre-action.
|
|
55
|
+
3. **Cached rules** — your server-side rules fetched every 60s, evaluated locally. Keyword, rate, threshold — all pre-action. Each rule is configured to **block**, **alert**, or **both** — alert-only rules let the action proceed and notify you instead.
|
|
56
56
|
|
|
57
57
|
**Auto-kill:** If an agent triggers 3+ rule violations within a configurable time window (default: 10 minutes), Clawnitor automatically kills it. No manual intervention needed. Configurable per agent.
|
|
58
58
|
|
|
@@ -103,6 +103,15 @@ AUTO-KILLED by Clawnitor
|
|
|
103
103
|
}
|
|
104
104
|
```
|
|
105
105
|
|
|
106
|
+
## Dashboard features powered by this plugin
|
|
107
|
+
|
|
108
|
+
All captured events feed into the Clawnitor dashboard at [app.clawnitor.io](https://app.clawnitor.io):
|
|
109
|
+
|
|
110
|
+
- **Cost tracking** — per-agent spend breakdowns, 7-day trend charts, most expensive calls ranked
|
|
111
|
+
- **Decision traces** — visual session timelines showing every tool call in order, with cost and model attribution
|
|
112
|
+
- **Subagent tracking** — parent-child relationships visible in session timelines via subagent_id attribution
|
|
113
|
+
- **Saves counter** — tracks every time Clawnitor blocked a harmful action
|
|
114
|
+
|
|
106
115
|
## Privacy
|
|
107
116
|
|
|
108
117
|
Sensitive data (API keys, passwords, tokens) is automatically redacted before transmission. 25+ built-in patterns plus your custom `redactionPatterns`. Data sharing for aggregate pattern improvement is opt-in and **off by default**.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/hooks/lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,gBAAgB,IACrD,OAAO,GAAG,UAenB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,gBAAgB,IACnD,OAAO,GAAG,UAiBnB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,IACjD,OAAO,GAAG,UAgBnB;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,gBAAgB;sBAEtC,GAAG;
|
|
1
|
+
{"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../../src/hooks/lifecycle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,UAAU,gBAAgB;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,cAAc,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,gBAAgB,IACrD,OAAO,GAAG,UAenB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,gBAAgB,IACnD,OAAO,GAAG,UAiBnB;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,gBAAgB,IACjD,OAAO,GAAG,UAgBnB;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,gBAAgB;sBAEtC,GAAG;mBAkBN,GAAG;EAiBrB"}
|
package/dist/hooks/lifecycle.js
CHANGED
|
@@ -51,25 +51,35 @@ export function createAgentEndHandler(ctx) {
|
|
|
51
51
|
export function createSubagentHandlers(ctx) {
|
|
52
52
|
return {
|
|
53
53
|
spawning: (event) => {
|
|
54
|
+
const subagentId = event.subagentId || event.childSessionKey || "unknown";
|
|
54
55
|
const clawnitorEvent = buildEvent({
|
|
55
56
|
agentId: ctx.agentId,
|
|
56
57
|
sessionId: ctx.sessionId,
|
|
57
58
|
eventType: "subagent",
|
|
58
59
|
action: "subagent spawning",
|
|
59
|
-
target:
|
|
60
|
-
metadata: {
|
|
60
|
+
target: subagentId,
|
|
61
|
+
metadata: {
|
|
62
|
+
subagent_id: subagentId,
|
|
63
|
+
raw_snippet: event.label || event.task
|
|
64
|
+
? `${event.label || "subagent"}: ${(event.task || "").slice(0, 450)}`
|
|
65
|
+
: undefined,
|
|
66
|
+
},
|
|
61
67
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
62
68
|
});
|
|
63
69
|
ctx.sender.enqueue(clawnitorEvent);
|
|
64
70
|
},
|
|
65
71
|
ended: (event) => {
|
|
72
|
+
const subagentId = event.subagentId || event.childSessionKey || "unknown";
|
|
66
73
|
const clawnitorEvent = buildEvent({
|
|
67
74
|
agentId: ctx.agentId,
|
|
68
75
|
sessionId: ctx.sessionId,
|
|
69
76
|
eventType: "subagent",
|
|
70
77
|
action: "subagent ended",
|
|
71
|
-
target:
|
|
72
|
-
metadata: {
|
|
78
|
+
target: subagentId,
|
|
79
|
+
metadata: {
|
|
80
|
+
subagent_id: subagentId,
|
|
81
|
+
duration_ms: event.duration || event.runtimeMs,
|
|
82
|
+
},
|
|
73
83
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
74
84
|
});
|
|
75
85
|
ctx.sender.enqueue(clawnitorEvent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/hooks/lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAYjD,MAAM,UAAU,yBAAyB,CAAC,GAAqB;IAC7D,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,GAAG,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAEvD,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS;YAC3C,SAAS,EAAE,iBAAiB;YAC5B,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,EAAE;YACZ,uBAAuB,EAAE,GAAG,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAqB;IAC3D,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAErD,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS;YAC3C,SAAS,EAAE,iBAAiB;YAC5B,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE;gBACR,WAAW,EAAE,KAAK,CAAC,QAAQ;aAC5B;YACD,uBAAuB,EAAE,GAAG,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAqB;IACzD,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,iBAAiB;YAC5B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,aAAa;YAC9D,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE;gBACR,WAAW,EAAE,KAAK,CAAC,QAAQ;gBAC3B,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO;aAC5B;YACD,uBAAuB,EAAE,GAAG,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAqB;IAC1D,OAAO;QACL,QAAQ,EAAE,CAAC,KAAU,EAAE,EAAE;YACvB,MAAM,cAAc,GAAG,UAAU,CAAC;gBAChC,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,SAAS,EAAE,UAAU;gBACrB,MAAM,EAAE,mBAAmB;gBAC3B,MAAM,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"lifecycle.js","sourceRoot":"","sources":["../../src/hooks/lifecycle.ts"],"names":[],"mappings":"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"}
|
package/dist/hooks/llm.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/hooks/llm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"llm.d.ts","sourceRoot":"","sources":["../../src/hooks/llm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAGhE,UAAU,UAAU;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,IAC3C,OAAO,GAAG,UAiBnB;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,UAAU,IAC5C,OAAO,GAAG,UAkBnB"}
|
package/dist/hooks/llm.js
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import { buildEvent } from "../event-builder.js";
|
|
2
|
+
import { getSubagentInfo } from "../subagent-context.js";
|
|
2
3
|
export function createLlmInputHandler(ctx) {
|
|
3
4
|
return (event) => {
|
|
5
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
4
6
|
const clawnitorEvent = buildEvent({
|
|
5
7
|
agentId: ctx.agentId,
|
|
6
|
-
sessionId:
|
|
8
|
+
sessionId: sub.sessionId,
|
|
7
9
|
eventType: "llm_call",
|
|
8
10
|
action: `llm_input: ${event.model || "unknown"}`,
|
|
9
11
|
target: event.provider || "unknown",
|
|
10
12
|
metadata: {
|
|
11
13
|
tool_name: event.model,
|
|
14
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
12
15
|
},
|
|
13
16
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
14
17
|
});
|
|
@@ -17,15 +20,17 @@ export function createLlmInputHandler(ctx) {
|
|
|
17
20
|
}
|
|
18
21
|
export function createLlmOutputHandler(ctx) {
|
|
19
22
|
return (event) => {
|
|
23
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
20
24
|
const clawnitorEvent = buildEvent({
|
|
21
25
|
agentId: ctx.agentId,
|
|
22
|
-
sessionId:
|
|
26
|
+
sessionId: sub.sessionId,
|
|
23
27
|
eventType: "llm_call",
|
|
24
28
|
action: `llm_output: ${event.model || "unknown"}`,
|
|
25
29
|
target: event.provider || "unknown",
|
|
26
30
|
metadata: {
|
|
27
31
|
tokens_used: event.usage?.totalTokens,
|
|
28
32
|
cost_usd: event.usage?.cost,
|
|
33
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
29
34
|
},
|
|
30
35
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
31
36
|
});
|
package/dist/hooks/llm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm.js","sourceRoot":"","sources":["../../src/hooks/llm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"llm.js","sourceRoot":"","sources":["../../src/hooks/llm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AASzD,MAAM,UAAU,qBAAqB,CAAC,GAAe;IACnD,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,cAAc,KAAK,CAAC,KAAK,IAAI,SAAS,EAAE;YAChD,MAAM,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;YACnC,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK,CAAC,KAAK;gBACtB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3D;YACD,uBAAuB,EAAE,GAAG,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAe;IACpD,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,eAAe,KAAK,CAAC,KAAK,IAAI,SAAS,EAAE;YACjD,MAAM,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;YACnC,QAAQ,EAAE;gBACR,WAAW,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW;gBACrC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI;gBAC3B,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3D;YACD,uBAAuB,EAAE,GAAG,CAAC,iBAAiB;SAC/C,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/hooks/message.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"message.d.ts","sourceRoot":"","sources":["../../src/hooks/message.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAIhE,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,cAAc,IACrD,OAAO,GAAG;;cAuBnB;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,cAAc,IAClD,OAAO,GAAG,UAgBnB;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,cAAc,IACtD,OAAO,GAAG,UAgBnB"}
|
package/dist/hooks/message.js
CHANGED
|
@@ -1,19 +1,22 @@
|
|
|
1
1
|
import { buildEvent } from "../event-builder.js";
|
|
2
2
|
import { killState } from "../kill-switch/kill-state.js";
|
|
3
|
+
import { getSubagentInfo } from "../subagent-context.js";
|
|
3
4
|
export function createMessageSendingHandler(ctx) {
|
|
4
5
|
return (event) => {
|
|
5
6
|
// Check kill state BEFORE enqueueing — don't log blocked messages as sent
|
|
6
7
|
if (killState.isKilled()) {
|
|
7
8
|
return { cancel: true };
|
|
8
9
|
}
|
|
10
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
9
11
|
const clawnitorEvent = buildEvent({
|
|
10
12
|
agentId: ctx.agentId,
|
|
11
|
-
sessionId:
|
|
13
|
+
sessionId: sub.sessionId,
|
|
12
14
|
eventType: "message_sent",
|
|
13
15
|
action: `sending message`,
|
|
14
16
|
target: event.channel || "unknown",
|
|
15
17
|
metadata: {
|
|
16
18
|
raw_snippet: event.text ? String(event.text).slice(0, 500) : undefined,
|
|
19
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
17
20
|
},
|
|
18
21
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
19
22
|
});
|
|
@@ -23,13 +26,16 @@ export function createMessageSendingHandler(ctx) {
|
|
|
23
26
|
}
|
|
24
27
|
export function createMessageSentHandler(ctx) {
|
|
25
28
|
return (event) => {
|
|
29
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
26
30
|
const clawnitorEvent = buildEvent({
|
|
27
31
|
agentId: ctx.agentId,
|
|
28
|
-
sessionId:
|
|
32
|
+
sessionId: sub.sessionId,
|
|
29
33
|
eventType: "message_sent",
|
|
30
34
|
action: `message sent`,
|
|
31
35
|
target: event.channel || "unknown",
|
|
32
|
-
metadata: {
|
|
36
|
+
metadata: {
|
|
37
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
38
|
+
},
|
|
33
39
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
34
40
|
});
|
|
35
41
|
ctx.sender.enqueue(clawnitorEvent);
|
|
@@ -37,13 +43,16 @@ export function createMessageSentHandler(ctx) {
|
|
|
37
43
|
}
|
|
38
44
|
export function createMessageReceivedHandler(ctx) {
|
|
39
45
|
return (event) => {
|
|
46
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
40
47
|
const clawnitorEvent = buildEvent({
|
|
41
48
|
agentId: ctx.agentId,
|
|
42
|
-
sessionId:
|
|
49
|
+
sessionId: sub.sessionId,
|
|
43
50
|
eventType: "message_received",
|
|
44
51
|
action: `message received`,
|
|
45
52
|
target: event.channel || "unknown",
|
|
46
|
-
metadata: {
|
|
53
|
+
metadata: {
|
|
54
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
55
|
+
},
|
|
47
56
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
48
57
|
});
|
|
49
58
|
ctx.sender.enqueue(clawnitorEvent);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/hooks/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AASzD,MAAM,UAAU,2BAA2B,CAAC,GAAmB;IAC7D,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,0EAA0E;QAC1E,IAAI,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC;YACzB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC1B,CAAC;QAED,MAAM,cAAc,GAAG,UAAU,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,iBAAiB;YACzB,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,SAAS;YAClC,QAAQ,EAAE;gBACR,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../src/hooks/message.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-call.d.ts","sourceRoot":"","sources":["../../src/hooks/tool-call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-call.d.ts","sourceRoot":"","sources":["../../src/hooks/tool-call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGxD,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,eAAe,IACtD,OAAO,GAAG;;;cA6GnB;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,eAAe,IACrD,OAAO,GAAG,UAoCnB"}
|
package/dist/hooks/tool-call.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { buildEvent } from "../event-builder.js";
|
|
2
2
|
import { killState } from "../kill-switch/kill-state.js";
|
|
3
|
+
import { getSubagentInfo } from "../subagent-context.js";
|
|
3
4
|
export function createBeforeToolCallHandler(ctx) {
|
|
4
5
|
return (event) => {
|
|
6
|
+
// Resolve agent ID from session key on first event
|
|
7
|
+
ctx.resolveAgentFromEvent?.(event);
|
|
8
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
5
9
|
ctx.rateTracker.record();
|
|
6
10
|
ctx.failsafe.recordToolCall();
|
|
7
11
|
// Record event in rule cache for time-window based rules
|
|
@@ -13,40 +17,70 @@ export function createBeforeToolCallHandler(ctx) {
|
|
|
13
17
|
action: event.toolName,
|
|
14
18
|
target: event.toolName,
|
|
15
19
|
});
|
|
20
|
+
// Build a descriptive action label from tool name + params
|
|
21
|
+
const toolName = event.toolName || "unknown";
|
|
22
|
+
const paramHint = event.params?.command
|
|
23
|
+
? `: ${String(event.params.command).slice(0, 80)}`
|
|
24
|
+
: event.params?.url
|
|
25
|
+
? `: ${String(event.params.url).slice(0, 80)}`
|
|
26
|
+
: event.params?.file_path
|
|
27
|
+
? `: ${String(event.params.file_path).slice(0, 80)}`
|
|
28
|
+
: event.params?.action
|
|
29
|
+
? `: ${String(event.params.action).slice(0, 80)}`
|
|
30
|
+
: "";
|
|
16
31
|
const clawnitorEvent = buildEvent({
|
|
17
32
|
agentId: ctx.agentId,
|
|
18
|
-
sessionId:
|
|
33
|
+
sessionId: sub.sessionId,
|
|
19
34
|
eventType: "tool_use",
|
|
20
|
-
action:
|
|
21
|
-
target:
|
|
35
|
+
action: `${toolName}${paramHint}`,
|
|
36
|
+
target: toolName,
|
|
22
37
|
metadata: {
|
|
23
|
-
tool_name:
|
|
38
|
+
tool_name: toolName,
|
|
39
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
24
40
|
...(event.params ? { raw_snippet: JSON.stringify(event.params).slice(0, 500) } : {}),
|
|
25
41
|
},
|
|
26
42
|
rateTracker: ctx.rateTracker,
|
|
27
43
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
28
44
|
});
|
|
29
45
|
ctx.sender.enqueue(clawnitorEvent);
|
|
46
|
+
// Helper: capture a blocked event
|
|
47
|
+
const captureBlocked = (reason, source) => {
|
|
48
|
+
const blockedEvent = buildEvent({
|
|
49
|
+
agentId: ctx.agentId,
|
|
50
|
+
sessionId: sub.sessionId,
|
|
51
|
+
eventType: "tool_use",
|
|
52
|
+
action: `BLOCKED: ${toolName}${paramHint}`,
|
|
53
|
+
target: toolName,
|
|
54
|
+
metadata: {
|
|
55
|
+
tool_name: toolName,
|
|
56
|
+
blocked: true,
|
|
57
|
+
block_reason: reason,
|
|
58
|
+
block_source: source,
|
|
59
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
60
|
+
},
|
|
61
|
+
rateTracker: ctx.rateTracker,
|
|
62
|
+
customRedactionPatterns: ctx.redactionPatterns,
|
|
63
|
+
});
|
|
64
|
+
ctx.sender.enqueue(blockedEvent);
|
|
65
|
+
};
|
|
30
66
|
// 1. Check kill state (server-triggered)
|
|
31
67
|
if (killState.isKilled()) {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
};
|
|
68
|
+
const reason = `Clawnitor: agent paused — ${killState.getReason() || "unknown reason"}`;
|
|
69
|
+
captureBlocked(reason, "kill-state");
|
|
70
|
+
return { block: true, blockReason: reason };
|
|
36
71
|
}
|
|
37
72
|
// 2. Check local failsafe (spend/rate/blocklist)
|
|
38
73
|
const failsafeResult = ctx.failsafe.check(event.toolName || "");
|
|
39
74
|
if (failsafeResult.block) {
|
|
75
|
+
captureBlocked(failsafeResult.reason, "failsafe");
|
|
40
76
|
killState.setKilled(failsafeResult.reason);
|
|
41
|
-
return {
|
|
42
|
-
block: true,
|
|
43
|
-
blockReason: failsafeResult.reason,
|
|
44
|
-
};
|
|
77
|
+
return { block: true, blockReason: failsafeResult.reason };
|
|
45
78
|
}
|
|
46
79
|
// 3. Check cached server rules locally (PRE-ACTION for pattern rules)
|
|
47
80
|
const ruleResult = ctx.ruleCache.checkBeforeToolCall(event.toolName || "", event.params);
|
|
48
81
|
if (ruleResult.blocked) {
|
|
49
|
-
|
|
82
|
+
captureBlocked(ruleResult.reason || "Rule matched", `rule:${ruleResult.ruleName}`);
|
|
83
|
+
// Record violation for auto-kill tracking
|
|
50
84
|
const autoKillResult = ctx.violationTracker.recordViolation({
|
|
51
85
|
ruleId: ruleResult.ruleName || "unknown",
|
|
52
86
|
ruleName: ruleResult.ruleName || "unknown",
|
|
@@ -54,25 +88,18 @@ export function createBeforeToolCallHandler(ctx) {
|
|
|
54
88
|
action: event.toolName || "unknown",
|
|
55
89
|
target: event.toolName || "unknown",
|
|
56
90
|
});
|
|
57
|
-
// If auto-kill threshold reached, escalate to full agent kill
|
|
58
91
|
if (autoKillResult.shouldKill) {
|
|
59
92
|
killState.setKilled(autoKillResult.message);
|
|
60
|
-
return {
|
|
61
|
-
block: true,
|
|
62
|
-
blockReason: autoKillResult.message,
|
|
63
|
-
};
|
|
93
|
+
return { block: true, blockReason: autoKillResult.message };
|
|
64
94
|
}
|
|
65
|
-
|
|
66
|
-
return {
|
|
67
|
-
block: true,
|
|
68
|
-
blockReason: ruleResult.reason,
|
|
69
|
-
};
|
|
95
|
+
return { block: true, blockReason: ruleResult.reason };
|
|
70
96
|
}
|
|
71
97
|
return undefined;
|
|
72
98
|
};
|
|
73
99
|
}
|
|
74
100
|
export function createAfterToolCallHandler(ctx) {
|
|
75
101
|
return (event) => {
|
|
102
|
+
const sub = getSubagentInfo(event, ctx.sessionId);
|
|
76
103
|
// Track spend for failsafe and rule cache
|
|
77
104
|
if (typeof event.cost === "number") {
|
|
78
105
|
ctx.failsafe.addSpend(event.cost);
|
|
@@ -83,18 +110,20 @@ export function createAfterToolCallHandler(ctx) {
|
|
|
83
110
|
costUsd: event.cost,
|
|
84
111
|
});
|
|
85
112
|
}
|
|
113
|
+
const afterToolName = event.toolName || "unknown";
|
|
86
114
|
const clawnitorEvent = buildEvent({
|
|
87
115
|
agentId: ctx.agentId,
|
|
88
|
-
sessionId:
|
|
116
|
+
sessionId: sub.sessionId,
|
|
89
117
|
eventType: "tool_use",
|
|
90
|
-
action:
|
|
91
|
-
target:
|
|
118
|
+
action: `${afterToolName} completed${event.error ? " (error)" : ""}`,
|
|
119
|
+
target: afterToolName,
|
|
92
120
|
metadata: {
|
|
93
|
-
tool_name:
|
|
121
|
+
tool_name: afterToolName,
|
|
94
122
|
duration_ms: event.duration,
|
|
95
123
|
error: event.error?.message,
|
|
96
124
|
cost_usd: event.cost,
|
|
97
125
|
raw_snippet: event.result ? String(event.result).slice(0, 500) : undefined,
|
|
126
|
+
...(sub.subagentId ? { subagent_id: sub.subagentId } : {}),
|
|
98
127
|
},
|
|
99
128
|
rateTracker: ctx.rateTracker,
|
|
100
129
|
customRedactionPatterns: ctx.redactionPatterns,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-call.js","sourceRoot":"","sources":["../../src/hooks/tool-call.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGjD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-call.js","sourceRoot":"","sources":["../../src/hooks/tool-call.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAG,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA0BA,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAG,EAAE,GAAG,QAqIxC"}
|
package/dist/index.js
CHANGED
|
@@ -12,7 +12,7 @@ import { createLlmInputHandler, createLlmOutputHandler } from "./hooks/llm.js";
|
|
|
12
12
|
import { createMessageSendingHandler, createMessageSentHandler, createMessageReceivedHandler, } from "./hooks/message.js";
|
|
13
13
|
import { createSessionStartHandler, createSessionEndHandler, createAgentEndHandler, createSubagentHandlers, } from "./hooks/lifecycle.js";
|
|
14
14
|
export default function register(api) {
|
|
15
|
-
const rawConfig = api.config || {};
|
|
15
|
+
const rawConfig = api.pluginConfig || api.config || {};
|
|
16
16
|
const config = parseConfig(rawConfig);
|
|
17
17
|
const rateTracker = createRateTracker();
|
|
18
18
|
const failsafe = new LocalFailsafe(config);
|
|
@@ -62,14 +62,36 @@ export default function register(api) {
|
|
|
62
62
|
}, 30_000);
|
|
63
63
|
// Shared context for all hooks
|
|
64
64
|
let currentSessionId = "default";
|
|
65
|
-
|
|
65
|
+
// Resolve agent ID: config > workspace path > sessionKey > "unknown"
|
|
66
|
+
let resolvedAgentId = rawConfig.agentId || "unknown";
|
|
67
|
+
if (resolvedAgentId === "unknown") {
|
|
68
|
+
// Extract from workspace path: /.../.openclaw/workspace-<agentId>
|
|
69
|
+
const cwd = process.cwd();
|
|
70
|
+
const wsMatch = cwd.match(/workspace-([^/]+)$/);
|
|
71
|
+
if (wsMatch)
|
|
72
|
+
resolvedAgentId = wsMatch[1];
|
|
73
|
+
}
|
|
74
|
+
let agentIdResolved = resolvedAgentId !== "unknown";
|
|
66
75
|
const ctx = {
|
|
67
76
|
get agentId() {
|
|
68
|
-
return
|
|
77
|
+
return resolvedAgentId;
|
|
69
78
|
},
|
|
70
79
|
get sessionId() {
|
|
71
80
|
return currentSessionId;
|
|
72
81
|
},
|
|
82
|
+
resolveAgentFromEvent(event) {
|
|
83
|
+
if (agentIdResolved)
|
|
84
|
+
return;
|
|
85
|
+
const sk = event?.sessionKey;
|
|
86
|
+
if (sk && sk.startsWith("agent:")) {
|
|
87
|
+
// Format: agent:<agentId>:main or agent:<agentId>:subagent:<uuid>
|
|
88
|
+
const parts = sk.split(":");
|
|
89
|
+
if (parts.length >= 2 && parts[1]) {
|
|
90
|
+
resolvedAgentId = parts[1];
|
|
91
|
+
agentIdResolved = true;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
},
|
|
73
95
|
sender,
|
|
74
96
|
rateTracker,
|
|
75
97
|
redactionPatterns: config.redactionPatterns,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EACL,2BAA2B,EAC3B,0BAA0B,GAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EACL,2BAA2B,EAC3B,wBAAwB,EACxB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,GACvB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,GAAQ;IACvC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/rule-cache.d.ts
CHANGED
package/dist/rule-cache.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-cache.d.ts","sourceRoot":"","sources":["../src/rule-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"rule-cache.d.ts","sourceRoot":"","sources":["../src/rule-cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAGD,UAAU,WAAW;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAO;gBAE7B,MAAM,EAAE,YAAY;IAIhC,KAAK;IAML,IAAI;YAOU,UAAU;IAiBxB,WAAW,CAAC,KAAK,EAAE,WAAW;IAS9B,mBAAmB,CACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,eAAe;IAsBlB,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,YAAY;IA4BpB,OAAO,CAAC,iBAAiB;IA8BzB,YAAY,IAAI,MAAM;CAGvB"}
|
package/dist/rule-cache.js
CHANGED
|
@@ -45,9 +45,16 @@ export class RuleCache {
|
|
|
45
45
|
// Evaluate all cached pattern rules against the current tool call + recent history
|
|
46
46
|
checkBeforeToolCall(toolName, params) {
|
|
47
47
|
const paramsStr = params ? JSON.stringify(params).slice(0, 500) : "";
|
|
48
|
+
// Skip rule evaluation for tool calls that target the Clawnitor backend itself
|
|
49
|
+
// (e.g., curl commands creating rules with keywords in the config)
|
|
50
|
+
if (paramsStr.includes("api.clawnitor.io") || paramsStr.includes("/api/rules")) {
|
|
51
|
+
return { blocked: false };
|
|
52
|
+
}
|
|
48
53
|
for (const rule of this.rules) {
|
|
49
54
|
if (rule.rule_type === "nl")
|
|
50
55
|
continue; // Can't evaluate locally
|
|
56
|
+
if (rule.action_mode === "alert")
|
|
57
|
+
continue; // Alert-only rules don't block
|
|
51
58
|
const result = this.evaluateRule(rule, toolName, paramsStr);
|
|
52
59
|
if (result.blocked) {
|
|
53
60
|
return result;
|
package/dist/rule-cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rule-cache.js","sourceRoot":"","sources":["../src/rule-cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rule-cache.js","sourceRoot":"","sources":["../src/rule-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Detect subagent context from OpenClaw hook events.
|
|
3
|
+
*
|
|
4
|
+
* OpenClaw hooks fire globally (main + subagents). When running in a subagent
|
|
5
|
+
* context, the event's sessionKey contains "subagent:" — e.g.
|
|
6
|
+
* "agent:my-agent:subagent:abc-123".
|
|
7
|
+
*
|
|
8
|
+
* This module extracts subagent identity so all events carry attribution.
|
|
9
|
+
*/
|
|
10
|
+
export interface SubagentInfo {
|
|
11
|
+
/** The session ID to use (event's sessionKey if available, fallback to parent) */
|
|
12
|
+
sessionId: string;
|
|
13
|
+
/** The subagent ID if running in subagent context, undefined otherwise */
|
|
14
|
+
subagentId: string | undefined;
|
|
15
|
+
/** Whether this event is from a subagent */
|
|
16
|
+
isSubagent: boolean;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Extract subagent context from an OpenClaw hook event.
|
|
20
|
+
* @param event The raw hook event from OpenClaw
|
|
21
|
+
* @param fallbackSessionId The parent session ID to use if event has no sessionKey
|
|
22
|
+
*/
|
|
23
|
+
export declare function getSubagentInfo(event: any, fallbackSessionId: string): SubagentInfo;
|
|
24
|
+
//# sourceMappingURL=subagent-context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-context.d.ts","sourceRoot":"","sources":["../src/subagent-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,MAAM,WAAW,YAAY;IAC3B,kFAAkF;IAClF,SAAS,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,4CAA4C;IAC5C,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,GAAG,YAAY,CAiBnF"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Detect subagent context from OpenClaw hook events.
|
|
3
|
+
*
|
|
4
|
+
* OpenClaw hooks fire globally (main + subagents). When running in a subagent
|
|
5
|
+
* context, the event's sessionKey contains "subagent:" — e.g.
|
|
6
|
+
* "agent:my-agent:subagent:abc-123".
|
|
7
|
+
*
|
|
8
|
+
* This module extracts subagent identity so all events carry attribution.
|
|
9
|
+
*/
|
|
10
|
+
const SUBAGENT_PATTERN = /subagent:([^:]+)$/;
|
|
11
|
+
/**
|
|
12
|
+
* Extract subagent context from an OpenClaw hook event.
|
|
13
|
+
* @param event The raw hook event from OpenClaw
|
|
14
|
+
* @param fallbackSessionId The parent session ID to use if event has no sessionKey
|
|
15
|
+
*/
|
|
16
|
+
export function getSubagentInfo(event, fallbackSessionId) {
|
|
17
|
+
const sessionKey = event?.sessionKey;
|
|
18
|
+
if (!sessionKey) {
|
|
19
|
+
return { sessionId: fallbackSessionId, subagentId: undefined, isSubagent: false };
|
|
20
|
+
}
|
|
21
|
+
const match = sessionKey.match(SUBAGENT_PATTERN);
|
|
22
|
+
if (match) {
|
|
23
|
+
return {
|
|
24
|
+
sessionId: sessionKey,
|
|
25
|
+
subagentId: match[1],
|
|
26
|
+
isSubagent: true,
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
return { sessionId: sessionKey, subagentId: undefined, isSubagent: false };
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=subagent-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subagent-context.js","sourceRoot":"","sources":["../src/subagent-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAW7C;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAU,EAAE,iBAAyB;IACnE,MAAM,UAAU,GAAuB,KAAK,EAAE,UAAU,CAAC;IAEzD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACpF,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AAC7E,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@clawnitor/plugin",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "OpenClaw plugin for Clawnitor — agent monitoring, alerting, and kill switch",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -14,6 +14,13 @@
|
|
|
14
14
|
"dist",
|
|
15
15
|
"README.md"
|
|
16
16
|
],
|
|
17
|
+
"scripts": {
|
|
18
|
+
"build": "tsc",
|
|
19
|
+
"typecheck": "tsc --noEmit",
|
|
20
|
+
"test": "vitest run",
|
|
21
|
+
"test:watch": "vitest",
|
|
22
|
+
"prepublishOnly": "pnpm run build"
|
|
23
|
+
},
|
|
17
24
|
"keywords": [
|
|
18
25
|
"clawnitor",
|
|
19
26
|
"openclaw",
|
|
@@ -35,19 +42,13 @@
|
|
|
35
42
|
"access": "public"
|
|
36
43
|
},
|
|
37
44
|
"dependencies": {
|
|
38
|
-
"
|
|
39
|
-
"@clawnitor/
|
|
40
|
-
"
|
|
45
|
+
"@clawnitor/shared": "workspace:^",
|
|
46
|
+
"@clawnitor/cli": "workspace:^",
|
|
47
|
+
"better-sqlite3": "^11"
|
|
41
48
|
},
|
|
42
49
|
"devDependencies": {
|
|
43
50
|
"typescript": "^5.7",
|
|
44
51
|
"vitest": "^3",
|
|
45
52
|
"@types/better-sqlite3": "^7"
|
|
46
|
-
},
|
|
47
|
-
"scripts": {
|
|
48
|
-
"build": "tsc",
|
|
49
|
-
"typecheck": "tsc --noEmit",
|
|
50
|
-
"test": "vitest run",
|
|
51
|
-
"test:watch": "vitest"
|
|
52
53
|
}
|
|
53
|
-
}
|
|
54
|
+
}
|
package/LICENSE
DELETED
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
Business Source License 1.1
|
|
2
|
-
|
|
3
|
-
Parameters
|
|
4
|
-
|
|
5
|
-
Licensor: David Kogan
|
|
6
|
-
Licensed Work: Clawnitor
|
|
7
|
-
The Licensed Work is (c) 2026 David Kogan.
|
|
8
|
-
Additional Use Grant: You may make production use of the Licensed Work,
|
|
9
|
-
provided your use does not include offering the
|
|
10
|
-
Licensed Work to third parties as a commercial
|
|
11
|
-
agent monitoring, observability, or safety service
|
|
12
|
-
that competes with the Licensor's offerings.
|
|
13
|
-
Change Date: Four years from the date the Licensed Work is
|
|
14
|
-
published. The specific Change Date will be set
|
|
15
|
-
when the repository is made public.
|
|
16
|
-
Change License: GNU Affero General Public License v3.0 (AGPL-3.0)
|
|
17
|
-
|
|
18
|
-
For information about alternative licensing arrangements for the Licensed
|
|
19
|
-
Work, please contact: david@clawnitor.io
|
|
20
|
-
|
|
21
|
-
Notice
|
|
22
|
-
|
|
23
|
-
Business Source License 1.1
|
|
24
|
-
|
|
25
|
-
Terms
|
|
26
|
-
|
|
27
|
-
The Licensor hereby grants you the right to copy, modify, create
|
|
28
|
-
derivative works, redistribute, and make non-production use of the
|
|
29
|
-
Licensed Work. The Licensor may make an Additional Use Grant, above,
|
|
30
|
-
permitting limited production use.
|
|
31
|
-
|
|
32
|
-
Effective on the Change Date, or the fourth anniversary of the first
|
|
33
|
-
publicly available distribution of a specific version of the Licensed
|
|
34
|
-
Work under this License, whichever comes first, the Licensor hereby
|
|
35
|
-
grants you rights under the terms of the Change License, and the rights
|
|
36
|
-
granted in the paragraph above terminate.
|
|
37
|
-
|
|
38
|
-
If your use of the Licensed Work does not comply with the requirements
|
|
39
|
-
currently in effect as described in this License, you must purchase a
|
|
40
|
-
commercial license from the Licensor, its affiliated entities, or
|
|
41
|
-
authorized resellers, or you must refrain from using the Licensed Work.
|
|
42
|
-
|
|
43
|
-
All copies of the original and modified Licensed Work, and derivative
|
|
44
|
-
works of the Licensed Work, are subject to this License. This License
|
|
45
|
-
applies separately for each version of the Licensed Work and the Change
|
|
46
|
-
Date may vary for each version of the Licensed Work released by
|
|
47
|
-
Licensor.
|
|
48
|
-
|
|
49
|
-
You must conspicuously display this License on each original or modified
|
|
50
|
-
copy of the Licensed Work. If you receive the Licensed Work in original
|
|
51
|
-
or modified form from a third party, the terms and conditions set forth
|
|
52
|
-
in this License apply to your use of that work.
|
|
53
|
-
|
|
54
|
-
Any use of the Licensed Work in violation of this License will
|
|
55
|
-
automatically terminate your rights under this License for the current
|
|
56
|
-
and all other versions of the Licensed Work.
|
|
57
|
-
|
|
58
|
-
This License does not grant you any right in any trademark or logo of
|
|
59
|
-
Licensor or its affiliates (provided that you may use a trademark or
|
|
60
|
-
logo of Licensor as expressly required by this License).
|
|
61
|
-
|
|
62
|
-
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS
|
|
63
|
-
PROVIDED ON AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES
|
|
64
|
-
AND CONDITIONS, EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION)
|
|
65
|
-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
|
|
66
|
-
NON-INFRINGEMENT, AND TITLE.
|