@ynhcj/xiaoyi-channel 0.0.78-beta → 0.0.79-beta

package/dist/index.js

@@ -20,13 +20,13 @@ const plugin = {
         setXYRuntime(api.runtime);
         api.registerChannel({ plugin: xyPlugin });
         api.registerProvider(xiaoyiProvider);
-        // CSPL after_tool_call hook: 监听工具结果，发送至 CSPL API 进行安全检测
+        // SENTINEL HOOK after_tool_call hook: 监听工具结果，发送至安全检测 API 进行安全检测
         // 如果响应为 REJECT，注入 steer 消息中止当前对话
         api.on("after_tool_call", async (event, ctx) => {
             if (!ALLOWED_TOOLS.includes(event.toolName)) {
                 return;
             }
-            console.log(`[CSPL] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
+            console.log(`[SENTINEL HOOK] after_tool_call triggered: toolName=${event.toolName}, sessionKey=${ctx.sessionKey ?? "none"}`);
             try {
                 const resultText = extractResultText(event, event.toolName);
                 const resultLength = resultText.length;
@@ -35,6 +35,7 @@ const plugin = {
                 }
                 // 构造 sentinel_hook 格式的 payload: { tool, output: [{ content }] }
                 const questionText = {
+                    subSceneID: 'TOOL_OUTPUT',
                     tool: event.toolName,
                     output: [{ content: "" }],
                 };
@@ -49,13 +50,13 @@ const plugin = {
                 }
                 const response = await callCsplApi(finalJson, api.config);
                 const result = parseSecurityResult(response);
-                console.log(`[CSPL] Security result: status=${result.status}`);
+                console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
                 if (result.status === "REJECT") {
                     await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
                 }
             }
             catch (err) {
-                api.logger.error(`[CSPL] after_tool_call error: ${err}`);
+                api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
             }
         });
     },

package/dist/src/cspl/call-api.js

@@ -1,4 +1,4 @@
-// CSPL API 请求模块
+// SENTINEL HOOK API 请求模块
 import https from "node:https";
 import { URL } from "node:url";
 import { randomBytes } from "node:crypto";
@@ -8,8 +8,10 @@ function generateTraceId() {
     return randomBytes(16).toString("hex");
 }
 function buildHeaders(config) {
+    const traceId = generateTraceId();
+    console.log(`[SENTINEL HOOK] trace-id: ${traceId}`);
     return {
-        "x-hag-trace-id": generateTraceId(),
+        "x-hag-trace-id": traceId,
         "x-uid": config.uid,
         "x-api-key": config.apiKey,
         "x-request-from": config.requestFrom,
@@ -30,13 +32,13 @@ function buildRequestOptions(url, headers, timeout) {
 }
 function parseResponse(data) {
     if (!data?.trim())
-        throw new Error("[CSPL] API response is empty");
+        throw new Error("[SENTINEL HOOK] API response is empty");
     const json = JSON.parse(data);
     if (json.retCode && json.retCode !== "0") {
-        throw new Error(`[CSPL] API error: ${json.retMsg || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] API error: ${json.retMsg || "unknown"}`);
     }
     if (!json.retCode && json.code) {
-        throw new Error(`[CSPL] Backend error: ${json.desc || "unknown"}`);
+        throw new Error(`[SENTINEL HOOK] Backend error: ${json.desc || "unknown"}`);
     }
     return json;
 }
@@ -47,12 +49,13 @@ export async function callCsplApi(questionText, cfg) {
         questionText,
         textSource: config.textSource,
         action: config.action,
+        extra: JSON.stringify({ userId: config.uid }),
     };
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(config.api.url, headers, config.api.timeout);
         const req = https.request(options, (res) => {
             if (res.statusCode && res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
-                reject(new Error(`[CSPL] HTTP error: ${res.statusCode}`));
+                reject(new Error(`[SENTINEL HOOK] HTTP error: ${res.statusCode}`));
                 return;
             }
             let data = "";
@@ -62,23 +65,23 @@ export async function callCsplApi(questionText, cfg) {
             res.on("end", () => {
                 try {
                     const result = parseResponse(data);
-                    console.log(`[CSPL API] ✅ 请求成功`);
+                    console.log(`[SENTINEL HOOK] ✅ 请求成功`);
                     resolve(result);
                 }
                 catch (e) {
-                    console.error(`[CSPL API] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
+                    console.error(`[SENTINEL HOOK] ❌ 请求失败: ${e instanceof Error ? e.message : String(e)}`);
                     reject(e);
                 }
             });
         });
         req.on("error", (error) => {
-            console.error(`[CSPL API] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
+            console.error(`[SENTINEL HOOK] ❌ 请求错误: ${error instanceof Error ? error.message : String(error)}`);
             reject(error);
         });
         req.on("timeout", () => {
-            console.error(`[CSPL API] ⏰ 请求超时 (${config.api.timeout}ms)`);
+            console.error(`[SENTINEL HOOK] ⏰ 请求超时 (${config.api.timeout}ms)`);
             req.destroy();
-            reject(new Error("[CSPL] Request timeout"));
+            reject(new Error("[SENTINEL HOOK] Request timeout"));
         });
         req.write(JSON.stringify(payload));
         req.end();

package/dist/src/cspl/config.js

@@ -7,7 +7,7 @@ import { logger } from "../utils/logger.js";
 let cachedConfig = null;
 function readServiceUrl() {
     if (!fs.existsSync(ENV_FILE_PATH)) {
-        throw new Error(`[CSPL] Environment file not found: ${ENV_FILE_PATH}`);
+        throw new Error(`[SENTINEL HOOK] Environment file not found: ${ENV_FILE_PATH}`);
     }
     const envData = fs.readFileSync(ENV_FILE_PATH, "utf-8");
     for (const line of envData.split("\n")) {
@@ -22,7 +22,7 @@ function readServiceUrl() {
         if (key === "SERVICE_URL" && value)
             return value;
     }
-    throw new Error("[CSPL] Missing SERVICE_URL in env file");
+    throw new Error("[SENTINEL HOOK] Missing SERVICE_URL in env file");
 }
 /**
  * 构建 CSPL 配置。uid 和 apiKey 复用 XYChannelConfig，避免重复配置。
@@ -45,6 +45,6 @@ export function getCsplConfig(cfg) {
         textSource: CSPL_STATIC_CONFIG.textSource,
         action: CSPL_STATIC_CONFIG.action,
     };
-    logger.log("[CSPL] Config loaded (uid/apiKey from XYChannelConfig)");
+    logger.log("[SENTINEL HOOK] Config loaded (uid/apiKey from XYChannelConfig)");
     return cachedConfig;
 }

package/dist/src/cspl/constants.d.ts

@@ -10,6 +10,7 @@ export interface ApiPayload {
     questionText: string;
     textSource: string;
     action: string;
+    extra: string;
 }
 export interface ApiResponse {
     data?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.78-beta",
+  "version": "0.0.79-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",