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

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import { definePluginEntry } from "openclaw/plugin-sdk/core";
-declare const pluginEntry: ReturnType<typeof definePluginEntry>;
-export default pluginEntry;
+import { type OpenClawPluginDefinition } from "openclaw/plugin-sdk/core";
+declare const plugin: OpenClawPluginDefinition;
+export default plugin;

package/dist/index.js

@@ -1,5 +1,6 @@
 import { definePluginEntry } from "openclaw/plugin-sdk/core";
 import { xiaoyiProvider } from "./src/provider.js";
+import { xiaoyiCompactionProvider } from "./src/compaction-provider.js";
 import { xyPlugin } from "./src/channel.js";
 import registerSentinelHook from "./src/cspl/sentinel_hook.js";
 import { setXYRuntime } from "./src/runtime.js";
@@ -11,7 +12,9 @@ import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
 import { registerCLIHook } from "./src/tools/hmos-cli.js";
+import { recoverCronState } from "./src/cron-recovery.js";
 import { writeSkillUsage } from "./src/utils/skills-logger.js";
+import { logger } from "./src/utils/logger.js";
 /**
  * Parse a file path string to detect if it refers to a SKILL.md file within
  * a skills directory. Returns the skill name (parent directory) if so.
@@ -205,6 +208,72 @@ function readJobIdFromResult(result) {
     }
     return undefined;
 }
+// ── Gateway startup: cron state recovery ────────────────────────────────────
+/**
+ * Register the gateway_start hook for cron state recovery.
+ *
+ * On gateway startup, checks .openclaw/cron/ for legacy JSON/JSONL files
+ * and migrates them into the SQLite state database:
+ *  - Reads legacy jobs.json + jobs-state.json → imports into cron_jobs table
+ *  - Reads legacy runs/*.jsonl → imports into cron_run_logs table
+ *  - Archives migrated files with .migrated suffix
+ *
+ * Pattern follows legacy-store-migration.ts and legacy-run-log-migration.ts:
+ * check → load → import into SQLite → archive old files.
+ */
+function registerCronRecoveryHook(api) {
+    api.on("gateway_start", async (_event, _ctx) => {
+        const logTag = "[CRON-RECOVERY-HOOK]";
+        const startTime = Date.now();
+        logger.log(`${logTag} ═══════════════════════════════════════════`);
+        logger.log(`${logTag} gateway_start fired — checking for legacy cron files`);
+        logger.log(`${logTag} Timestamp: ${new Date().toISOString()}`);
+        logger.log(`${logTag} Plugin registration mode: ${api.registrationMode ?? "unknown"}`);
+        let result;
+        try {
+            result = await recoverCronState();
+        }
+        catch (err) {
+            const errMsg = err instanceof Error ? err.message : String(err);
+            const errStack = err instanceof Error ? err.stack : undefined;
+            logger.error(`${logTag} cron state recovery threw: ${errMsg}`);
+            if (errStack)
+                logger.error(`${logTag} Stack: ${errStack}`);
+            // Don't let a recovery failure block gateway startup.
+            logger.log(`${logTag} Recovery failed after ${Date.now() - startTime}ms — gateway startup continues`);
+            return;
+        }
+        const elapsed = Date.now() - startTime;
+        if (result.recovered) {
+            logger.log(`${logTag} ✅ Migration performed successfully in ${elapsed}ms:` +
+                ` storeMigrated=${result.storeMigrated}, ` +
+                ` runLogFilesImported=${result.runLogFilesImported}`);
+        }
+        else {
+            logger.log(`${logTag} ℹ️ No legacy cron files migrated in ${elapsed}ms ` +
+                `(nothing to migrate or database unavailable)`);
+        }
+        // Log diagnostics summary
+        const warnings = result.diagnostics.filter((d) => d.includes("skipping") || d.includes("locked") || d.includes("unavailable"));
+        const errors = result.diagnostics.filter((d) => d.includes("error") || d.includes("failed") || d.includes("Failed"));
+        if (warnings.length > 0) {
+            logger.warn(`${logTag} ${warnings.length} warning(s) from migration:`);
+            for (const w of warnings) {
+                logger.warn(`${logTag}   ⚠ ${w}`);
+            }
+        }
+        if (errors.length > 0) {
+            logger.error(`${logTag} ${errors.length} error(s) from migration:`);
+            for (const e of errors) {
+                logger.error(`${logTag}   ✗ ${e}`);
+            }
+        }
+        if (warnings.length === 0 && errors.length === 0) {
+            logger.log(`${logTag} All diagnostics clean, no warnings or errors`);
+        }
+        logger.log(`${logTag} ═══════════════════════════════════════════`);
+    });
+}
 function registerFullHooks(api) {
     // SKILL RETRIEVER HOOK: before_prompt_build hook
     const pluginConfig = api.pluginConfig || {};
@@ -216,10 +285,13 @@ function registerFullHooks(api) {
         timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
     });
     const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
