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

package/dist/index.d.ts

@@ -1,8 +1,3 @@
-declare const _default: {
-    id: string;
-    name: string;
-    description: string;
-    configSchema: import("openclaw/plugin-sdk").OpenClawPluginConfigSchema;
-    register: NonNullable<import("openclaw/plugin-sdk/core").OpenClawPluginDefinition["register"]>;
-} & Pick<import("openclaw/plugin-sdk/core").OpenClawPluginDefinition, "kind" | "reload" | "nodeHostCommands" | "securityAuditCollectors">;
-export default _default;
+import { definePluginEntry } from "openclaw/plugin-sdk/core";
+declare const pluginEntry: ReturnType<typeof definePluginEntry>;
+export default pluginEntry;

package/dist/index.js

@@ -10,6 +10,7 @@ import { getAllPushIds } from "./src/utils/pushid-manager.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";
+import { registerCLIHook } from "./src/tools/hmos-cli.js";
 /**
  * Register the cron detection hook.
  *
@@ -181,7 +182,7 @@ function registerFullHooks(api) {
     api.on("before_prompt_build", beforePromptBuildHandler);
     registerSelfEvolutionToolResultNudge(api);
 }
-export default definePluginEntry({
+const pluginEntry = definePluginEntry({
     id: "xiaoyi-channel",
     name: "Xiaoyi Channel",
     description: "Xiaoyi channel plugin - Xiaoyi A2A protocol integration",
@@ -208,6 +209,9 @@ export default definePluginEntry({
             registerSentinelHook(api);
             // Cron detection hook: marks toolCallIds from cron sessions
             registerCronDetectionHook(api);
+            // CLI exec hook: intercepts built-in exec for HarmonyOS CLI skill tools
+            registerCLIHook(api);
         }
     },
 });
+export default pluginEntry;

package/dist/src/bot.js

@@ -7,6 +7,7 @@ import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
 import { appendSelfEvolutionKeywordNudge, shouldNudgeForSelfEvolutionKeyword, } from "./self-evolution-keyword.js";
+import { queueAgentHarnessMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
@@ -552,7 +553,7 @@ function enqueueSteer(params) {
     return next;
 }
 async function dispatchSteerWhenReady(params) {
-    const { sessionId, sessionKey, steerText } = params;
+    const { sessionId, steerText } = params;
     const log = logger.withContext(sessionId, params.parsed.taskId);
     // 1. 等待第一条消息开始 streaming
     //    signal 可能尚未创建（第一条消息还在文件下载等耗时操作中），
@@ -578,7 +579,7 @@ async function dispatchSteerWhenReady(params) {
     }
     else {
         // 轮询超时且 hasActiveTask 仍为 true——说明第一条消息可能卡在异常路径，
-        // 没有创建 signal。此时 dispatch 会与第一条消息的模型调用并发冲突，放弃。
+        // 没有创建 signal。此时放弃，避免并发碰撞。
         log.log(`[STEER-QUEUE] Signal never appeared after polling, skip steer to avoid collision`);
         return;
     }
@@ -587,84 +588,22 @@ async function dispatchSteerWhenReady(params) {
         log.log(`[STEER-QUEUE] First message completed, skip steer`);
         return;
     }
-    // 3. 构建 dispatch 上下文并 dispatch /steer
-    const core = getXYRuntime();
-    const speaker = sessionId;
-    // 如果有文件附件，把路径拼到 steer 文本末尾，让模型通过工具读取
+    // 3. 直接注入到活跃的 Pi run 中，不创建独立 dispatcher。
+    //    模型回复通过第一条消息的 dispatcher 的 onPartialReply 流式发出，
+    //    使用 registerTaskId + updateFallbackTaskId 已同步的最新 taskId。
     const mediaPaths = params.mediaPayload?.MediaPaths;
     const fileHint = mediaPaths && mediaPaths.length > 0
         ? `\n【用户上传附件】：${JSON.stringify(mediaPaths)}`
         : "";
-    const steerCommand = `/steer ${steerText}${fileHint}`;
-    const messageBody = `${speaker}: ${steerCommand}`;
-    const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(params.cfg);
-    const body = core.channel.reply.formatAgentEnvelope({
-        channel: "xiaoyi-channel",
-        from: speaker,
-        timestamp: new Date(),
-        envelope: envelopeOptions,
-        body: messageBody,
-    });
-    const ctxPayload = core.channel.reply.finalizeInboundContext({
-        Body: body,
-        RawBody: steerCommand,
-        CommandBody: steerCommand,
-        From: sessionId,
-        To: sessionId,
-        SessionKey: params.route.sessionKey,
-        AccountId: params.route.accountId,
-        ChatType: "direct",
-        GroupSubject: undefined,
-        SenderName: sessionId,
-        SenderId: sessionId,
-        Provider: "xiaoyi-channel",
-        Surface: "xiaoyi-channel",
-        MessageSid: `xiaoyi_${params.parsed.taskId}_${params.deviceType}`,
-        Timestamp: Date.now(),
-        WasMentioned: false,
-        CommandAuthorized: true,
-        OriginatingChannel: "xiaoyi-channel",
-        OriginatingTo: sessionId,
-        ReplyToBody: undefined,
-        ...params.mediaPayload,
-    });
-    const steerState = { steered: true };
-    const { dispatcher, replyOptions } = createXYReplyDispatcher({
-        cfg: params.cfg,
-        runtime: params.runtime,
-        sessionId,
-        taskId: params.parsed.taskId,
-        messageId: params.parsed.messageId,
-        accountId: params.route.accountId,
-        steerState,
-    });
-    const sessionContext = {
-        config: resolveXYConfig(params.cfg),
-        sessionId,
-        taskId: params.parsed.taskId,
-        messageId: params.parsed.messageId,
-        agentId: params.route.accountId,
-        deviceType: params.deviceType,
-    };
-    log.log(`[STEER-QUEUE] Dispatching steer`);
-    await core.channel.reply.withReplyDispatcher({
-        dispatcher,
-        onSettled: () => {
-            log.log(`[STEER-QUEUE] Steer dispatch settled`);
-        },
-        run: () => {
-            return runWithSessionContext(sessionContext, async () => {
-                log.log(`[ALS-PROOF] bot entered steer dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=true`);
-                const result = await core.channel.reply.dispatchReplyFromConfig({
-                    ctx: ctxPayload,
-                    cfg: params.cfg,
-                    dispatcher,
-                    replyOptions,
-                });
-                log.log(`[STEER-QUEUE] dispatch result: ${JSON.stringify(result)}`);
-                return result;
-            });
-        },
+    const steerMessage = `${steerText}${fileHint}`;
+    log.log(`[STEER-QUEUE] Injecting steer message directly into active run`);
+    const injected = queueAgentHarnessMessage(sessionId, steerMessage, {
+        steeringMode: "all",
     });
-    log.log(`[STEER-QUEUE] Steer dispatch completed`);
+    if (injected) {
+        log.log(`[STEER-QUEUE] Steer message injected successfully`);
+    }
+    else {
+        log.log(`[STEER-QUEUE] Steer injection failed — run may not be accepting messages`);
+    }
 }

package/dist/src/cspl/config.js

@@ -3,6 +3,9 @@
  */
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+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;

