@xgjktech/xg_cwork_im 1.19.42 → 1.19.43

package/dist/src/progress-display.js

@@ -0,0 +1,420 @@
+/** 用户可见的任务进度展示：把 OpenClaw 原始 hook 事件翻译成产品化文案。 */
+const WS_DISPLAY_TEXT_MAX = 200;
+const WS_PROGRESS_SUMMARY_MAX = 200;
+const TOOL_LABEL_ZH = {
+    exec: "命令执行",
+    read: "读取文件",
+    read_file: "读取文件",
+    write: "写入文件",
+    write_file: "写入文件",
+    write_to_file: "写入文件",
+    edit: "编辑文件",
+    replace_file_content: "编辑文件",
+    multi_replace_file_content: "编辑文件",
+    grep: "内容搜索",
+    glob_file_search: "文件搜索",
+    memory_search: "记忆检索",
+    sessions_list: "会话列表",
+    sessions_history: "会话历史",
+    xg_cwork_im_get_group_chat_history: "群聊历史",
+    pdf: "PDF解析",
+    web_search: "网页搜索",
+    google_search: "网页搜索",
+    fetch_webpage: "网页读取",
+    browse: "网页浏览",
+};
+function clipWsDisplayText(text, max = WS_DISPLAY_TEXT_MAX) {
+    const t = text.trim();
+    if (!t)
+        return "";
+    if (t.length <= max)
+        return t;
+    return `${t.slice(0, Math.max(0, max - 1))}…`;
+}
+function clipWsProgressSummary(text, max = WS_PROGRESS_SUMMARY_MAX) {
+    const t = text.trim().replace(/\r\n/g, "\n").replace(/\n+/g, " ");
+    if (!t)
+        return "";
+    if (t.length <= max)
+        return t;
+    return `${t.slice(0, Math.max(0, max - 1))}…`;
+}
+function firstStringField(args, keys) {
+    for (const k of keys) {
+        const v = args[k];
+        if (typeof v === "string" && v.trim().length > 0)
+            return v.trim();
+    }
+    return undefined;
+}
+function friendlyToolLabel(raw, simplify = false) {
+    const k = raw.trim();
+    if (!k)
+        return "工具";
+    if (simplify) {
+        if (k === "exec")
+            return "数据处理";
+        if (k === "process")
+            return "数据分析";
+    }
+    return TOOL_LABEL_ZH[k] ?? k;
+}
+function getFriendlyFileType(fileName) {
+    const clean = fileName.trim();
+    if (clean.endsWith("/") || clean.endsWith("\\") || (!clean.includes(".") && clean !== "")) {
+        return "目录";
+    }
+    const lower = clean.toLowerCase();
+    const ext = lower.includes(".") ? lower.split(".").pop() : "";
+    if (ext === "docx" || ext === "doc")
+        return "Word 文档";
+    if (ext === "xlsx" || ext === "xls")
+        return "Excel 表格";
+    if (ext === "pptx" || ext === "ppt")
+        return "PPT 幻灯片";
+    if (ext === "pdf")
+        return "PDF 文档";
+    if (ext === "zip" || ext === "rar" || ext === "tar" || ext === "gz")
+        return "压缩文件";
+    if (ext === "md" || ext === "markdown")
+        return "Markdown 文档";
+    if (ext === "txt")
+        return "文本文件";
+    if (ext === "csv")
+        return "CSV 数据表";
+    return "文件";
+}
+function commandIncludesAny(clean, needles) {
+    return needles.some((needle) => clean.includes(needle));
+}
+function getFriendlyCommandDescription(cmd) {
+    const clean = cmd.trim();
+    const lower = clean.toLowerCase();
+    if (!clean)
+        return "正在进行数据分析与处理…";
+    if (commandIncludesAny(lower, ["matplotlib", "seaborn", "plt.", "plot(", "chart("])) {
+        return "正在生成数据分析可视化图表…";
+    }
+    if (commandIncludesAny(lower, ["pandas", "pd.", "openpyxl", "load_workbook", ".csv", "csv."])) {
+        return "正在分析和处理数据表格…";
+    }
+    if (commandIncludesAny(lower, ["docx", "document("])) {
+        return "正在提取 Word 文档内容…";
+    }
+    if (commandIncludesAny(lower, ["pdfplumber", "pypdf"]) || /\bpdf\b/.test(lower)) {
+        return "正在提取 PDF 文档内容…";
+    }
+    if (lower.startsWith("curl ") || lower.startsWith("wget ") || commandIncludesAny(lower, ["requests.", "urllib"])) {
+        return "正在获取远程网络数据…";
+    }
+    if (commandIncludesAny(lower, ["zipfile", "unzip", "tar ", "gzip"])) {
+        return "正在解压缩或打包文件数据…";
+    }
+    if (lower.startsWith("git ") || lower.includes(" git ")) {
+        if (lower.includes(" commit"))
+            return "正在提交本地代码变更";
+        if (lower.includes(" push"))
+            return "正在将本地代码推送到远程仓库";
+        if (lower.includes(" status"))
+            return "正在检查 Git 仓库状态";
+        if (lower.includes(" diff"))
+            return "正在生成代码差异对比";
+        if (lower.includes(" log"))
+            return "正在获取 Git 提交历史记录";
+        if (lower.includes(" add"))
+            return "正在暂存文件变更";
+        if (lower.includes(" pull") || lower.includes(" fetch"))
+            return "正在拉取远程仓库最新代码";
+        if (lower.includes(" clone"))
+            return "正在克隆远程代码仓库";
+        if (lower.includes(" checkout") || lower.includes(" switch"))
+            return "正在切换 Git 分支";
+        if (lower.includes(" branch"))
+            return "正在查看 Git 分支清单";
+        return "正在执行 Git 仓库操作";
+    }
+    if (lower.includes("pip install") || lower.includes("pip3 install")) {
+        const pkgMatch = clean.match(/install\s+(?:--user\s+)?([a-zA-Z0-9_\-\[\]]+)/);
+        return pkgMatch ? `正在准备运行环境：安装依赖包「${pkgMatch[1]}」…` : "正在准备所需的运行环境…";
+    }
+    if (commandIncludesAny(lower, ["npm install", "pnpm install", "yarn install", "pnpm i ", "npm i "])) {
+        return "正在准备所需的运行环境…";
+    }
+    if (commandIncludesAny(lower, ["npm run build", "pnpm build", "yarn build"])) {
+        return "正在编译构建项目代码";
+    }
+    if (lower.includes("npm run ") || lower.startsWith("npm ") || lower.startsWith("pnpm ") || lower.startsWith("yarn ")) {
+        return "正在运行项目开发命令";
+    }
+    if (lower.startsWith("find ") || lower.includes(" find ") || lower.startsWith("grep ") || lower.includes(" grep ")) {
+        return "正在检索匹配的文本内容…";
+    }
+    if (lower.startsWith("ls ") || lower === "ls" || lower.includes(" ls ")) {
+        return "正在读取目录文件列表";
+    }
+    if (lower.includes("import ") || lower.includes("from ")) {
+        if (lower.includes("sys.path") || lower.includes("import sys"))
+            return "正在检测系统运行环境";
+        if (commandIncludesAny(lower, ["import docx", "import openpyxl", "import pdfplumber", "import zipfile"])) {
+            if (lower.includes("try:") || clean.length < 100)
+                return "正在检测文档解析器依赖性";
+        }
+        return "正在通过 Python 执行数据提取与转换";
+    }
+    if (lower.startsWith("cat ") || lower.includes(" cat "))
+        return "正在读取文件原始文本";
+    if (lower.startsWith("rm ") || lower.includes(" rm "))
+        return "正在清理临时缓存文件";
+    if (lower.startsWith("mkdir ") || lower.includes(" mkdir "))
+        return "正在创建目录结构";
+    if (lower.startsWith("cp ") || lower.includes(" cp ") || lower.startsWith("mv ") || lower.includes(" mv ")) {
+        return "正在移动或备份文件";
+    }
+    return "正在进行数据分析与处理…";
+}
+function buildToolStartSummary(toolRaw, args, simplify = false) {
+    if (!args || typeof args !== "object")
+        return undefined;
+    if (simplify) {
+        if (toolRaw === "exec") {
+            const cmd = typeof args.command === "string" ? args.command.trim() : "";
+            if (!cmd)
+                return undefined;
+            const cdRegex = /^cd\s+("[^"]*"|'[^']*'|[^\s&;]+)\s*(&&|;)\s*/;
+            const cleanCmd = cmd.replace(cdRegex, "").trim();
+            if (cleanCmd.includes("dws_agent.py auth status") ||
+                cleanCmd.includes("get_device_auth_link.py") ||
+                cleanCmd.includes("install.sh")) {
+                return undefined;
+            }
+            const fileMatch = cleanCmd.match(/([^'"]+?\.(?:docx|doc|xlsx|xls|pptx|ppt|pdf|zip|md|markdown|txt|csv))/i);
+            if (fileMatch) {
+                const matchedPath = fileMatch[1];
+                const fileName = matchedPath.split(/[/\\]/).pop() || "";
+                const cleanName = fileName.endsWith("…") ? fileName.slice(0, -1) : fileName;
+                const fileType = getFriendlyFileType(cleanName);
+                if (fileType !== "目录" && fileType !== "文件" && cleanName.includes(".")) {
+                    return `正在解析 ${fileType}「${cleanName}」`;
+                }
+            }
+            return getFriendlyCommandDescription(cleanCmd);
+        }
+        if (toolRaw === "read" || toolRaw === "read_file") {
+            const targetPath = firstStringField(args, ["TargetFile", "target_file", "path", "file_path"]);
+            if (targetPath) {
+                const fileName = targetPath.split(/[/\\]/).pop() || "";
+                return `正在读取 ${getFriendlyFileType(fileName)}「${fileName}」`;
+            }
+        }
+        const isWrite = toolRaw === "write" || toolRaw === "write_file" || toolRaw === "write_to_file";
+        const isEdit = toolRaw === "edit" || toolRaw === "replace_file_content" || toolRaw === "multi_replace_file_content";
+        if (isWrite || isEdit) {
+            const targetPath = firstStringField(args, ["TargetFile", "target_file", "path", "file_path"]);
+            if (targetPath) {
+                const fileName = targetPath.split(/[/\\]/).pop() || "";
+                const actionText = isWrite ? "保存" : "编辑";
+                return `正在${actionText} ${getFriendlyFileType(fileName)}「${fileName}」`;
+            }
+        }
+        if (toolRaw.includes("get_group_chat_history"))
+            return "正在获取群聊历史记录";
+        return undefined;
+    }
+    if (toolRaw === "exec") {
+        const cmd = typeof args.command === "string" ? args.command.replace(/\s+/g, " ").trim() : "";
+        const wdRaw = typeof args.workdir === "string" ? args.workdir.trim() : "";
+        const wd = wdRaw ? wdRaw.replace(/\\/g, "/") : "";
+        if (!cmd && !wd)
+            return undefined;
+        const head = cmd ? `run ${cmd}` : "run";
+        return clipWsProgressSummary(wd ? `${head} (in ${wd})` : head);
+    }
+    if (toolRaw === "read" || toolRaw === "read_file") {
+        const targetPath = firstStringField(args, ["TargetFile", "target_file", "path", "file_path"]);
+        if (targetPath)
+            return clipWsProgressSummary(targetPath.replace(/\\/g, "/"));
+    }
+    const isWrite = toolRaw === "write" || toolRaw === "write_file" || toolRaw === "write_to_file";
+    const isEdit = toolRaw === "edit" || toolRaw === "replace_file_content" || toolRaw === "multi_replace_file_content";
+    if (isWrite || isEdit) {
+        const targetPath = firstStringField(args, ["TargetFile", "target_file", "path", "file_path"]);
+        if (targetPath)
+            return clipWsProgressSummary(targetPath.replace(/\\/g, "/"));
+    }
+    if (toolRaw.includes("get_group_chat_history")) {
+        const gid = firstStringField(args, ["groupId", "group_id"]);
+        const lim = typeof args.limit === "number" ? args.limit : undefined;
+        const bits = [];
+        if (gid)
+            bits.push(`group=${gid}`);
+        if (lim != null)
+            bits.push(`limit=${lim}`);
+        if (bits.length > 0)
+            return clipWsProgressSummary(bits.join(", "));
+    }
+    const hint = firstStringField(args, ["query", "prompt", "url", "command"]) ??
+        (typeof args.tool === "string" ? args.tool : undefined);
+    if (hint && toolRaw !== "exec")
+        return clipWsProgressSummary(hint.replace(/\\/g, "/"));
+    return undefined;
+}
+function toolResultOutputSummary(payload) {
+    const body = (payload.markdown ?? payload.text ?? "").trim();
+    return body ? clipWsProgressSummary(body) : undefined;
+}
+function isTerminalCommandEvent(payload) {
+    const phase = typeof payload.phase === "string" ? payload.phase.toLowerCase() : "";
+    if (phase === "delta" || phase === "stream" || phase === "progress")
+        return false;
+    const status = typeof payload.status === "string" ? payload.status.toLowerCase() : "";
+    return (["completed", "complete", "done", "end", "failed", "fail", "error"].includes(phase) ||
+        ["completed", "failed", "error", "done"].includes(status) ||
+        payload.exitCode != null);
+}
+function isFailedCommandEvent(payload) {
+    const phase = typeof payload.phase === "string" ? payload.phase.toLowerCase() : "";
+    const status = typeof payload.status === "string" ? payload.status.toLowerCase() : "";
+    return phase === "failed" || phase === "fail" || phase === "error" || status === "failed" || status === "error" || (payload.exitCode != null && payload.exitCode !== 0);
+}
+export function createProgressDisplayController(options) {
+    const { simplify, stream } = options;
+    const toolNameStack = [];
+    let hasSentPlanUpdate = false;
+    let lastSentDisplayText = "";
+    async function send(message) {
+        const displayText = clipWsDisplayText(message.displayText);
+        if (!displayText)
+            return;
+        if (simplify && displayText === lastSentDisplayText)
+            return;
+        lastSentDisplayText = displayText;
+        await stream({
+            event: message.event,
+            displayText,
+            ...(message.summary?.trim() ? { summary: clipWsProgressSummary(message.summary) } : {}),
+        });
+    }
+    return {
+        async onToolStart(payload) {
+            const name = typeof payload.name === "string" && payload.name.trim().length > 0 ? payload.name.trim() : "tool";
+            const rawPhase = typeof payload.phase === "string" ? payload.phase.toLowerCase() : "";
+            if (rawPhase === "update" || rawPhase === "delta" || rawPhase === "progress")
+                return;
+            if (rawPhase === "end" || rawPhase === "fail" || rawPhase === "error")
+                return;
+            if (!rawPhase || rawPhase === "start")
+                toolNameStack.push(name);
+            if (simplify) {
+                const displayText = buildToolStartSummary(name, payload.args, true) ??
+                    (name === "exec"
+                        ? "正在进行数据分析与处理…"
+                        : name === "read" || name === "read_file"
+                            ? "正在读取文件内容…"
+                            : name === "write" || name === "write_file"
+                                ? "正在保存文件内容…"
+                                : name === "grep"
+                                    ? "正在检索相关文本信息…"
+                                    : name === "glob_file_search"
+                                        ? "正在搜索相关文件…"
+                                        : name === "memory_search"
+                                            ? "正在检索关联背景知识…"
+                                            : name === "pdf"
+                                                ? "正在解析 PDF 文档…"
+                                                : name === "web_search" || name === "google_search"
+                                                    ? "正在搜索网页相关资料…"
+                                                    : name === "fetch_webpage" || name === "browse"
+                                                        ? "正在读取网页内容…"
+                                                        : name.includes("get_group_chat_history")
+                                                            ? "正在获取群聊历史记录…"
+                                                            : `正在执行「${friendlyToolLabel(name, true)}」操作…`);
+                await send({ event: "TOOL_PHASE", displayText });
+                return;
+            }
+            await send({
+                event: "TOOL_PHASE",
+                displayText: `正在调用「${friendlyToolLabel(name, false)}」工具…`,
+                summary: buildToolStartSummary(name, payload.args, false),
+            });
+        },
+        async onToolResult(payload) {
+            const toolName = toolNameStack.length > 0 ? toolNameStack.pop() : "tool";
+            if (simplify) {
+                if (payload.isError) {
+                    await send({
+                        event: "TOOL_PHASE",
+                        displayText: "处理遇到一点问题，正在调整方式…",
+                    });
+                }
+                return;
+            }
+            const label = friendlyToolLabel(toolName, false);
+            await send({
+                event: "TOOL_PHASE",
+                displayText: payload.isError ? `「${label}」工具处理失败` : `「${label}」工具已完成`,
+                summary: toolResultOutputSummary(payload),
+            });
+        },
+        async onPlanUpdate(payload) {
+            if (simplify) {
+                if (!hasSentPlanUpdate) {
+                    hasSentPlanUpdate = true;
+                    await send({ event: "PLAN_UPDATE", displayText: "正在规划任务执行步骤…" });
+                }
+                return;
+            }
+            const title = typeof payload.title === "string" ? payload.title.trim() : "";
+            if (title.length > 0) {
+                await send({
+                    event: "PLAN_UPDATE",
+                    displayText: `正在更新计划：${title}`,
+                    summary: typeof payload.explanation === "string" ? payload.explanation.trim() : undefined,
+                });
+                return;
+            }
+            if (typeof payload.explanation === "string" && payload.explanation.trim().length > 0) {
+                await send({ event: "PLAN_UPDATE", displayText: `计划更新：${payload.explanation.trim()}` });
+                return;
+            }
+            await send({ event: "PLAN_UPDATE", displayText: "正在更新执行计划…" });
+        },
+        async onCompactionStart() {
+            if (!simplify)
+                await send({ event: "RUN_EVENT", displayText: "正在整理上下文…" });
+        },
+        async onCompactionEnd() {
+            if (!simplify)
+                await send({ event: "RUN_EVENT", displayText: "上下文整理完成" });
+        },
+        async onApprovalEvent(payload) {
+            const raw = typeof payload.title === "string" && payload.title.trim().length > 0
+                ? payload.title.trim()
+                : typeof payload.message === "string" && payload.message.trim().length > 0
+                    ? payload.message.trim()
+                    : "审批状态更新";
+            await send({ event: "RUN_EVENT", displayText: raw });
+        },
+        async onCommandOutput(payload) {
+            if (!isTerminalCommandEvent(payload))
+                return;
+            if (simplify) {
+                if (isFailedCommandEvent(payload)) {
+                    await send({ event: "RUN_EVENT", displayText: "处理遇到一点问题，正在调整方式…" });
+                }
+                return;
+            }
+            const outRaw = typeof payload.output === "string" ? payload.output.trim() : "";
+            const summary = outRaw ? clipWsProgressSummary(outRaw) : undefined;
+            if (isFailedCommandEvent(payload)) {
+                const exitText = payload.exitCode != null && payload.exitCode !== 0 ? `（退出码 ${payload.exitCode}）` : "";
+                await send({ event: "RUN_EVENT", displayText: `命令执行失败${exitText}`, summary });
+                return;
+            }
+            await send({ event: "RUN_EVENT", displayText: "命令已执行完毕", summary });
+        },
+        async onPatchSummary() {
+            if (!simplify)
+                await send({ event: "RUN_EVENT", displayText: "已记录文件变更摘要" });
+        },
+    };
+}
+//# sourceMappingURL=progress-display.js.map

package/dist/src/progress-display.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress-display.js","sourceRoot":"","sources":["../../src/progress-display.ts"],"names":[],"mappings":"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"}

package/dist/src/register-per-message-model-hook.d.ts

@@ -1,14 +1,6 @@
 /**
- * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
- *
- * 守卫语义（两层）：
- * 1. 只作用于本轮 run 的「首次模型解析」；同一 runId 的后续调用（模型 fallback 重试）不再覆盖，
- *    避免把降级候选改回主模型。
- * 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源（冷却中的原模型）时，
- *    静默放弃覆盖，尊重 OpenClaw 的自动降级选择。
- *
- * 取后即删：无论命中与否，首个候选钩子就消费本次单轮覆盖，避免残留到下一轮消息。
+ * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型，优先于 session autoFallback 探测。
  */
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
 export declare function registerPerMessageModelHook(api: OpenClawPluginApi): void;
 //# sourceMappingURL=register-per-message-model-hook.d.ts.map

package/dist/src/register-per-message-model-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAOnF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAgDxE"}
+{"version":3,"file":"register-per-message-model-hook.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAyBxE"}

package/dist/src/register-per-message-model-hook.js

@@ -1,47 +1,21 @@
 /**
- * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
- *
- * 守卫语义（两层）：
- * 1. 只作用于本轮 run 的「首次模型解析」；同一 runId 的后续调用（模型 fallback 重试）不再覆盖，
- *    避免把降级候选改回主模型。
- * 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源（冷却中的原模型）时，
- *    静默放弃覆盖，尊重 OpenClaw 的自动降级选择。
- *
- * 取后即删：无论命中与否，首个候选钩子就消费本次单轮覆盖，避免残留到下一轮消息。
+ * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型，优先于 session autoFallback 探测。
  */
-import { claimPerMessageModelRun, shouldSkipOverrideForActiveFallback, takePendingPerMessageModel, } from "./per-message-model-pending.js";
+import { takePendingPerMessageModel } from "./per-message-model-pending.js";
 export function registerPerMessageModelHook(api) {
     api.on("before_model_resolve", async (_event, ctx) => {
         const pending = takePendingPerMessageModel(ctx.sessionKey);
-        if (!pending) {
+        if (!pending)
             return;
-        }
-        const ctxProvider = ctx.modelProviderId?.trim() ?? "";
-        const ctxModel = ctx.modelId?.trim() ?? "";
-        const runId = ctx.runId?.trim() ?? "";
-        if (!claimPerMessageModelRun(runId)) {
-            api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=skip-fallback-retry ` +
-                `session=${ctx.sessionKey} runId=${runId} ` +
-                `candidate=${ctxProvider}/${ctxModel} pending=${pending.raw}`);
-            return;
-        }
-        if (shouldSkipOverrideForActiveFallback(pending)) {
-            api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=skip-active-fallback ` +
-                `session=${ctx.sessionKey} runId=${runId} ` +
-                `candidate=${ctxProvider}/${ctxModel} pending=${pending.raw} ` +
-                `fallbackOrigin=${pending.fallbackOrigin?.provider ?? ""}/${pending.fallbackOrigin?.model ?? ""}`);
-            return;
-        }
-        api.logger.info(`[xg_cwork_im] [model] before_model_resolve hookDecision=apply ` +
-            `session=${ctx.sessionKey} runId=${runId} ` +
-            `candidate=${ctxProvider}/${ctxModel} ` +
-            `provider=${pending.provider ?? ""} model=${pending.model}`);
         if (pending.provider) {
+            api.logger.info(`[xg_cwork_im] [model] before_model_resolve session=${ctx.sessionKey} ` +
+                `provider=${pending.provider} model=${pending.model}`);
             return {
                 providerOverride: pending.provider,
                 modelOverride: pending.model,
             };
         }
+        api.logger.info(`[xg_cwork_im] [model] before_model_resolve session=${ctx.sessionKey} model=${pending.raw}`);
         return { modelOverride: pending.raw };
     }, { priority: 100 });
 }

package/dist/src/register-per-message-model-hook.js.map

@@ -1 +1 @@
-{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EACH,uBAAuB,EACvB,mCAAmC,EACnC,0BAA0B,GAC7B,MAAM,gCAAgC,CAAC;AAExC,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CACF,sBAAsB,EACtB,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAClB,MAAM,OAAO,GAAG,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACX,OAAO;QACX,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAEtC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,8EAA8E;gBAC1E,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;gBAC3C,aAAa,WAAW,IAAI,QAAQ,YAAY,OAAO,CAAC,GAAG,EAAE,CACpE,CAAC;YACF,OAAO;QACX,CAAC;QAED,IAAI,mCAAmC,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,+EAA+E;gBAC3E,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;gBAC3C,aAAa,WAAW,IAAI,QAAQ,YAAY,OAAO,CAAC,GAAG,GAAG;gBAC9D,kBAAkB,OAAO,CAAC,cAAc,EAAE,QAAQ,IAAI,EAAE,IAAI,OAAO,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE,EAAE,CACxG,CAAC;YACF,OAAO;QACX,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,gEAAgE;YAC5D,WAAW,GAAG,CAAC,UAAU,UAAU,KAAK,GAAG;YAC3C,aAAa,WAAW,IAAI,QAAQ,GAAG;YACvC,YAAY,OAAO,CAAC,QAAQ,IAAI,EAAE,UAAU,OAAO,CAAC,KAAK,EAAE,CAClE,CAAC;QACF,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,OAAO;gBACH,gBAAgB,EAAE,OAAO,CAAC,QAAQ;gBAClC,aAAa,EAAE,OAAO,CAAC,KAAK;aAC/B,CAAC;QACN,CAAC;QACD,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1C,CAAC,EACD,EAAE,QAAQ,EAAE,GAAG,EAAE,CACpB,CAAC;AACN,CAAC"}
+{"version":3,"file":"register-per-message-model-hook.js","sourceRoot":"","sources":["../../src/register-per-message-model-hook.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CACF,sBAAsB,EACtB,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QAClB,MAAM,OAAO,GAAG,0BAA0B,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACnB,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,sDAAsD,GAAG,CAAC,UAAU,GAAG;gBACnE,YAAY,OAAO,CAAC,QAAQ,UAAU,OAAO,CAAC,KAAK,EAAE,CAC5D,CAAC;YACF,OAAO;gBACH,gBAAgB,EAAE,OAAO,CAAC,QAAQ;gBAClC,aAAa,EAAE,OAAO,CAAC,KAAK;aAC/B,CAAC;QACN,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,IAAI,CACX,sDAAsD,GAAG,CAAC,UAAU,UAAU,OAAO,CAAC,GAAG,EAAE,CAC9F,CAAC;QACF,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1C,CAAC,EACD,EAAE,QAAQ,EAAE,GAAG,EAAE,CACpB,CAAC;AACN,CAAC"}

package/dist/src/resolve-inbound-group-prompt.d.ts

@@ -1,7 +1,7 @@
 /**
  * 合并通道静态 systemPrompt、IM 下发的 userInfo 用户块与 agentContext 项目块。
  */
-import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+import type { OpenClawConfig } from "openclaw/plugin-sdk";
 import type { Log } from "./auth.js";
 import type { RobotMentionAgentContext } from "./agent-context-types.js";
 import type { XgImConfig } from "./types.js";
@@ -17,21 +17,5 @@ export interface ResolveInboundGroupSystemPromptArgs {
     log?: Log;
     logPrefix?: string;
 }
-export interface InboundGroupPromptParts {
-    /** 配置里的静态段（`channels.xg_cwork_im.systemPrompt` / `accounts.<id>.systemPrompt`）。 */
-    staticPart?: string;
-    /** 动态段：用户块（`userInfo.background`）+ 项目块（`agentContext`）。跨回合续轮缓存的就是它。 */
-    dynamicPart?: string;
-    /** 静态段 + 动态段，写入 OpenClaw 入站 `GroupSystemPrompt`。 */
-    combined?: string;
-}
-/**
- * 拆出静态段与动态段。
- *
- * `GroupSystemPrompt` 只在入站 @ 回合注入，heartbeat / exec 完成唤醒等自触发回合拿不到；
- * 调用方据此把 **dynamicPart** 缓存到会话级缓存，在续轮由 hook 补回（见 `session-group-prompt.ts`）。
- * 注意 `combined` 在配置了静态段时几乎不会为空，因此"最新一轮为空则清空"要以 `dynamicPart` 判定。
- */
-export declare function resolveInboundGroupPromptParts(args: ResolveInboundGroupSystemPromptArgs): InboundGroupPromptParts;
 export declare function resolveInboundGroupSystemPrompt(args: ResolveInboundGroupSystemPromptArgs): string | undefined;
 //# sourceMappingURL=resolve-inbound-group-prompt.d.ts.map

package/dist/src/resolve-inbound-group-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-inbound-group-prompt.d.ts","sourceRoot":"","sources":["../../src/resolve-inbound-group-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,mCAAmC;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAUD,MAAM,WAAW,uBAAuB;IACpC,mFAAmF;IACnF,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oDAAoD;IACpD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;GAMG;AACH,wBAAgB,8BAA8B,CAC1C,IAAI,EAAE,mCAAmC,GAC1C,uBAAuB,CAoDzB;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,mCAAmC,GAAG,MAAM,GAAG,SAAS,CAE7G"}
+{"version":3,"file":"resolve-inbound-group-prompt.d.ts","sourceRoot":"","sources":["../../src/resolve-inbound-group-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,mCAAmC;IAChD,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,UAAU,CAAC;IACnB,YAAY,CAAC,EAAE,wBAAwB,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAUD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,mCAAmC,GAAG,MAAM,GAAG,SAAS,CAgD7G"}

package/dist/src/resolve-inbound-group-prompt.js

@@ -10,14 +10,7 @@ function joinPromptParts(...parts) {
         .join("\n\n");
     return joined || undefined;
 }
-/**
- * 拆出静态段与动态段。
- *
- * `GroupSystemPrompt` 只在入站 @ 回合注入，heartbeat / exec 完成唤醒等自触发回合拿不到；
- * 调用方据此把 **dynamicPart** 缓存到会话级缓存，在续轮由 hook 补回（见 `session-group-prompt.ts`）。
- * 注意 `combined` 在配置了静态段时几乎不会为空，因此"最新一轮为空则清空"要以 `dynamicPart` 判定。
- */
-export function resolveInboundGroupPromptParts(args) {
+export function resolveInboundGroupSystemPrompt(args) {
     const { cfg, accountId, config, agentContext, senderId, senderName, senderBackground, workspaceHostRoot, log, logPrefix, } = args;
     const staticPart = resolveXgImGroupSystemPrompt(cfg, accountId);
     const userBlock = buildUserContextPromptBlock({
@@ -45,13 +38,6 @@ export function resolveInboundGroupPromptParts(args) {
     if (config.debug && built) {
         log?.info?.(`${logPrefix ?? ""} [agent-context] sandbox=${built.sandboxProjectPath ?? "?"} projectPromptLen=${projectBlock?.length ?? 0}`);
     }
-    return {
-        staticPart,
-        dynamicPart: joinPromptParts(userBlock, projectBlock),
-        combined: joinPromptParts(staticPart, userBlock, projectBlock),
-    };
-}
-export function resolveInboundGroupSystemPrompt(args) {
-    return resolveInboundGroupPromptParts(args).combined;
+    return joinPromptParts(staticPart, userBlock, projectBlock);
 }
 //# sourceMappingURL=resolve-inbound-group-prompt.js.map

package/dist/src/resolve-inbound-group-prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-inbound-group-prompt.js","sourceRoot":"","sources":["../../src/resolve-inbound-group-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAEtG,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAgBnE,SAAS,eAAe,CAAC,GAAG,KAAgC;IACxD,MAAM,MAAM,GAAG,KAAK;SACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;SAC3B,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/C,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,OAAO,MAAM,IAAI,SAAS,CAAC;AAC/B,CAAC;AAWD;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAC1C,IAAyC;IAEzC,MAAM,EACF,GAAG,EACH,SAAS,EACT,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,GAAG,EACH,SAAS,GACZ,GAAG,IAAI,CAAC;IAET,MAAM,UAAU,GAAG,4BAA4B,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,2BAA2B,CAAC;QAC1C,QAAQ;QACR,UAAU;QACV,gBAAgB;QAChB,MAAM;KACT,CAAC,CAAC;IAEH,IAAI,YAAgC,CAAC;IACrC,IAAI,KAAkE,CAAC;IAEvE,IAAI,YAAY,EAAE,CAAC;QACf,IAAI,CAAC;YACD,KAAK,GAAG,4BAA4B,CAAC;gBACjC,YAAY;gBACZ,MAAM;gBACN,iBAAiB;gBACjB,GAAG;aACN,CAAC,CAAC;YACH,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,EAAE,KAAK,EAAE,CACR,GAAG,SAAS,IAAI,EAAE,oDAAoD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACrH,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;QACxB,GAAG,EAAE,IAAI,EAAE,CACP,GAAG,SAAS,IAAI,EAAE,4BAA4B,KAAK,CAAC,kBAAkB,IAAI,GAAG,qBAAqB,YAAY,EAAE,MAAM,IAAI,CAAC,EAAE,CAChI,CAAC;IACN,CAAC;IAED,OAAO;QACH,UAAU;QACV,WAAW,EAAE,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC;QACrD,QAAQ,EAAE,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC;KACjE,CAAC;AACN,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,IAAyC;IACrF,OAAO,8BAA8B,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACzD,CAAC"}
+{"version":3,"file":"resolve-inbound-group-prompt.js","sourceRoot":"","sources":["../../src/resolve-inbound-group-prompt.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAEtG,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAgBnE,SAAS,eAAe,CAAC,GAAG,KAAgC;IACxD,MAAM,MAAM,GAAG,KAAK;SACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;SAC3B,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC/C,IAAI,CAAC,MAAM,CAAC,CAAC;IAClB,OAAO,MAAM,IAAI,SAAS,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,IAAyC;IACrF,MAAM,EACF,GAAG,EACH,SAAS,EACT,MAAM,EACN,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,GAAG,EACH,SAAS,GACZ,GAAG,IAAI,CAAC;IAET,MAAM,UAAU,GAAG,4BAA4B,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,2BAA2B,CAAC;QAC1C,QAAQ;QACR,UAAU;QACV,gBAAgB;QAChB,MAAM;KACT,CAAC,CAAC;IAEH,IAAI,YAAgC,CAAC;IACrC,IAAI,KAAkE,CAAC;IAEvE,IAAI,YAAY,EAAE,CAAC;QACf,IAAI,CAAC;YACD,KAAK,GAAG,4BAA4B,CAAC;gBACjC,YAAY;gBACZ,MAAM;gBACN,iBAAiB;gBACjB,GAAG;aACN,CAAC,CAAC;YACH,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,EAAE,KAAK,EAAE,CACR,GAAG,SAAS,IAAI,EAAE,oDAAoD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CACrH,CAAC;QACN,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;QACxB,GAAG,EAAE,IAAI,EAAE,CACP,GAAG,SAAS,IAAI,EAAE,4BAA4B,KAAK,CAAC,kBAAkB,IAAI,GAAG,qBAAqB,YAAY,EAAE,MAAM,IAAI,CAAC,EAAE,CAChI,CAAC;IACN,CAAC;IAED,OAAO,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;AAChE,CAAC"}

package/dist/src/run-usage-session.d.ts

@@ -1,11 +1,8 @@
 /**
  * 从 OpenClaw session store 读取本轮结束后的用量 entry。
  * 使用 `skipCache: true`，避免读到 dispatch 前的缓存快照。
- *
- * entry 缺 `model` / `contextTokens` 时（preserveRuntimeModel 场景），用 `llm_output`
- * 缓存的「生效模型 + 有效上下文预算」兜底，保证前端用量圆环有分母。
  */
-import { type SessionUsageFields } from "./run-usage.js";
+import type { SessionUsageFields } from "./run-usage.js";
 export declare function readSessionUsageFields(args: {
     storePath: string;
     sessionKey: string;