-    api.on("before_prompt_build", beforePromptBuildHandler);
+    api.on("before_prompt_build", async (event, ctx) => {
+        logger.log(`[BEFORE_PROMPT_BUILD] hook fired, sessionKey=${ctx.sessionKey || "undefined"}, sessionId=${ctx.sessionId || "undefined"}`);
+        return beforePromptBuildHandler(event, ctx);
+    });
     registerSelfEvolutionToolResultNudge(api);
 }
-const pluginEntry = definePluginEntry({
+const plugin = definePluginEntry({
     id: "xiaoyi-channel",
     name: "Xiaoyi Channel",
     description: "Xiaoyi channel plugin - Xiaoyi A2A protocol integration",
@@ -227,6 +299,10 @@ const pluginEntry = definePluginEntry({
         // Always register the provider so wrapStreamFn/prepareExtraParams work
         // in ALL registration modes (not just "full").
         api.registerProvider(xiaoyiProvider);
+        // Register the compaction provider so openclaw's safeguard hook uses
+        // our summarization path (which injects x-hag-trace-id) instead of the
+        // built-in LLM path that bypasses wrapStreamFn.
+        api.registerCompactionProvider(xiaoyiCompactionProvider);
         if (api.registrationMode === "cli-metadata") {
             return;
         }
@@ -248,9 +324,11 @@ const pluginEntry = definePluginEntry({
             registerCronDetectionHook(api);
             // CLI exec hook: intercepts built-in exec for HarmonyOS CLI skill tools
             registerCLIHook(api);
+            // Cron recovery hook: prunes stale cron-push-map and pushData on gateway startup
+            registerCronRecoveryHook(api);
             // Skills diagnostic hook: log skill usage (detected via SKILL.md reads)
             registerSkillsDiagnosticHook(api);
         }
     },
 });
-export default pluginEntry;
+export default plugin;

package/dist/src/bot.js

@@ -15,6 +15,7 @@ import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
 import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { toolCallNudgeManager } from "./utils/tool-call-nudge-manager.js";
 import { setCsplSteerContext } from "./cspl/steer-context.js";
+import { resolveActiveEmbeddedRunSessionId, queueAgentHarnessMessage, } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { registerTaskId, decrementTaskIdRef, hasActiveTask, } from "./task-manager.js";
 import { logger } from "./utils/logger.js";
 /**
@@ -299,6 +300,30 @@ export async function handleXYMessage(params) {
             textForAgent = `${textForAgent}${fileHint}`;
             log.log(`[BOT] Steer: appended file paths to text`);
         }
+        // 🔑 Direct steer: bypass dispatchReplyFromConfig entirely and inject the
+        // message directly into the active embedded agent run. This avoids the
+        // per-session ReplyOperation lock in admitReplyTurn which would otherwise
+        // block the steer message until the first message completes — making steer
+        // indistinguishable from a followup.
+        if (isUpdate && !skipReg && route.sessionKey) {
+            const activeSessionId = resolveActiveEmbeddedRunSessionId(route.sessionKey);
+            if (activeSessionId) {
+                log.log(`[BOT-STEER] Direct steer attempt: activeSessionId=${activeSessionId}, textLen=${textForAgent.length}`);
+                const queued = queueAgentHarnessMessage(activeSessionId, textForAgent, {
+                    steeringMode: "all",
+                });
+                if (queued) {
+                    log.log(`[BOT-STEER] Direct steer succeeded — message injected into active run`);
+                    // Steer message taskId refCount is no longer needed since we skip the dispatcher.
+                    decrementTaskIdRef(parsed.sessionId);
+                    return;
+                }
+                log.log(`[BOT-STEER] Direct steer failed (queued=false), falling through to dispatchReplyFromConfig`);
+            }
+            else {
+                log.log(`[BOT-STEER] No active embedded run session for key=${route.sessionKey}, falling through to dispatchReplyFromConfig`);
+            }
+        }
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
@@ -314,12 +339,20 @@ export async function handleXYMessage(params) {
             envelope: envelopeOptions,
             body: messageBody,
         });
+        // 🔑 Steer messages use /steer prefix + CommandSource "native" to trigger
+        // the native slash command fast path, which calls handleSteerCommand →
+        // queueEmbeddedAgentMessageWithOutcomeAsync before admitReplyTurn blocks.
+        const steerCommandBody = isUpdate ? `/steer ${textForAgent}` : textForAgent;
+        if (isUpdate) {
+            log.log(`[BOT-STEER] Dispatching via /steer fast path, sessionKey=${route.sessionKey}, cmdLen=${steerCommandBody.length}`);
+        }
         // ✅ Finalize inbound context (following feishu pattern)
         // Use route.accountId and route.sessionKey instead of parsed fields
         const ctxPayload = core.channel.reply.finalizeInboundContext({
             Body: body,
-            RawBody: textForAgent,
-            CommandBody: textForAgent,
+            RawBody: steerCommandBody,
+            CommandBody: steerCommandBody,
+            ...(isUpdate ? { CommandSource: "native" } : {}),
             From: parsed.sessionId,
             To: parsed.sessionId, // ✅ Simplified: use sessionId as target (context is managed by SessionKey)
             SessionKey: route.sessionKey, // ✅ Use route.sessionKey
@@ -343,7 +376,7 @@ export async function handleXYMessage(params) {
         // response and cleanup — the first message's dispatcher handles those.
         const steerState = { steered: isUpdate };
         // 🔑 创建dispatcher
-        log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
+        log.log(`[BOT-DISPATCHER] Creating reply dispatcher, isSteer=${isUpdate}, sessionKey=${route.sessionKey}`);
         // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
         let cleaned = false;
         const cleanup = () => {
@@ -406,8 +439,9 @@ export async function handleXYMessage(params) {
                 // signal init complete to release the global dispatch gate
                 // for the next session.
                 const dispatchPromise = runWithSessionContext(sessionContext, async () => {
-                    log.log(`[ALS-PROOF] bot entered dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=false`);
-                    log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}`);
+                    const isSteerDispatch = isUpdate && !skipReg;
+                    log.log(`[ALS-PROOF] bot entered dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=${isSteerDispatch}`);
+                    log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}, isSteer=${isSteerDispatch}`);
                     try {
                         const result = await core.channel.reply.dispatchReplyFromConfig({
                             ctx: ctxPayload,
@@ -415,7 +449,13 @@ export async function handleXYMessage(params) {
                             dispatcher,
                             replyOptions,
                         });
-                        log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, result=${JSON.stringify(result)}`);
+                        // 区分 steer 成功（undefined）和 steer 失败/正常 run（有结果）
+                        if (result === undefined) {
+                            log.log(`[BOT-STEER] dispatchReplyFromConfig returned undefined — steer injected via fast path OK, sessionKey=${route.sessionKey}`);
+                        }
+                        else {
+                            log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, resultType=${typeof result}, isSteer=${isSteerDispatch}, steered=${steerState.steered}`);
+                        }
                         return result;
                     }
                     catch (dispatchErr) {

package/dist/src/compaction-provider.d.ts

@@ -0,0 +1,50 @@
+interface CompactionConfig {
+    uid: string;
+    baseUrl: string;
+    modelName: string;
+    apiKey?: string;
+}
+/**
+ * Snapshot of the resolved session context, captured from the last normal
+ * LLM request before compaction is triggered. When available, the
+ * CompactionProvider reuses the same A2A traceId/sessionId so the
+ * compaction summarization request is linked to the same user session
+ * in backend tracing.
+ */
+interface CompactionSessionSnapshot {
+    traceId: string;
+    sessionId: string;
+    interactionId: string;
+    deviceType?: string;
+    appVer?: string;
+    sdkApiVersion?: string;
+    /** Auth headers from options.headers in the last normal request. */
+    requestHeaders?: Record<string, string>;
+    /** API key from the last normal request (for Bearer token auth). */
+    apiKey?: string;
+    /** Model-level headers from resolveDynamicModel (streamSimple adds these). */
+    modelHeaders?: Record<string, string>;
+}
+/** Store config captured from prepareExtraParams so summarize() can read it. */
+export declare function setCompactionConfig(config: CompactionConfig | null): void;
+/**
+ * Store a snapshot of the resolved session headers captured from the
+ * most recent wrapStreamFn call. This lets the CompactionProvider reuse
+ * the A2A traceId/sessionId during compaction summarization.
+ */
+export declare function setCompactionSessionSnapshot(snapshot: CompactionSessionSnapshot | null): void;
+export declare const xiaoyiCompactionProvider: {
+    id: string;
+    label: string;
+    summarize(params: {
+        messages: unknown[];
+        signal?: AbortSignal;
+        customInstructions?: string;
+        summarizationInstructions?: {
+            identifierPolicy?: string;
+            identifierInstructions?: string;
+        };
+        previousSummary?: string;
+    }): Promise<string>;
+};
+export {};

package/dist/src/compaction-provider.js

@@ -0,0 +1,202 @@
+/**
+ * CompactionProvider for xiaoyi-channel.
+ *
+ * During compaction, the safeguard's built-in summarization path
+ * (summarizeInStages -> generateSummary -> completeSimple) bypasses the
+ * plugin's wrapStreamFn, so x-hag-trace-id is never injected. Registering
+ * a CompactionProvider intercepts the safeguard before it reaches the LLM
+ * path and makes the summarization API call ourselves with proper headers.
+ */
+import { createHash } from "crypto";
+import { logger } from "./utils/logger.js";
+// ── Header constants (mirrors provider.ts) ────────────────────────
+const HEADER_TRACE_ID = "x-hag-trace-id";
+const HEADER_SESSION_ID = "x-session-id";
+const HEADER_INTERACTION_ID = "x-interaction-id";
+// ── Summarization prompt ──────────────────────────────────────────
+const SUMMARIZATION_SYSTEM_PROMPT = "You are a structured conversation summarization assistant. " +
+    "Produce a concise summary that preserves key facts, decisions, " +
+    "in-progress tasks, tool results, and the latest user intent.";
+let storedConfig = null;
+let storedSessionSnapshot = null;
+/** Store config captured from prepareExtraParams so summarize() can read it. */
+export function setCompactionConfig(config) {
+    storedConfig = config;
+    if (config) {
+        logger.log(`[compaction-provider] config stored uid=${config.uid.slice(0, 8)}... ` +
+            `baseUrl=${config.baseUrl} model=${config.modelName}`);
+    }
+    else {
+        logger.warn("[compaction-provider] config cleared (uid or baseUrl missing)");
+    }
+}
+/**
+ * Store a snapshot of the resolved session headers captured from the
+ * most recent wrapStreamFn call. This lets the CompactionProvider reuse
+ * the A2A traceId/sessionId during compaction summarization.
+ */
+export function setCompactionSessionSnapshot(snapshot) {
+    storedSessionSnapshot = snapshot;
+}
+// ── Helpers ───────────────────────────────────────────────────────
+function encodeUid(uid) {
+    return createHash("sha256").update(uid).digest("hex").slice(0, 32);
+}
+function extractMessageText(content) {
+    if (typeof content === "string")
+        return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((block) => {
+            if (block && typeof block === "object" && block.type === "text") {
+                return String(block.text ?? "");
+            }
+            return "";
+        })
+            .filter(Boolean)
+            .join("\n");
+    }
+    return "";
+}
+function formatMessagesForSummarization(messages) {
+    const lines = [];
+    for (const msg of messages) {
+        if (!msg || typeof msg !== "object")
+            continue;
+        const m = msg;
+        if (m.role === "custom")
+            continue; // skip internal runtime messages
+        const role = String(m.role ?? "unknown");
+        const text = extractMessageText(m.content).trim();
+        if (!text)
+            continue;
+        let label;
+        if (role === "assistant") {
+            label = "Assistant";
+        }
+        else if (role === "user") {
+            label = "User";
+        }
+        else if (role === "toolResult") {
+            const toolName = typeof m.toolName === "string" && m.toolName ? m.toolName : "tool";
+            label = `Tool result (${toolName})`;
+        }
+        else {
+            label = role;
+        }
+        lines.push(`[${label}]: ${text}`);
+    }
+    return lines.join("\n\n");
+}
+// ── CompactionProvider ────────────────────────────────────────────
+export const xiaoyiCompactionProvider = {
+    id: "xiaoyiprovider",
+    label: "Xiaoyi Compaction Provider",
+    async summarize(params) {
+        const cfg = storedConfig;
+        if (!cfg) {
+            // No stored config: let the safeguard fall through to the LLM path.
+            // Throwing here is intentional — tryProviderSummarize catches and
+            // falls through.
+            throw new Error("Compaction config not available (uid or baseUrl missing)");
+        }
+        // Use the A2A session snapshot when available (captured from the last
+        // normal wrapStreamFn call before compaction was triggered). Otherwise
+        // fall back to the uid_timestamp pattern.
+        const session = storedSessionSnapshot;
+        const traceId = session?.traceId ?? `${encodeUid(cfg.uid)}_${Date.now()}`;
+        const sessionId = session?.sessionId ?? traceId;
+        const interactionId = session?.interactionId ?? traceId;
+        logger.log(`[compaction-provider] summarize traceId=${traceId} source=${session ? "a2a-snapshot" : "uid-fallback"} msgCount=${params.messages.length}`);
+        // ── Build prompt ──────────────────────────────────────────────
+        const conversationText = formatMessagesForSummarization(params.messages);
+        let promptText = `<conversation>\n${conversationText}\n</conversation>`;
+        if (params.previousSummary) {
+            promptText += `\n\n<previous-summary>\n${params.previousSummary}\n</previous-summary>`;
+        }
+        let instructions = "Provide a concise but comprehensive summary of the conversation above. " +
+            "Include: key decisions, in-progress tasks, tool results, file operations, " +
+            "and the latest user request. Preserve exact file paths, URLs, identifiers, " +
+            "and error messages.";
+        if (params.customInstructions) {
+            instructions += `\n\nAdditional focus: ${params.customInstructions}`;
+        }
+        promptText += `\n\n${instructions}`;
+        // ── Build request ─────────────────────────────────────────────
+        // Reconstruct the exact same headers that the normal request uses.
+        // streamSimple adds model.headers to the HTTP request directly, so
+        // we capture them separately from options.headers.
+        const reqHdrs = session?.requestHeaders;
+        const modelHdrs = session?.modelHeaders;
+        const reqKeys = reqHdrs ? Object.keys(reqHdrs) : [];
+        const modelKeys = modelHdrs ? Object.keys(modelHdrs) : [];
+        logger.log(`[compaction-provider] snapshot auth: hasApiKey=${!!session?.apiKey} ` +
+            `requestHeaders=[${reqKeys.join(",")}] modelHeaders=[${modelKeys.join(",")}]`);
+        const headers = {
+            "Content-Type": "application/json",
+            ...modelHdrs,
+            ...reqHdrs,
+            ...(session?.apiKey ? { Authorization: `Bearer ${session.apiKey}` } : {}),
+            [HEADER_TRACE_ID]: traceId,
+            [HEADER_SESSION_ID]: sessionId,
+            [HEADER_INTERACTION_ID]: interactionId,
+        };
+        if (session?.deviceType) {
+            headers["x-device-type"] = session.deviceType;
+        }
+        if (session?.appVer) {
+            headers["x-app-ver"] = session.appVer;
+        }
+        if (session?.sdkApiVersion) {
+            headers["x-sdk-api-version"] = session.sdkApiVersion;
+        }
+        const body = {
+            model: cfg.modelName,
+            messages: [
+                { role: "system", content: SUMMARIZATION_SYSTEM_PROMPT },
+                { role: "user", content: promptText },
+            ],
+            max_tokens: 4096,
+            temperature: 0.3,
+        };
+        const url = `${cfg.baseUrl.replace(/\/+$/, "")}/chat/completions`;
+        // Log headers for diagnostics (redact sensitive values)
+        const safeHeaders = {};
+        for (const [key, value] of Object.entries(headers)) {
+            if (key.toLowerCase().includes("auth") || key.toLowerCase().includes("api-key")) {
+                safeHeaders[key] = value ? `${value.slice(0, 4)}***` : "(empty)";
+            }
+            else {
+                safeHeaders[key] = value;
+            }
+        }
+        logger.log(`[compaction-provider] POST ${url} headers=${JSON.stringify(safeHeaders)}`);
+        // ── Call ──────────────────────────────────────────────────────
+        let response;
+        try {
+            response = await fetch(url, {
+                method: "POST",
+                headers,
+                body: JSON.stringify(body),
+                signal: params.signal,
+            });
+        }
+        catch (err) {
+            logger.error(`[compaction-provider] fetch failed: ${String(err)}`);
+            throw err;
+        }
+        if (!response.ok) {
+            const errorText = await response.text().catch(() => "");
+            logger.error(`[compaction-provider] API error status=${response.status} body=${errorText.slice(0, 500)}`);
+            throw new Error(`Compaction API returned ${response.status}`);
+        }
+        const data = (await response.json());
+        const summary = data.choices?.[0]?.message?.content;
+        if (!summary?.trim()) {
+            logger.warn("[compaction-provider] empty summary returned");
+            throw new Error("Empty summary from compaction API");
+        }
+        logger.log(`[compaction-provider] done summaryLen=${summary.length}`);
+        return summary;
+    },
+};

package/dist/src/cron-query-handler.d.ts

@@ -1,3 +1,23 @@
+export interface CronRunLogEntry {
+    jobId: string;
+    ts: number;
+    runId?: string;
+    status?: string;
+    error?: string;
+    summary?: string;
+    diagnosticsSummary?: string;
+    deliveryStatus?: string;
+    deliveryError?: string;
+    delivered?: boolean;
+    sessionId?: string;
+    sessionKey?: string;
+    runAtMs?: number;
+    durationMs?: number;
+    nextRunAtMs?: number;
+    model?: string;
+    provider?: string;
+    totalTokens?: number;
+}
 /**
  * Handle a cron-query-event.
  *