@ynhcj/xiaoyi-channel 0.0.214-next → 0.0.215-next

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

@@ -18,6 +18,12 @@ interface CompactionSessionSnapshot {
     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;

package/dist/src/compaction-provider.js

@@ -123,8 +123,20 @@ export const xiaoyiCompactionProvider = {
         }
         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,
@@ -138,9 +150,6 @@ export const xiaoyiCompactionProvider = {
         if (session?.sdkApiVersion) {
             headers["x-sdk-api-version"] = session.sdkApiVersion;
         }
-        if (cfg.apiKey) {
-            headers["Authorization"] = `Bearer ${cfg.apiKey}`;
-        }
         const body = {
             model: cfg.modelName,
             messages: [
@@ -151,7 +160,17 @@ export const xiaoyiCompactionProvider = {
             temperature: 0.3,
         };
         const url = `${cfg.baseUrl.replace(/\/+$/, "")}/chat/completions`;
-        logger.log(`[compaction-provider] POST ${url}`);
+        // 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 {

package/dist/src/cron-query-handler.js

@@ -110,7 +110,38 @@ export async function handleCronQueryEvent(context, cfg) {
             // ── list ──────────────────────────────────────────────────────
             case "list": {
                 const gatewayParams = buildListParams(params);
-                const gatewayResult = await callGatewayTool("cron.list", { timeoutMs: GATEWAY_TIMEOUT_MS }, gatewayParams);
+                let gatewayResult = await callGatewayTool("cron.list", { timeoutMs: GATEWAY_TIMEOUT_MS }, gatewayParams);
+                // Scan for systemEvent jobs and migrate them to agentTurn
+                // Skip main-session jobs — gateway requires payload.kind="systemEvent" for those
+                const jobs = gatewayResult?.jobs ?? [];
+                const systemEventJobs = jobs.filter((j) => j?.payload?.kind === "systemEvent");
+                if (systemEventJobs.length > 0) {
+                    log.log(`[CRON-QUERY] list: found ${systemEventJobs.length} systemEvent jobs, migrating to agentTurn`);
+                    for (const job of systemEventJobs) {
+                        const updatePatch = {
+                            sessionTarget: "isolated",
+                            description: job.payload?.text ?? job.payload?.message ?? "",
+                            payload: {
+                                kind: "agentTurn",
+                                message: job.payload?.text ?? job.payload?.message ?? "",
+                            },
+                            delivery: {
+                                channel: "xiaoyi-channel",
+                                mode: "announce",
+                                to: "default"
+                            }
+                        };
+                        try {
+                            await callGatewayTool("cron.update", { timeoutMs: GATEWAY_TIMEOUT_MS }, { id: job.id, patch: updatePatch });
+                            log.log(`[CRON-QUERY] list: migrated job ${job.id} (${job.name ?? ""}) from systemEvent → agentTurn`);
+                        }
+                        catch (err) {
+                            log.warn(`[CRON-QUERY] list: failed to migrate job ${job.id}:`, err);
+                        }
+                    }
+                    // Re-fetch list after migration
+                    gatewayResult = await callGatewayTool("cron.list", { timeoutMs: GATEWAY_TIMEOUT_MS }, gatewayParams);
+                }
                 result = transformListResponse(gatewayResult, params);
                 break;
             }
@@ -255,8 +286,7 @@ function buildUpdateParams(jobId, params) {
     const patch = params?.patch ?? params ?? {};
     return {
         id: jobId,
-        patch,
-        description: patch?.payload?.message,
+        patch
     };
 }
 // ============================================================================
@@ -300,6 +330,7 @@ function transformAddResponse(gatewayResult) {
         id: gatewayResult?.id,
         name: gatewayResult?.name,
         enabled: gatewayResult?.enabled,
+        description: gatewayResult?.payload?.message,
         createdAtMs: gatewayResult?.createdAtMs,
         updatedAtMs: gatewayResult?.updatedAtMs,
         schedule: gatewayResult?.schedule,
@@ -376,32 +407,23 @@ async function persistCronPushMap(sessionId, result) {
 async function queryTimeListFromGateway(params) {
     // Fetch from local runs folder and gateway RPC in parallel
     const [localEntries, rpcResult] = await Promise.all([
-        readAllLocalRunLogs().catch((err) => {
-            logger.error(`[CRON-QUERY] readAllLocalRunLogs failed:`, err);
-            return [];
-        }),
+        readAllLocalRunLogs().catch(() => []),
         callGatewayTool("cron.runs", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
             scope: "all",
             limit: 200,
             sortDir: "desc",
             ...(params ?? {}),
-        }).catch((err) => {
-            logger.error(`[CRON-QUERY] gateway cron.runs RPC failed:`, err);
-            return { entries: [] };
-        }),
+        }).catch(() => ({ entries: [] })),
     ]);
     const gatewayEntries = rpcResult?.entries ?? [];
-    logger.log(`[CRON-QUERY] queryTimeList: local=${localEntries.length}, gateway=${gatewayEntries.length}`);
     // Merge and deduplicate
     const merged = mergeAndDedupeRunEntries(localEntries, gatewayEntries);
-    logger.log(`[CRON-QUERY] queryTimeList: merged=${merged.length} (after dedup)`);
     if (merged.length === 0) {
         return [];
     }
     // Filter to last 7 days
     const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
     const recent = merged.filter((e) => e.ts && e.ts >= sevenDaysAgo);
-    logger.log(`[CRON-QUERY] queryTimeList: recent=${recent.length} (within 7 days, threshold=${new Date(sevenDaysAgo).toISOString()})`);
     // Ensure .name is populated (gateway returns jobName; normalize to .name)
     for (const run of recent) {
         if (!run.name && run.jobName) {
@@ -479,7 +501,6 @@ function extractJobIdFromRunLogName(name) {
  * may have renamed the file to .jsonl.migrated.
  */
 async function readLocalRunLogsForJob(jobId) {
-    logger.log(`[CRON-QUERY] readLocalRunLogsForJob: jobId=${jobId}, dir=${LEGACY_CRON_RUNS_DIR}`);
     // Try active file first, then archived variants
     const candidates = [
         `${jobId}.jsonl`,
@@ -490,13 +511,11 @@ async function readLocalRunLogsForJob(jobId) {
         try {
             const raw = await fsp.readFile(filePath, "utf-8");
             if (raw.trim()) {
-                const parsed = parseCronRunLogEntriesFromJsonl(raw, { jobId });
-                logger.log(`[CRON-QUERY] readLocalRunLogsForJob: found ${candidate}, bytes=${raw.length}, entries=${parsed.length}`);
-                return parsed;
+                return parseCronRunLogEntriesFromJsonl(raw, { jobId });
             }
         }
         catch {
-            logger.log(`[CRON-QUERY] readLocalRunLogsForJob: ${candidate} not found`);
+            // Try next candidate
         }
     }
     // Also scan for .migrated.N variants
@@ -508,9 +527,7 @@ async function readLocalRunLogsForJob(jobId) {
                 try {
                     const raw = await fsp.readFile(path.join(LEGACY_CRON_RUNS_DIR, entry.name), "utf-8");
                     if (raw.trim()) {
-                        const parsed = parseCronRunLogEntriesFromJsonl(raw, { jobId });
-                        logger.log(`[CRON-QUERY] readLocalRunLogsForJob: found ${entry.name}, entries=${parsed.length}`);
-                        return parsed;
+                        return parseCronRunLogEntriesFromJsonl(raw, { jobId });
                     }
                 }
                 catch {
@@ -522,7 +539,6 @@ async function readLocalRunLogsForJob(jobId) {
     catch {
         // Directory listing failed, give up
     }
-    logger.log(`[CRON-QUERY] readLocalRunLogsForJob: no local run-log files found for jobId=${jobId}`);
     return [];
 }
 /**
@@ -533,29 +549,23 @@ async function readLocalRunLogsForJob(jobId) {
  */
 async function readAllLocalRunLogs() {
     try {
-        logger.log(`[CRON-QUERY] readAllLocalRunLogs: scanning ${LEGACY_CRON_RUNS_DIR}`);
         const entries = await fsp.readdir(LEGACY_CRON_RUNS_DIR, { withFileTypes: true });
         const runLogFiles = entries.filter((e) => e.isFile() && isRunLogFile(e.name));
-        logger.log(`[CRON-QUERY] readAllLocalRunLogs: total dir entries=${entries.length}, runLogFiles=${runLogFiles.length}` +
-            (runLogFiles.length > 0 ? ` files=[${runLogFiles.map(f => f.name).join(", ")}]` : ""));
         const allEntries = [];
         for (const file of runLogFiles) {
             const jobId = extractJobIdFromRunLogName(file.name);
             try {
                 const raw = await fsp.readFile(path.join(LEGACY_CRON_RUNS_DIR, file.name), "utf-8");
                 const parsed = parseCronRunLogEntriesFromJsonl(raw, { jobId });
-                logger.log(`[CRON-QUERY] readAllLocalRunLogs: file=${file.name} jobId=${jobId} bytes=${raw.length} entries=${parsed.length}`);
                 allEntries.push(...parsed);
             }
-            catch (err) {
-                logger.warn(`[CRON-QUERY] readAllLocalRunLogs: failed to read ${file.name}:`, err);
+            catch {
+                // Skip unreadable files
             }
         }
-        logger.log(`[CRON-QUERY] readAllLocalRunLogs: total local entries=${allEntries.length}`);
         return allEntries;
     }
-    catch (err) {
-        logger.warn(`[CRON-QUERY] readAllLocalRunLogs: failed to scan runs dir:`, err);
+    catch {
         return [];
     }
 }

package/dist/src/provider.js

@@ -606,6 +606,16 @@ export const xiaoyiProvider = {
                     logger.log(`[ALS-PROOF] provider headers source=uid-fallback (ALS miss)`);
                 }
             }
+            // Mutate model.headers so the LLM compaction path picks up trace context.
+            // The LLM path (summarizeViaLLM → summarizeInStages) bypasses wrapStreamFn
+            // but reuses the same model object, so mutating model.headers here ensures
+            // x-hag-trace-id et al are forwarded even when the custom compaction
+            // provider is not reached (e.g. queued compaction with different sessionManager).
+            if (model?.headers && dynamicHeaders[HEADER_TRACE_ID]) {
+                model.headers[HEADER_TRACE_ID] = dynamicHeaders[HEADER_TRACE_ID];
+                model.headers[HEADER_SESSION_ID] = dynamicHeaders[HEADER_SESSION_ID];
+                model.headers[HEADER_INTERACTION_ID] = dynamicHeaders[HEADER_INTERACTION_ID];
+            }
             // 记录输入
             logger.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
             if (context.systemPrompt) {
@@ -628,9 +638,32 @@ export const xiaoyiProvider = {
             // During compaction, getCurrentSessionContext() returns null because
             // compaction runs outside the original A2A async scope. By storing
             // the snapshot from the last normal request, the CompactionProvider
-            // can reuse the same A2A traceId/sessionId/devicetype in its
-            // summarization API call.
+            // can reuse the same A2A traceId/sessionId/devicetype and auth
+            // headers in its summarization API call.
             if (dynamicHeaders[HEADER_TRACE_ID]) {
+                const requestHeaders = {};
+                if (options?.headers) {
+                    for (const [key, value] of Object.entries(options.headers)) {
+                        if (typeof value === "string") {
+                            requestHeaders[key] = value;
+                        }
+                    }
+                }
+                // model.headers comes from resolveDynamicModel — streamSimple
+                // reads these directly when building the HTTP request.
+                const modelHeaders = {};
+                if (model?.headers) {
+                    for (const [key, value] of Object.entries(model.headers)) {
+                        if (typeof value === "string") {
+                            modelHeaders[key] = value;
+                        }
+                    }
+                }
+                const apiKey = typeof options?.apiKey === "string" ? options.apiKey : undefined;
+                logger.log(`[compaction-provider] capturing snapshot: hasApiKey=${!!apiKey} ` +
+                    `requestHeaders=[${Object.keys(requestHeaders).join(",")}] ` +
+                    `modelHeaders=[${Object.keys(modelHeaders).join(",")}] ` +
+                    `traceId=${dynamicHeaders[HEADER_TRACE_ID]}`);
                 setCompactionSessionSnapshot({
                     traceId: dynamicHeaders[HEADER_TRACE_ID] ?? "",
                     sessionId: dynamicHeaders[HEADER_SESSION_ID] ?? "",
@@ -638,6 +671,9 @@ export const xiaoyiProvider = {
                     deviceType: deviceType ?? undefined,
                     appVer: appVer ?? undefined,
                     sdkApiVersion: sdkApiVersion ?? undefined,
+                    requestHeaders: Object.keys(requestHeaders).length > 0 ? requestHeaders : undefined,
+                    modelHeaders: Object.keys(modelHeaders).length > 0 ? modelHeaders : undefined,
+                    apiKey: apiKey ?? undefined,
                 });
             }
             // 在发送给模型前，优化 systemPrompt 结构

package/dist/src/tools/call-phone-tool.d.ts

@@ -16,7 +16,6 @@ export declare const callPhoneTool: {
             slotId: {
                 type: string;
                 description: string;
-                default: number;
             };
         };
         required: string[];

package/dist/src/tools/call-phone-tool.js

@@ -9,7 +9,7 @@ import { logger } from "../utils/logger.js";
 export const callPhoneTool = {
     name: "call_phone",
     label: "Call Phone",
-    description: "拨打电话。需要提供要拨打的电话号码。slotId参数可选，默认为0（主卡），如果用户明确要求使用副卡则设置为1。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。",
+    description: "拨打电话。需要提供要拨打的电话号码。slotId参数可选，如果用户明确指定为主卡为0（主卡），如果用户明确要求使用副卡则设置为1，如果用户没有指定使用哪张卡，则此参数不填。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。",
     parameters: {
         type: "object",
         properties: {
@@ -19,8 +19,7 @@ export const callPhoneTool = {
             },
             slotId: {
                 type: "number",
-                description: "SIM卡槽ID，默认为0（主卡），设置为1表示副卡。仅当用户明确要求使用副卡时才设置为1",
-                default: 0,
+                description: "SIM卡槽ID，仅当用户明确指定主卡/副卡时才设置，否则不传",
             },
         },
         required: ["phoneNumber"],
@@ -32,10 +31,8 @@ export const callPhoneTool = {
         if (!params.phoneNumber || typeof params.phoneNumber !== "string" || params.phoneNumber.trim() === "") {
             throw new Error("Missing required parameter: phoneNumber must be a non-empty string");
         }
-        // Set default slotId if not provided
-        const slotId = params.slotId !== undefined && params.slotId !== null ? params.slotId : 0;
-        // Validate slotId (must be 0 or 1)
-        if (slotId !== 0 && slotId !== 1) {
+        // Validate slotId if provided (must be 0 or 1)
+        if (params.slotId !== undefined && params.slotId !== null && params.slotId !== 0 && params.slotId !== 1) {
             throw new Error("Invalid slotId: must be 0 (primary SIM) or 1 (secondary SIM)");
         }
         // Get WebSocket manager
@@ -58,7 +55,7 @@ export const callPhoneTool = {
                     timeOut: 5,
                     intentParam: {
                         phoneNumber: params.phoneNumber.trim(),
-                        slotId: slotId,
+                        ...(params.slotId !== undefined && params.slotId !== null ? { slotId: params.slotId } : {}),
                     },
                     permissionId: [],
                     achieveType: "INTENT",

package/package.json

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