@ynhcj/xiaoyi-channel 0.0.131-beta → 0.0.131-next

package/dist/index.js

@@ -1,11 +1,14 @@
 import { definePluginEntry } from "openclaw/plugin-sdk/core";
 import { xiaoyiProvider } from "./src/provider.js";
 import { xyPlugin } from "./src/channel.js";
-import { callCsplApi } from "./src/cspl/call-api.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 { tryInjectSteer } from "./src/cspl/steer-context.js";
+import { getSessionContext } from "./src/tools/session-manager.js";
+import { logger } from "./src/utils/logger.js";
 import { setXYRuntime } from "./src/runtime.js";
-import { tryInjectSteer } from "./src/steer-injector.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
@@ -22,17 +25,25 @@ function registerFullHooks(api) {
     const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
     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 via tryInjectSteer
+    // to interrupt the agent. Uses skipRegistration to avoid refCount leaks
+    // and taskId overwrites.
+    // 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;
         }
-        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;
             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,
@@ -47,15 +58,32 @@ function registerFullHooks(api) {
                 questionText.output[0].content = trimmed;
                 finalJson = JSON.stringify(questionText);
             }
-            const response = await callCsplApi(finalJson, api.config);
+            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);
-            console.log(`[SENTINEL HOOK] Security result: status=${result.status}`);
+            logger.log(`[SENTINEL HOOK] Security result: status=${result.status}, toolName=${event.toolName}, elapsed=${csplElapsed}ms`);
             if (result.status === "REJECT") {
-                await tryInjectSteer(ctx.sessionKey, STEER_ABORT_MESSAGE);
+                logger.log(`[SENTINEL HOOK] REJECT - injecting steer via tryInjectSteer`);
+                if (sessionCtx) {
+                    await tryInjectSteer({
+                        sessionId: sessionCtx.sessionId,
+                        taskId: sessionCtx.taskId,
+                        message: STEER_ABORT_MESSAGE,
+                        source: "cspl",
+                    });
+                }
+                else {
+                    logger.error("[SENTINEL HOOK] No session context, cannot inject steer");
+                }
             }
         }
         catch (err) {
-            api.logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
+            logger.error(`[SENTINEL HOOK] after_tool_call error: ${err}`);
         }
     });
 }
@@ -82,6 +110,7 @@ export default definePluginEntry({
         }
         if (api.registrationMode === "full") {
             registerFullHooks(api);
+            registerCsplHook(api);
         }
     },
 });

package/dist/src/bot.d.ts

@@ -9,6 +9,14 @@ export interface HandleXYMessageParams {
     message: A2AJsonRpcRequest;
     accountId: string;
     webSocketSessionId?: string;
+    /** Called after dispatch init is complete (agentTools/wrapStreamFn done). */
+    onInitComplete?: () => void;
+    /**
+     * When true, skip taskId/session registration. Used by tryInjectSteer to
+     * inject a steer message without overwriting the active taskId or leaking
+     * session refCount.
+     */
+    skipRegistration?: boolean;
 }
 /**
  * Handle an incoming A2A message.