@ynhcj/xiaoyi-channel 0.0.209-beta → 0.0.211-beta

package/dist/src/channel.js

@@ -27,6 +27,7 @@ import { discoverCrossDevicesTool } from "./tools/discover-cross-devices-tool.js
 import { sendCrossDeviceTaskTool } from "./tools/send-cross-device-task-tool.js";
 import { displayA2UICardByPathTool } from "./tools/display-a2ui-card-bypath-tool.js";
 import { checkPluginPrivilegeTool } from "./tools/check-plugin-privilege-tool.js";
+import { invokeTool } from "./tools/invoke.js";
 const ALL_TOOLS = [
     locationTool,
     discoverCrossDevicesTool,
@@ -50,6 +51,7 @@ const ALL_TOOLS = [
     loginTokenTool,
     agentAsSkillTool,
     checkPluginPrivilegeTool,
+    invokeTool,
 ];
 /**
  * Xiaoyi Channel Plugin for OpenClaw.

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

@@ -1,2 +1,2 @@
 import { ApiResponse } from './constants.js';
-export declare function callApi(questionText: string, api: any, sessionId: string, action: string): Promise<ApiResponse>;
+export declare function callApi(payload: object, api: any, sessionId: string): Promise<ApiResponse>;

package/dist/src/cspl/call_api.js

@@ -4,8 +4,7 @@
 import https from 'https';
 import { URL } from 'url';
 import { getConfig } from './config.js';
-import { DEFAULT_HTTPS_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
-import { logger } from '../utils/logger.js';
+import { DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
 function buildHeadersForCelia(config, sessionId) {
     if (!config.uid || !config.apiKey || !config.skillId || !config.requestFrom) {
         throw new Error('[SENTINEL HOOK] Missing required configuration: uid, apiKey, skillId, or requestFrom is not defined');
@@ -23,7 +22,7 @@ function buildRequestOptions(url, headers, timeout) {
     const urlObj = new URL(url);
     return {
         hostname: urlObj.hostname,
-        port: urlObj.port || DEFAULT_HTTPS_PORT,
+        port: urlObj.port || (urlObj.protocol === 'https:' ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT),
         path: urlObj.pathname,
         method: "POST",
         headers: headers,
@@ -79,18 +78,13 @@ function handleResponse(res, resolve, reject) {
         }
     });
 }
-export async function callApi(questionText, api, sessionId, action) {
+export async function callApi(payload, api, sessionId) {
     const config = getConfig(api);
     const headersForCelia = buildHeadersForCelia(config, sessionId);
-    const payload = {
-        questionText: questionText,
-        textSource: config.textSource,
-        action: action,
-        extra: `${JSON.stringify({ userId: config.uid })}`
-    };
-    const httpBody = JSON.stringify(payload);
+    // 确保 uid 存在于消息体中（从 config 注入）
+    const payloadWithUid = { ...payload, uid: config.uid };
+    const httpBody = JSON.stringify(payloadWithUid);
     const apiUrl = `${config.api.url}${API_URL_SUFFIX}`;
-    logger.log(`[SENTINEL HOOK] callApi: action=${action}, x-hag-trace-id=${sessionId}, url=${apiUrl}`);
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(apiUrl, headersForCelia, config.api.timeout);
         const req = https.request(options, (res) => {

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

@@ -11,6 +11,5 @@ export interface Config {
     skillId: string;
     requestFrom: string;
     textSource: string;
-    action: string;
 }
 export declare function getConfig(api: any): Config;

package/dist/src/cspl/config.js

@@ -9,45 +9,44 @@ const __dirname = path.dirname(__filename);
 import { CONFIG_FILE_NAME, ENV_FILE_PATH, REQUIRED_ENV_VARS } from './constants.js';
 import { logger } from '../utils/logger.js';
 let cachedConfig = null;
-function readEnvFile() {
-    if (!fs.existsSync(ENV_FILE_PATH)) {
-        throw new Error(`Environment file not found.`);
-    }
-    let envData;
+function loadEnvContent() {
     try {
-        envData = fs.readFileSync(ENV_FILE_PATH, 'utf-8');
+        return fs.readFileSync(ENV_FILE_PATH, 'utf-8');
     }
     catch (error) {
         const err = error;
         throw new Error(`Failed to read environment file. Error: ${err.message}`);
     }
-    const env = {};
+}
+function parseEnvLine(line) {
+    const trimmedLine = line.trim();
+    if (!trimmedLine || trimmedLine.startsWith('#')) {
+        return null;
+    }
+    const firstEqualIndex = trimmedLine.indexOf('=');
+    if (firstEqualIndex === -1) {
+        return null;
+    }
+    const key = trimmedLine.substring(0, firstEqualIndex).trim();
+    const value = trimmedLine.substring(firstEqualIndex + 1).trim();
+    return { key, value };
+}
+function readEnvFile() {
+    if (!fs.existsSync(ENV_FILE_PATH)) {
+        throw new Error(`Environment file not found.`);
+    }
+    const envData = loadEnvContent();
+    const envVars = {};
     const lines = envData.split('\n');
     for (const line of lines) {
-        const trimmedLine = line.trim();
-        if (!trimmedLine || trimmedLine.startsWith('#')) {
-            continue;
-        }
-        const firstEqualIndex = trimmedLine.indexOf('=');
-        if (firstEqualIndex === -1) {
-            continue;
-        }
-        const key = trimmedLine.substring(0, firstEqualIndex).trim();
-        const value = trimmedLine.substring(firstEqualIndex + 1).trim();
-        if (key && REQUIRED_ENV_VARS.includes(key)) {
-            env[key] = value;
+        const parsed = parseEnvLine(line);
+        if (parsed && parsed.key && REQUIRED_ENV_VARS.includes(parsed.key)) {
+            envVars[parsed.key] = parsed.value;
         }
     }
-    return env;
+    return envVars;
 }
-export function getConfig(api) {
-    if (cachedConfig) {
-        return cachedConfig;
-    }
-    const configPath = path.join(__dirname, CONFIG_FILE_NAME);
-    if (!fs.existsSync(configPath)) {
-        throw new Error(`Config file not found: ${CONFIG_FILE_NAME}`);
-    }
+function loadConfigFile(configPath) {
     let configData;
     try {
         configData = fs.readFileSync(configPath, 'utf-8');
@@ -55,58 +54,65 @@ export function getConfig(api) {
     catch (error) {
         throw new Error(`Failed to read config file: ${CONFIG_FILE_NAME}.`);
     }
-    let parsedConfig;
     try {
-        parsedConfig = JSON.parse(configData);
+        return JSON.parse(configData);
     }
     catch (error) {
         throw new Error(`Failed to parse config file: ${CONFIG_FILE_NAME}.`);
     }
-    if (!parsedConfig || typeof parsedConfig !== 'object') {
-        throw new Error(`Invalid config structure: ${CONFIG_FILE_NAME}. Expected an object.`);
-    }
-    const config = parsedConfig;
-    if (!config.api || typeof config.api !== 'object') {
-        throw new Error(`Invalid config: missing or invalid 'api' section in ${CONFIG_FILE_NAME}`);
-    }
-    if (!config.api.timeout || typeof config.api.timeout !== 'number') {
-        throw new Error(`Invalid config: missing or invalid 'api.timeout' in ${CONFIG_FILE_NAME}`);
-    }
-    if (!config.skillId || typeof config.skillId !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'skillId' in ${CONFIG_FILE_NAME}`);
-    }
-    if (!config.requestFrom || typeof config.requestFrom !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'requestFrom' in ${CONFIG_FILE_NAME}`);
-    }
-    if (!config.textSource || typeof config.textSource !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'textSource' in ${CONFIG_FILE_NAME}`);
-    }
-    if (!config.action || typeof config.action !== 'string') {
-        throw new Error(`Invalid config: missing or invalid 'action' in ${CONFIG_FILE_NAME}`);
+}
+function validateConfigStructure(config) {
+    const validators = [
+        { field: 'api', check: () => !config.api || typeof config.api !== 'object' },
+        { field: 'api.timeout', check: () => !config.api?.timeout || typeof config.api.timeout !== 'number' },
+        { field: 'skillId', check: () => !config.skillId || typeof config.skillId !== 'string' },
+        { field: 'requestFrom', check: () => !config.requestFrom || typeof config.requestFrom !== 'string' },
+        { field: 'textSource', check: () => !config.textSource || typeof config.textSource !== 'string' },
+    ];
+    for (const { field, check } of validators) {
+        if (check()) {
+            throw new Error(`Invalid config: missing or invalid '${field}' in ${CONFIG_FILE_NAME}`);
+        }
     }
-    let env;
+}
+function validateEnvVars() {
+    let envVars;
     try {
-        env = readEnvFile();
+        envVars = readEnvFile();
     }
     catch (error) {
         const err = error;
         throw new Error(`Failed to load environment variables from env files: ${err.message}`);
     }
-    const personalApiKey = env['PERSONAL-API-KEY'];
+    const personalApiKey = envVars['PERSONAL-API-KEY'];
     if (!personalApiKey || typeof personalApiKey !== 'string' || personalApiKey.trim() === '') {
         throw new Error(`Missing or empty 'PERSONAL-API-KEY' in env files`);
     }
-    const personalUid = env['PERSONAL-UID'];
+    const personalUid = envVars['PERSONAL-UID'];
     if (!personalUid || typeof personalUid !== 'string' || personalUid.trim() === '') {
         throw new Error(`Missing or empty 'PERSONAL-UID' in env files`);
     }
-    const serviceUrl = env['SERVICE_URL'];
+    const serviceUrl = envVars.SERVICE_URL;
     if (!serviceUrl || typeof serviceUrl !== 'string' || serviceUrl.trim() === '') {
         throw new Error(`Missing or empty 'SERVICE_URL' in env files`);
     }
-    config.apiKey = personalApiKey.trim();
-    config.uid = personalUid.trim();
-    config.api.url = serviceUrl.trim();
+    return envVars;
+}
+export function getConfig(api) {
+    if (cachedConfig) {
+        return cachedConfig;
+    }
+    const configPath = path.join(__dirname, CONFIG_FILE_NAME);
+    if (!fs.existsSync(configPath)) {
+        throw new Error(`Config file not found: ${CONFIG_FILE_NAME}`);
+    }
+    const parsedConfig = loadConfigFile(configPath);
+    const config = parsedConfig;
+    validateConfigStructure(config);
+    const envVars = validateEnvVars();
+    config.apiKey = envVars['PERSONAL-API-KEY'].trim();
+    config.uid = envVars['PERSONAL-UID'].trim();
+    config.api.url = envVars.SERVICE_URL.trim();
     cachedConfig = config;
     logger.log(`[SENTINEL HOOK] Config loaded successfully`);
     return cachedConfig;

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

@@ -11,7 +11,42 @@ export interface ApiPayload {
     questionText: string;
     textSource: string;
     action: string;
-    extra?: string;
+}
+export declare const RESULT_CODE_MAP: Record<number, string>;
+export interface NewRequestPayload {
+    taskID: string;
+    sessionID: string;
+    uid: string;
+    businessID: string;
+    sceneID: string;
+    checkPoint: number;
+    interActionID: number;
+    loginType?: string;
+    reqTime?: string;
+    message: object;
+}
+export interface NewApiResponse {
+    data: {
+        taskID: string;
+        resultCode: number;
+        resultMessage?: string;
+        securityResult: string;
+        riskLabels?: string[];
+        riskDegree?: Array<{
+            riskLabel: string;
+            score: number;
+        }>;
+        riskLabelCount?: Array<{
+            riskLabel: string;
+            count: number;
+        }>;
+        actionRiskResult?: {
+            riskScore: number;
+            riskTag: string[];
+        };
+    };
+    retCode?: string;
+    retMsg?: string;
 }
 export interface ApiResponse {
     [key: string]: any;

package/dist/src/cspl/constants.js

@@ -1,6 +1,15 @@
 /*
  * 版权所有 (c) 华为技术有限公司 2026-2026
  */
+// resultCode 错误码映射
+export const RESULT_CODE_MAP = {
+    0: 'Success',
+    1: 'Parameter is invalid',
+    2: "Parameter's format is invalid",
+    3: 'The request frequency exceeds the limit',
+    4: "Parameter's size is invalid",
+    5: 'The text detection is abnormal',
+};
 // 常量配置
 export const MIN_TEXT_LENGTH = 0;
 export const MAX_TEXT_LENGTH = 4096;

package/dist/src/cspl/sentinel_hook.js

@@ -2,10 +2,10 @@
  * 版权所有 (c) 华为技术有限公司 2026-2026
  */
 import crypto from 'crypto';
-import { callApi } from './call_api.js';
-import { processText, extractResultText, validateAndTruncateText, parseSecurityResult, handleExecToolInput, handleMessageToolInput, handleOtherToolInput } from './utils.js';
-import { ALLOWED_TOOLS, MAX_TEXT_LENGTH, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, STEER_ABORT_MESSAGE, TOOL_OUTPUT_ACTION } from './constants.js';
 import { logger } from '../utils/logger.js';
+import { callApi } from './call_api.js';
+import { processText, extractResultText, validateAndTruncateText, parseSecurityResult, handleExecToolInput, handleMessageToolInput, handleOtherToolInput, buildToolOutputPayload, extractInterActionId, extractSessionId } from './utils.js';
+import { ALLOWED_TOOLS, MAX_TOTAL_LENGTH, MIN_TEXT_LENGTH, MAX_TEXT_LENGTH, STEER_ABORT_MESSAGE } from './constants.js';
 import { getCurrentSessionContext } from '../tools/session-manager.js';
 import { tryInjectSteer } from './steer-context.js';
 // 主入口模块
@@ -15,20 +15,23 @@ export default function register(api) {
         // 获取真实sessionID：优先使用ALS中的A2A sessionId，降级到OpenClaw runId或随机值
         const sessionCtx = getCurrentSessionContext();
         const sessionId = sessionCtx?.sessionId || (event.runId?.replace(/-/g, '') || crypto.randomBytes(16).toString('hex'));
-        logger.log(`[SENTINEL HOOK] Session ID: ${sessionId} (fromALS: ${!!sessionCtx?.sessionId})`);
+        const taskId = sessionCtx?.taskId || event.runId;
+        logger.log(`[SENTINEL HOOK] Session ID: ${sessionId}, Task ID: ${taskId} (fromALS: ${!!sessionCtx?.sessionId})`);
+        // 请求体中的sessionID从taskId中提取（第一个&之前的内容）
+        const payloadSessionId = extractSessionId(taskId) || sessionId;
         // 处理 TOOL_INPUT 数据采集、发送数据，根据扫描结果决定是否阻塞
         try {
             let scanResult = null;
             if (event.toolName === 'exec') {
-                scanResult = await handleExecToolInput(event, api, sessionId);
+                scanResult = await handleExecToolInput(event, api, payloadSessionId, taskId);
             }
             else if (event.toolName === 'message') {
-                scanResult = await handleMessageToolInput(event, api, sessionId);
+                scanResult = await handleMessageToolInput(event, api, payloadSessionId, taskId);
             }
             else {
-                scanResult = await handleOtherToolInput(event, api, sessionId);
+                scanResult = await handleOtherToolInput(event, api, payloadSessionId, taskId);
             }
-            if (scanResult?.status === 'REJECT') {
+            if (scanResult?.status === 'reject') {
                 logger.warn(`[SENTINEL HOOK] TOOL_INPUT REJECT, blocking tool call: ${event.toolName}`);
                 return { block: true, blockReason: `安全扫描检测到风险，已阻止工具调用: ${event.toolName}` };
             }
@@ -47,8 +50,11 @@ export default function register(api) {
             // 获取真实sessionID：优先使用ALS中的A2A sessionId，降级到OpenClaw runId或随机值
             const sessionCtx = getCurrentSessionContext();
             const sessionId = sessionCtx?.sessionId || (event.runId?.replace(/-/g, '') || crypto.randomBytes(16).toString('hex'));
-            logger.log(`[SENTINEL HOOK] Session ID: ${sessionId} (fromALS: ${!!sessionCtx?.sessionId})`);
-            // 处理TOOL_OUTPUT数据采集（保持现有逻辑）
+            const taskId = sessionCtx?.taskId || event.runId;
+            logger.log(`[SENTINEL HOOK] Session ID: ${sessionId}, Task ID: ${taskId} (fromALS: ${!!sessionCtx?.sessionId})`);
+            // 请求体中的sessionID从taskId中提取（第一个&之前的内容）
+            const payloadSessionId = extractSessionId(taskId) || sessionId;
+            // 处理TOOL_OUTPUT数据采集
             const resultText = extractResultText(event, event.toolName);
             const resultTextLength = resultText.length;
             if (resultTextLength > MAX_TOTAL_LENGTH) {
@@ -60,25 +66,23 @@ export default function register(api) {
                 return;
             }
             // 处理和验证文本
-            const questionText = { subSceneID: 'TOOL_OUTPUT', tool: `${event.toolName}`, output: [{ content: "" }] };
-            const originText = processText(resultText, api);
-            questionText.output[0].content = `${originText}`;
-            const finalText = JSON.stringify(questionText);
-            if (finalText.length > MAX_TEXT_LENGTH) {
-                const diff_length = finalText.length - MAX_TEXT_LENGTH;
-                const { text: filterText, truncated } = validateAndTruncateText(originText, MAX_TEXT_LENGTH - diff_length);
+            const originText = processText(resultText);
+            let content = originText;
+            if (originText.length > MAX_TEXT_LENGTH) {
+                const { text: filterText, truncated } = validateAndTruncateText(originText, MAX_TEXT_LENGTH);
                 if (truncated) {
-                    questionText.output[0].content = `${filterText}`;
+                    content = filterText;
                     logger.warn(`[SENTINEL HOOK] postText exceeds ${MAX_TEXT_LENGTH}.`);
                 }
             }
-            const postText = JSON.stringify(questionText);
-            logger.log(`[SENTINEL HOOK] Content extracted successfully. Length: ${postText.length}`);
+            const interActionID = extractInterActionId(taskId);
+            const outputPayload = buildToolOutputPayload(taskId, payloadSessionId, event.toolName, content, event.toolCallId, interActionID);
+            logger.log(`[SENTINEL HOOK] Content extracted successfully. Length: ${JSON.stringify(outputPayload).length}`);
             try {
-                const response = await callApi(postText, api, sessionId, TOOL_OUTPUT_ACTION);
+                const response = await callApi(outputPayload, api, sessionId);
                 const result = parseSecurityResult(response);
                 logger.log(`[SENTINEL HOOK] TOOL_OUTPUT response: status=${result.status}.`);
-                if (result.status === 'REJECT') {
+                if (result.status === 'reject') {
                     logger.warn('[SENTINEL HOOK] REJECT detected, attempting steer injection');
                     if (sessionCtx?.sessionId && sessionCtx?.taskId) {
                         await tryInjectSteer({

package/dist/src/cspl/upload_file.js

@@ -6,15 +6,14 @@ import path from 'path';
 import https from 'https';
 import { URL } from 'url';
 import { getConfig } from './config.js';
-import { DEFAULT_HTTPS_PORT, MAX_TIMES, CONNECT_TIMEOUT, READ_TIMEOUT, EXPIRE_TIME, OSMS_PREPARE_URL, OSMS_COMPLETE_URL, TEMPORARY_MATERIAL_PACKAGE, FILE_OWNER_UID, FILE_OWNER_TEAM_ID } from './constants.js';
+import { DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT, MAX_TIMES, CONNECT_TIMEOUT, READ_TIMEOUT, EXPIRE_TIME, OSMS_PREPARE_URL, OSMS_COMPLETE_URL, TEMPORARY_MATERIAL_PACKAGE, FILE_OWNER_UID, FILE_OWNER_TEAM_ID } from './constants.js';
 function buildOsmsHeaders(config, traceId) {
     return {
-        'content-type': 'application/json',
+        'Content-Type': 'application/json',
         'x-request-from': 'openclaw',
         'x-uid': config.uid,
         'x-api-key': config.apiKey,
-        'x-hag-trace-id': traceId,
-        'x-skill-id': ''
+        'x-hag-trace-id': traceId
     };
 }
 function httpRequest(url, method, headers, body, timeout) {
@@ -22,7 +21,7 @@ function httpRequest(url, method, headers, body, timeout) {
         const urlObj = new URL(url);
         const options = {
             hostname: urlObj.hostname,
-            port: urlObj.port || DEFAULT_HTTPS_PORT,
+            port: urlObj.port || (urlObj.protocol === 'https:' ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT),
             path: urlObj.pathname + urlObj.search,
             method: method,
             headers: headers,
@@ -112,7 +111,7 @@ async function uploadFileToObs(uploadInfo, fileBytes) {
             const urlObj = new URL(uploadInfo.url);
             const options = {
                 hostname: urlObj.hostname,
-                port: urlObj.port || DEFAULT_HTTPS_PORT,
+                port: urlObj.port || (urlObj.protocol === 'https:' ? DEFAULT_HTTPS_PORT : DEFAULT_HTTP_PORT),
                 path: urlObj.pathname + urlObj.search,
                 method: 'PUT',
                 headers: {

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

@@ -5,21 +5,32 @@ export declare function validateAndTruncateText(text: string, maxLength: number)
     truncated: boolean;
 };
 export declare function extractResultText(event: any, toolName: string): string;
-export declare function processText(resultText: string, api: OpenClawPluginApi): string;
+export declare function processText(resultText: string): string;
 export declare function parseSecurityResult(response: any): {
-    status: 'ACCEPT' | 'REJECT';
+    status: 'accept' | 'reject';
 };
 export declare function extractInputParams(event: any, toolName: string): string;
 export declare function extractFilePathsFromCommand(command: string): string[];
 export declare function calculateContentHash(content: string): string;
 export declare function getFileSizeInKB(filePath: string): number;
-export declare function adjustContentLength(data: any, api: OpenClawPluginApi, fields: string[]): any;
-export declare function handleExecToolInput(event: any, api: OpenClawPluginApi, sessionId: string): Promise<{
-    status: 'ACCEPT' | 'REJECT';
+export declare function extractSessionId(taskId: string): string;
+export declare function extractInterActionId(taskId: string): number;
+export declare function buildToolInputPayload(taskID: string, sessionID: string, toolName: string, toolArguments: string, toolCallId: string, interActionID: number, options?: {
+    file?: {
+        type: string;
+        url: string;
+        hash: string;
+        size: number;
+        body: string;
+    };
+}): object;
+export declare function buildToolOutputPayload(taskID: string, sessionID: string, funcName: string, content: string, toolCallId: string, interActionID: number): object;
+export declare function handleExecToolInput(event: any, api: OpenClawPluginApi, sessionId: string, taskId: string): Promise<{
+    status: 'accept' | 'reject';
 } | null>;
-export declare function handleMessageToolInput(event: any, api: OpenClawPluginApi, sessionId: string): Promise<{
-    status: 'ACCEPT' | 'REJECT';
+export declare function handleMessageToolInput(event: any, api: OpenClawPluginApi, sessionId: string, taskId: string): Promise<{
+    status: 'accept' | 'reject';
 } | null>;
-export declare function handleOtherToolInput(event: any, api: OpenClawPluginApi, sessionId: string): Promise<{
-    status: 'ACCEPT' | 'REJECT';
+export declare function handleOtherToolInput(event: any, api: OpenClawPluginApi, sessionId: string, taskId: string): Promise<{
+    status: 'accept' | 'reject';
 } | null>;