@coffeexdev/openclaw-sentinel 0.4.2 → 0.4.4

package/dist/tool.d.ts

@@ -1,8 +1,8 @@
 import type { AnyAgentTool } from "openclaw/plugin-sdk";
 import type { Static } from "@sinclair/typebox";
 import { WatcherManager } from "./watcherManager.js";
-import { SentinelToolSchema } from "./toolSchema.js";
-export type SentinelToolParams = Static<typeof SentinelToolSchema>;
+import { SentinelToolValidationSchema } from "./toolSchema.js";
+export type SentinelToolParams = Static<typeof SentinelToolValidationSchema>;
 type SentinelToolContext = {
     messageChannel?: string;
     requesterSenderId?: string;

package/dist/tool.js

@@ -1,17 +1,54 @@
 import { jsonResult } from "openclaw/plugin-sdk";
 import { Value } from "@sinclair/typebox/value";
-import { SentinelToolSchema } from "./toolSchema.js";
+import { SentinelToolSchema, SentinelToolValidationSchema } from "./toolSchema.js";
 import { TemplateValueSchema } from "./templateValueSchema.js";
 function validateParams(params) {
     const candidate = (params ?? {});
-    if (!Value.Check(SentinelToolSchema, [TemplateValueSchema], candidate)) {
-        const first = [...Value.Errors(SentinelToolSchema, [TemplateValueSchema], candidate)][0];
+    if (!Value.Check(SentinelToolValidationSchema, [TemplateValueSchema], candidate)) {
+        const first = [
+            ...Value.Errors(SentinelToolValidationSchema, [TemplateValueSchema], candidate),
+        ][0];
         const where = first?.path || "(root)";
         const why = first?.message || "Invalid parameters";
         throw new Error(`Invalid sentinel_control parameters at ${where}: ${why}`);
     }
     return candidate;
 }
+function stringifyPayload(payload) {
+    try {
+        const serialized = JSON.stringify(payload, null, 2);
+        if (typeof serialized !== "string" || serialized.length === 0)
+            return undefined;
+        return serialized;
+    }
+    catch {
+        return undefined;
+    }
+}
+function normalizeToolResultText(payload, fallbackText) {
+    const preferredText = fallbackText?.trim();
+    const safeText = preferredText && preferredText.length > 0 ? preferredText : (stringifyPayload(payload) ?? "ok");
+    const result = jsonResult(payload);
+    const currentContent = Array.isArray(result.content)
+        ? [...result.content]
+        : [];
+    let sawTextBlock = false;
+    const normalized = currentContent.map((entry) => {
+        if (!entry || typeof entry !== "object" || entry.type !== "text")
+            return entry;
+        sawTextBlock = true;
+        if (typeof entry.text === "string" && entry.text.length > 0)
+            return entry;
+        return { ...entry, text: safeText };
+    });
+    if (!sawTextBlock) {
+        normalized.unshift({ type: "text", text: safeText });
+    }
+    return {
+        ...result,
+        content: normalized,
+    };
+}
 function inferDefaultDeliveryTargets(ctx) {
     const channel = ctx.messageChannel?.trim();
     if (!channel)
@@ -37,21 +74,29 @@ export function registerSentinelControl(registerTool, manager) {
             switch (payload.action) {
                 case "create":
                 case "add":
-                    return jsonResult(await manager.create(payload.watcher, {
+                    return normalizeToolResultText(await manager.create(payload.watcher, {
                         deliveryTargets: inferDefaultDeliveryTargets(ctx),
-                    }));
+                    }), "Watcher created");
                 case "enable":
-                    return jsonResult(await manager.enable(payload.id));
+                    await manager.enable(payload.id);
+                    return normalizeToolResultText(undefined, `Enabled watcher: ${payload.id}`);
                 case "disable":
-                    return jsonResult(await manager.disable(payload.id));
+                    await manager.disable(payload.id);
+                    return normalizeToolResultText(undefined, `Disabled watcher: ${payload.id}`);
                 case "remove":
                 case "delete":
-                    return jsonResult(await manager.remove(payload.id));
+                    try {
+                        return normalizeToolResultText(await manager.remove(payload.id), `Removed watcher: ${payload.id}`);
+                    }
+                    catch (err) {
+                        const message = String(err?.message ?? err);
+                        return normalizeToolResultText({ ok: false, id: payload.id, error: message }, `Failed to remove watcher: ${payload.id}`);
+                    }
                 case "status":
                 case "get":
-                    return jsonResult(manager.status(payload.id));
+                    return normalizeToolResultText(manager.status(payload.id), `Watcher not found: ${payload.id}`);
                 case "list":
-                    return jsonResult(manager.list());
+                    return normalizeToolResultText(manager.list(), "[]");
             }
         },
     }));

package/dist/toolSchema.d.ts

@@ -1,4 +1,4 @@
-export declare const SentinelToolSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
+export declare const SentinelToolValidationSchema: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TObject<{
     action: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"create">, import("@sinclair/typebox").TLiteral<"add">]>;
     watcher: import("@sinclair/typebox").TObject<{
         id: import("@sinclair/typebox").TString;
@@ -46,3 +46,47 @@ export declare const SentinelToolSchema: import("@sinclair/typebox").TUnion<[imp
 }>, import("@sinclair/typebox").TObject<{
     action: import("@sinclair/typebox").TLiteral<"list">;
 }>]>;