package/dist/src/reply-dispatcher.js

@@ -430,15 +430,16 @@ export function createXYReplyDispatcher(params) {
                         }
                         else {
                             // 新文本不以已累积内容为前缀（如工具调用后模型重新开始生成），
-                            // 更新 accumulatedText 为当前文本，后续基于此新前缀做去重
+                            // 重置 accumulatedText 为当前文本，后续基于此新前缀做去重
                             const wasFirstRound = accumulatedText.length === 0;
-                            accumulatedText = "";
                             // 新一轮输出前加换行分隔（第一轮除外）
                             if (sendText.length > 0 && !wasFirstRound) {
                                 sendText = "\n" + sendText;
                             }
                         }
-                        accumulatedText += sendText;
+                        // 始终追踪模型的原始输出文本，避免注入的 "\n" 前缀污染 accumulatedText
+                        // 导致下一轮 startsWith 永久匹配失败
+                        accumulatedText = text;
                         hasSentResponse = true;
                         if (sendText.length > 0) {
                             await sendA2AResponse({

package/dist/src/skill-retriever/config.js

@@ -4,6 +4,7 @@ const DEFAULT_CONFIG = {
     includeUninstalledOnly: true,
     envFilePath: "~/.openclaw/.xiaoyienv",
     timeoutMs: 1000,
+    excludedSkills: ["content-compliance", "plugin-audit"],
 };
 export function normalizeToolRetrieverConfig(raw) {
     if (!raw || typeof raw !== "object") {
@@ -19,5 +20,6 @@ export function normalizeToolRetrieverConfig(raw) {
         apiKey: cfg.apiKey,
         uid: cfg.uid,
         timeoutMs: cfg.timeoutMs ?? DEFAULT_CONFIG.timeoutMs,
+        excludedSkills: cfg.excludedSkills ?? DEFAULT_CONFIG.excludedSkills,
     };
 }

package/dist/src/skill-retriever/hooks.js

@@ -59,6 +59,7 @@ export function createBeforePromptBuildHandler(config) {
                 apiKey: config.apiKey,
                 uid: config.uid,
                 timeoutMs: config.timeoutMs,
+                configExcludedSkills: config.excludedSkills,
             });
             if (!searchResult || searchResult.tools.length === 0) {
                 return undefined;

package/dist/src/skill-retriever/tool-search.d.ts

@@ -1,7 +1,9 @@
 import type { EnvConfig, ToolSearchResult } from "./types.js";
 export declare function extractUserQuery(fullPrompt: string): string;
 export declare function readEnvFile(filePath: string): EnvConfig;
+export declare function getSkillsInDirectory(dirPath: string): string[];
 export declare function getInstalledSkills(): string[];
+export declare function buildExcludedSkillIds(excludedSkills?: string[]): Set<string>;
 export interface SearchToolsOptions {
     query: string;
     maxTools?: number;
@@ -11,6 +13,7 @@ export interface SearchToolsOptions {
     apiKey?: string;
     uid?: string;
     timeoutMs?: number;
+    configExcludedSkills?: string[];
 }
 export declare function searchTools(options: SearchToolsOptions): Promise<ToolSearchResult | null>;
 export declare function formatToolsForContext(result: ToolSearchResult, includeInstallUrl?: boolean): string;

package/dist/src/skill-retriever/tool-search.js

@@ -48,24 +48,37 @@ export function readEnvFile(filePath) {
     }
     return envDict;
 }
-export function getInstalledSkills() {
-    const skillsDir = expandPath("~/.openclaw/workspace/skills");
-    const installedSkills = [];
+export function getSkillsInDirectory(dirPath) {
+    const expandedDir = expandPath(dirPath);
+    const skills = [];
     try {
-        if (fs.existsSync(skillsDir) && fs.statSync(skillsDir).isDirectory()) {
-            const entries = fs.readdirSync(skillsDir);
+        if (fs.existsSync(expandedDir) && fs.statSync(expandedDir).isDirectory()) {
+            const entries = fs.readdirSync(expandedDir);
             for (const entry of entries) {
-                const entryPath = path.join(skillsDir, entry);
+                const entryPath = path.join(expandedDir, entry);
                 if (fs.statSync(entryPath).isDirectory()) {
-                    installedSkills.push(entry);
+                    skills.push(entry);
                 }
             }
         }
     }
     catch {
-        // Directory doesn't exist or read error - return empty list
+        // 目录不存在或读取错误 - 返回空列表
+    }
+    return skills;
+}
+export function getInstalledSkills() {
+    return getSkillsInDirectory("~/.openclaw/workspace/skills");
+}
+export function buildExcludedSkillIds(excludedSkills) {
+    const coreSkills = getSkillsInDirectory("~/core_skills");
+    const excluded = new Set(coreSkills);
+    if (excludedSkills) {
+        for (const skillId of excludedSkills) {
+            excluded.add(skillId);
+        }
     }
-    return installedSkills;
+    return excluded;
 }
 function formatSkillData(rawSkills, installedSkills) {
     const formattedSkills = [];
@@ -83,7 +96,7 @@ function formatSkillData(rawSkills, installedSkills) {
     return formattedSkills;
 }
 export async function searchTools(options) {
-    const { query, maxTools = 5, includeUninstalledOnly = true, envFilePath = "~/.openclaw/.xiaoyienv", serviceUrl: configServiceUrl, apiKey: configApiKey, uid: configUid, timeoutMs = 1000, } = options;
+    const { query, maxTools = 5, includeUninstalledOnly = true, envFilePath = "~/.openclaw/.xiaoyienv", serviceUrl: configServiceUrl, apiKey: configApiKey, uid: configUid, timeoutMs = 1000, configExcludedSkills, } = options;
     const envConfig = readEnvFile(envFilePath);
     const hasRequiredConfig = !!envConfig.SERVICE_URL && !!envConfig.PERSONAL_API_KEY && !!envConfig.PERSONAL_UID;
     const serviceUrl = configServiceUrl ?? envConfig.SERVICE_URL;
@@ -123,7 +136,10 @@ export async function searchTools(options) {
             const rawSkills = responseData.content.skills;
             const installedSkills = getInstalledSkills();
             const formattedData = formatSkillData(rawSkills, installedSkills);
-            const candidateTools = formattedData.filter((tool) => (tool.rrfScore ?? 0) >= 0.016);
+            const excludedSKills = buildExcludedSkillIds(configExcludedSkills);
+            const candidateTools = formattedData
+                .filter((skills) => !excludedSKills.has(skills.skillId))
+                .filter((tool) => (tool.rrfScore ?? 0) >= 0.016);
             logger.log(`${PLUGIN_LOG_PREFIX} [DEBUG] Candidates with rrfScore >= 0.016: ${candidateTools.length}, details: ${candidateTools.map((t) => `${t.skillId}(rrfScore=${t.rrfScore}, status=${t.status})`).join(", ")}`);
             const hasInstalledInCandidates = candidateTools.some((tool) => tool.status === "已安装");
             if (hasInstalledInCandidates) {

package/dist/src/skill-retriever/types.d.ts

@@ -7,6 +7,7 @@ export interface ToolRetrieverConfig {
     apiKey?: string;
     uid?: string;
     timeoutMs?: number;
+    excludedSkills?: string[];
 }
 export interface RawSkill {
     skillId: string;

package/dist/src/tools/device-tool-map.js

@@ -18,12 +18,6 @@ const DEVICE_TOOL_POLICY = {
             "send_html_card"
         ],
     },
-    "pad": {
-        allowlist: false,
-        tools: [
-            "xiaoyi_gui_agent"
-        ],
-    },
     "web": {
         allowlist: true,
         tools: [

package/dist/src/tools/hmos-cli.d.ts

@@ -0,0 +1,103 @@
+import type { SessionContext } from "./session-manager.js";
+export interface CLIDefinition {
+    name: string;
+    version?: string;
+    description: string;
+    executeSide?: "device" | "cloud" | "local";
+    requirePermissions?: string[];
+    inputSchema?: CLIInputSchema;
+    outputSchema?: CLIOutputSchema;
+}
+export interface CLIInputSchema {
+    properties?: Record<string, CLIPropertyDef>;
+    required?: string[];
+}
+export interface CLIPropertyDef {
+    type: "string" | "number" | "boolean" | "array";
+    description?: string;
+    default?: unknown;
+}
+export interface CLIOutputSchema {
+    type: "object";
+    properties: Record<string, unknown>;
+}
+interface CLICacheEntry {
+    cliName: string;
+    definition: CLIDefinition;
+    filePath: string;
+    mtimeMs: number;
+}
+export interface ParsedCLIArgs {
+    toolName: string;
+    subcommand: string;
+    args: Record<string, unknown>;
+}
+declare function parseSkillName(skillDir: string): string | null;
+export declare function extractCLINames(content: string): string[] | null;
+export interface CLICache {
+    getCLIs(skillName: string): CLICacheEntry[] | null;
+    getCLI(skillName: string, cliName: string): CLICacheEntry | null;
+    hasCLI(skillName: string, cliName: string): boolean;
+    refresh(): Promise<void>;
+    getRootDir(): string;
+}
+export declare function getCLICache(rootDir?: string): CLICache;
+/**
+ * Parse and validate a command string against a CLI definition.
+ * Returns typed ParsedCLIArgs ready for ExecuteCLI assembly.
+ */
+export declare function parseAndValidate(command: string, cliDef: CLIDefinition): ParsedCLIArgs;
+export interface CLIExecuteResult {
+    content: Array<{
+        type: "text";
+        text: string;
+    }>;
+    details: unknown;
+    isError?: boolean;
+}
+/**
+ * Execute a CLI command via WebSocket:
+ * 1. Acquire CLI serial lock (per session)
+ * 2. Send FunctionExecute/ExecuteCLI
+ * 3. Wait for FunctionExecute/ExecuteCLIRsp (via cli-response event)
+ * 4. Return result or error
+ */
+export declare function executeCLI(parsed: ParsedCLIArgs, sessionCtx: SessionContext, toolCallId: string): Promise<CLIExecuteResult>;
+export declare function cliErrorToResult(err: unknown): CLIExecuteResult;
+export { parseSkillName as deriveSkillName };
+interface BeforeToolCallEvent {
+    toolName: string;
+    params: Record<string, unknown>;
+    toolCallId: string;
+    runId?: string;
+}
+interface HookContext {
+    sessionKey?: string;
+    sessionId?: string;
+    workspaceDir?: string;
+    agentId?: string;
+}
+interface HookResult {
+    noop?: boolean;
+    block?: boolean;
+    blockReason?: string;
+    requireApproval?: {
+        title: string;
+        description: string;
+    };
+}
+/**
+ * before_tool_call hook for CLI exec interception.
+ *
+ * Only handles built-in `exec` calls whose command prefix matches a CLI
+ * declared in the current skill's metadata.clis + available_clis.json.
+ * Non-matching commands return undefined (noop) so native exec handles them.
+ */
+export declare function cliBeforeToolCallHandler(event: BeforeToolCallEvent, ctx: HookContext): Promise<HookResult | undefined>;
+/**
+ * Register the CLI hook on the OpenClaw plugin API.
+ * Call during `registrationMode === "full"` in the plugin entry point.
+ */
+export declare function registerCLIHook(api: {
+    on: (event: string, handler: (...args: any[]) => any) => void;
+}): void;