@ynhcj/xiaoyi-channel 0.0.124-next → 0.0.125-next

package/dist/index.js

@@ -1,13 +1,7 @@
 import { definePluginEntry } from "openclaw/plugin-sdk/core";
 import { xiaoyiProvider } from "./src/provider.js";
 import { xyPlugin } from "./src/channel.js";
-import { callCsplApiWithConfig } from "./src/cspl/call-api.js";
-import { getCsplConfig, initCsplConfigFromXYConfig } from "./src/cspl/config.js";
-import { ALLOWED_TOOLS, MAX_TEXT_LENGTH, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, STEER_ABORT_MESSAGE, } from "./src/cspl/constants.js";
-import { extractResultText, parseSecurityResult, processText, validateAndTruncateText, } from "./src/cspl/utils.js";
-import { injectCsplSteer } from "./src/cspl/steer-context.js";
-import { getSessionContext } from "./src/tools/session-manager.js";
-import { logger } from "./src/utils/logger.js";
+import { createCsplMiddleware } from "./src/cspl/middleware.js";
 import { setXYRuntime } from "./src/runtime.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
@@ -26,60 +20,13 @@ function registerFullHooks(api) {
     api.on("before_prompt_build", beforePromptBuildHandler);
     registerSelfEvolutionToolResultNudge(api);
 }
-function registerCsplHook(api) {
-    // CSPL security scanning via after_tool_call hook.
-    // When CSPL returns REJECT, injects a steer message (with /steer prefix)
-    // into the active Pi run to interrupt the agent.
-    // Only registered in "full" mode because it depends on handleXYMessage
-    // having cached cfg/runtime via setCsplSteerContext.
-    api.on("after_tool_call", async (event, ctx) => {
-        if (!ALLOWED_TOOLS.includes(event.toolName)) {
-            return;
-        }
-        try {
-            const resultText = extractResultText(event, event.toolName);
-            const resultLength = resultText.length;
-            if (resultLength <= MIN_TEXT_LENGTH || resultLength > MAX_TOTAL_LENGTH) {
-                return;
-            }
-            logger.log(`[SENTINEL HOOK] after_tool_call: toolName=${event.toolName}, textLength=${resultLength}`);
-            const questionText = {
-                subSceneID: "TOOL_OUTPUT",
-                tool: event.toolName,
-                output: [{ content: "" }],
-            };
-            const originText = processText(resultText);
-            questionText.output[0].content = originText;
-            let finalJson = JSON.stringify(questionText);
-            if (finalJson.length > MAX_TEXT_LENGTH) {
-                const diff = finalJson.length - MAX_TEXT_LENGTH;
-                const { text: trimmed } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff);
-                questionText.output[0].content = trimmed;
-                finalJson = JSON.stringify(questionText);
-            }
-            const sessionCtx = getSessionContext(ctx.sessionKey ?? "");
-            const csplConfig = sessionCtx
-                ? initCsplConfigFromXYConfig(sessionCtx.config)
-                : getCsplConfig();
-            const csplStartTime = Date.now();
-            const response = await callCsplApiWithConfig(finalJson, csplConfig);
-            const csplElapsed = Date.now() - csplStartTime;
-            const result = parseSecurityResult(response);
-            logger.log(`[SENTINEL HOOK] Security result: status=${result.status}, toolName=${event.toolName}, elapsed=${csplElapsed}ms`);
-            if (result.status === "REJECT") {
-                logger.log(`[SENTINEL HOOK] REJECT - injecting steer message`);
-                if (sessionCtx) {
-                    await injectCsplSteer(sessionCtx.sessionId, sessionCtx.taskId, STEER_ABORT_MESSAGE);
-                }
-                else {
-                    logger.error("[SENTINEL HOOK] No session context, cannot inject steer");
-                }
-            }
-        }
-        catch (err) {
-            logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
-        }
-    });
+function registerCsplMiddleware(api) {
+    // CSPL security scanning via AgentToolResultMiddleware.
+    // Intercepts tool results BEFORE they reach the LLM, so on REJECT
+    // the result is replaced entirely — no steer injection needed.
+    // Only registered in "full" mode because it depends on session context
+    // for CSPL config resolution.
+    api.registerAgentToolResultMiddleware(createCsplMiddleware(), { runtimes: ["pi"] });
 }
 export default definePluginEntry({
     id: "xiaoyi-channel",
@@ -94,7 +41,7 @@ export default definePluginEntry({
         setXYRuntime(api.runtime);
         if (api.registrationMode === "full") {
             registerFullHooks(api);
-            registerCsplHook(api);
+            registerCsplMiddleware(api);
         }
     },
 });

package/package.json

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