+export declare const SentinelToolSchema: import("@sinclair/typebox").TObject<{
+    action: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"create">, import("@sinclair/typebox").TLiteral<"add">]>, import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"enable">, import("@sinclair/typebox").TLiteral<"disable">, import("@sinclair/typebox").TLiteral<"remove">, import("@sinclair/typebox").TLiteral<"delete">, import("@sinclair/typebox").TLiteral<"status">, import("@sinclair/typebox").TLiteral<"get">]>, import("@sinclair/typebox").TLiteral<"list">]>;
+    watcher: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        id: import("@sinclair/typebox").TString;
+        skillId: import("@sinclair/typebox").TString;
+        enabled: import("@sinclair/typebox").TBoolean;
+        strategy: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"http-poll">, import("@sinclair/typebox").TLiteral<"websocket">, import("@sinclair/typebox").TLiteral<"sse">, import("@sinclair/typebox").TLiteral<"http-long-poll">]>;
+        endpoint: import("@sinclair/typebox").TString;
+        method: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"GET">, import("@sinclair/typebox").TLiteral<"POST">]>>;
+        headers: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
+        body: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        intervalMs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+        timeoutMs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+        match: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"all">, import("@sinclair/typebox").TLiteral<"any">]>;
+        conditions: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+            path: import("@sinclair/typebox").TString;
+            op: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"eq">, import("@sinclair/typebox").TLiteral<"neq">, import("@sinclair/typebox").TLiteral<"gt">, import("@sinclair/typebox").TLiteral<"gte">, import("@sinclair/typebox").TLiteral<"lt">, import("@sinclair/typebox").TLiteral<"lte">, import("@sinclair/typebox").TLiteral<"exists">, import("@sinclair/typebox").TLiteral<"absent">, import("@sinclair/typebox").TLiteral<"contains">, import("@sinclair/typebox").TLiteral<"matches">, import("@sinclair/typebox").TLiteral<"changed">]>;
+            value: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnknown>;
+        }>>;
+        fire: import("@sinclair/typebox").TObject<{
+            webhookPath: import("@sinclair/typebox").TString;
+            eventName: import("@sinclair/typebox").TString;
+            payloadTemplate: import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TRef<any>>;
+            intent: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            contextTemplate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TRef<any>>>;
+            priority: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TLiteral<"low">, import("@sinclair/typebox").TLiteral<"normal">, import("@sinclair/typebox").TLiteral<"high">, import("@sinclair/typebox").TLiteral<"critical">]>>;
+            deadlineTemplate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            dedupeKeyTemplate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        }>;
+        retry: import("@sinclair/typebox").TObject<{
+            maxRetries: import("@sinclair/typebox").TNumber;
+            baseMs: import("@sinclair/typebox").TNumber;
+            maxMs: import("@sinclair/typebox").TNumber;
+        }>;
+        fireOnce: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
+        deliveryTargets: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
+            channel: import("@sinclair/typebox").TString;
+            to: import("@sinclair/typebox").TString;
+            accountId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+        }>>>;
+        metadata: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TString>>;
+    }>>;
+    id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+}>;

package/dist/toolSchema.js

@@ -80,27 +80,45 @@ const WatcherSchema = Type.Object({
     })),
     metadata: Type.Optional(Type.Record(Type.String(), Type.String(), { description: "Arbitrary key-value metadata" })),
 }, { description: "Full watcher definition" });
+const CreateActionNameSchema = Type.Union([Type.Literal("create"), Type.Literal("add")], {
+    description: "Create action (alias: add)",
+});
+const IdActionNameSchema = Type.Union([
+    Type.Literal("enable"),
+    Type.Literal("disable"),
+    Type.Literal("remove"),
+    Type.Literal("delete"),
+    Type.Literal("status"),
+    Type.Literal("get"),
+], { description: "ID-targeting action aliases: delete/remove and get/status" });
+const ListActionNameSchema = Type.Literal("list", { description: "List all watchers" });
+const AnyActionNameSchema = Type.Union([
+    CreateActionNameSchema,
+    IdActionNameSchema,
+    ListActionNameSchema,
+]);
 const CreateActionSchema = Type.Object({
-    action: Type.Union([Type.Literal("create"), Type.Literal("add")], {
-        description: "Create action (alias: add)",
-    }),
+    action: CreateActionNameSchema,
     watcher: WatcherSchema,
 }, { additionalProperties: false });
 const IdActionSchema = Type.Object({
-    action: Type.Union([
-        Type.Literal("enable"),
-        Type.Literal("disable"),
-        Type.Literal("remove"),
-        Type.Literal("delete"),
-        Type.Literal("status"),
-        Type.Literal("get"),
-    ], { description: "ID-targeting action aliases: delete/remove and get/status" }),
+    action: IdActionNameSchema,
     id: Type.String({ description: "Watcher ID for action target" }),
 }, { additionalProperties: false });
 const ListActionSchema = Type.Object({
-    action: Type.Literal("list", { description: "List all watchers" }),
+    action: ListActionNameSchema,
 }, { additionalProperties: false });
-export const SentinelToolSchema = Type.Union([CreateActionSchema, IdActionSchema, ListActionSchema], {
+export const SentinelToolValidationSchema = Type.Union([CreateActionSchema, IdActionSchema, ListActionSchema], {
+    $defs: {
+        templateValue: TemplateValueSchema,
+    },
+});
+export const SentinelToolSchema = Type.Object({
+    action: AnyActionNameSchema,
+    watcher: Type.Optional(WatcherSchema),
+    id: Type.Optional(Type.String({ description: "Watcher ID for action target" })),
+}, {
+    additionalProperties: false,
     $defs: {
         templateValue: TemplateValueSchema,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coffeexdev/openclaw-sentinel",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Secure declarative gateway-native watcher plugin for OpenClaw",
   "keywords": [
     "openclaw",