@xgjktech/xg_cwork_im 1.19.22 → 1.19.23

package/dist/src/deliver-text.test.js

@@ -0,0 +1,117 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import { normalizeDeliverComparableText, shouldOmitDuplicateFileCaption, shouldSuppressDuplicateTextDeliver, stripMediaDirectiveLines, stripModelUsageFooter, } from "./deliver-text.js";
+// 生产 incident 回归：侯桐 2026-07-10 终态三连发（空行/footer 微差）
+const HOUTONG_BODY_LOOSE = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+
+我已经重新生成了一版**纯 Markdown 可读版**：
+
+- 不用 SVG
+- 不用 Mermaid
+- 不用图片
+- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
+
+这样在 IM 文件预览里也能直接看懂完整流程。
+
+新文件：
+
+-----`;
+const HOUTONG_BODY_TIGHT = `确实是这个问题：昨天那版虽然用了内嵌 SVG，但你现在的文档预览器没有把 SVG 正常渲染出来，所以流程看不到。
+我已经重新生成了一版**纯 Markdown 可读版**：
+- 不用 SVG
+- 不用 Mermaid
+- 不用图片
+- 全部用 Markdown 表格 + 文本流程图 + 状态表表达
+这样在 IM 文件预览里也能直接看懂完整流程。
+新文件：`;
+const HOUTONG_BODY_WITH_FOOTER = `${HOUTONG_BODY_TIGHT}
+
+_🟡 ↑111k ↓164 · 63%ctx · openai/gpt-5.5_`;
+describe("stripMediaDirectiveLines", () => {
+    it("removes MEDIA directive lines", () => {
+        const input = "文件在这里\nMEDIA:./xg-cwork-im/report.md\n";
+        assert.equal(stripMediaDirectiveLines(input), "文件在这里");
+    });
+    it("keeps usage footer in user-visible text (footer only stripped for dedup)", () => {
+        const withFooter = "正文\n\n_🟡 ↑111k ↓164 · 63%ctx · openai/gpt-5.5_";
+        assert.equal(stripMediaDirectiveLines(withFooter), withFooter);
+    });
+});
+describe("stripModelUsageFooter", () => {
+    it("removes emoji usage footer line", () => {
+        assert.equal(stripModelUsageFooter("正文\n\n_🟡 ↑111k ↓164 · 63%ctx · openai/gpt-5.5_"), "正文");
+    });
+    it("removes OpenClaw Usage: in/out line for comparable text", () => {
+        assert.equal(stripModelUsageFooter("正文\nUsage: 1.2k in / 89 out · est $0.01"), "正文");
+    });
+    it("removes OpenClaw 2026.6.9 full usage bar for comparable text", () => {
+        assert.equal(stripModelUsageFooter("正文\nopenai🤖 gpt5.5 | 📚 [⣿⣿⣿]272k ↕️ 1.2k/89 💰0.01"), "正文");
+    });
+});
+describe("normalizeDeliverComparableText", () => {
+    it("treats loose vs tight newlines as same (Houtong case)", () => {
+        assert.equal(normalizeDeliverComparableText(HOUTONG_BODY_LOOSE), normalizeDeliverComparableText(HOUTONG_BODY_TIGHT));
+    });
+    it("ignores emoji usage footer when comparing", () => {
+        assert.equal(normalizeDeliverComparableText(HOUTONG_BODY_TIGHT), normalizeDeliverComparableText(HOUTONG_BODY_WITH_FOOTER));
+    });
+    it("ignores Usage: line when comparing", () => {
+        assert.equal(normalizeDeliverComparableText("最终答复"), normalizeDeliverComparableText("最终答复\nUsage: 111k in / 164 out"));
+    });
+    it("ignores full usage bar when comparing", () => {
+        assert.equal(normalizeDeliverComparableText("最终答复"), normalizeDeliverComparableText("最终答复\nopenai🤖 gpt5.5 ↕️ 111k/164"));
+    });
+});
+describe("shouldSuppressDuplicateTextDeliver", () => {
+    it("suppresses duplicate text after file caption", () => {
+        assert.equal(shouldSuppressDuplicateTextDeliver({
+            textPart: "文件在这里",
+            hasMedia: false,
+            lastDeliveredText: "文件在这里",
+            lastDeliveredHadMedia: true,
+        }), true);
+    });
+    it("does not suppress when media present", () => {
+        assert.equal(shouldSuppressDuplicateTextDeliver({
+            textPart: "文件在这里",
+            hasMedia: true,
+            lastDeliveredText: "文件在这里",
+            lastDeliveredHadMedia: true,
+        }), false);
+    });
+    it("suppresses third pure-text burst after text+file (Houtong #5)", () => {
+        assert.equal(shouldSuppressDuplicateTextDeliver({
+            textPart: HOUTONG_BODY_TIGHT,
+            hasMedia: false,
+            lastDeliveredText: HOUTONG_BODY_WITH_FOOTER,
+            lastDeliveredHadMedia: true,
+        }), true);
+    });
+    it("does not suppress distinct tool-before progress", () => {
+        assert.equal(shouldSuppressDuplicateTextDeliver({
+            textPart: "我先读一下原文档",
+            hasMedia: false,
+            lastDeliveredText: HOUTONG_BODY_TIGHT,
+            lastDeliveredHadMedia: false,
+        }), false);
+    });
+});
+describe("shouldOmitDuplicateFileCaption", () => {
+    it("omits caption when same text was just sent as RICH_TEXT (#4 after #3)", () => {
+        assert.equal(shouldOmitDuplicateFileCaption({
+            textPart: HOUTONG_BODY_WITH_FOOTER,
+            hasMedia: true,
+            lastDeliveredText: HOUTONG_BODY_LOOSE,
+            lastDeliveredHadMedia: false,
+        }), true);
+    });
+    it("keeps caption when preceding text differed", () => {
+        assert.equal(shouldOmitDuplicateFileCaption({
+            textPart: HOUTONG_BODY_TIGHT,
+            hasMedia: true,
+            lastDeliveredText: "现在生成一个纯 Markdown 版本",
+            lastDeliveredHadMedia: false,
+        }), false);
+    });
+});
+//# sourceMappingURL=deliver-text.test.js.map

package/dist/src/deliver-text.test.js.map

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

package/dist/src/dispatch-mentioned-reply.d.ts

@@ -0,0 +1,47 @@
+/**
+ * @ 触发的单轮回复：WebSocket BEGIN、OpenClaw dispatchReplyWithBufferedBlockDispatcher、HTTP deliver、RUN_USAGE、FINISHED。
+ */
+import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+import type { ImStreamClient } from "./connection.js";
+import type { Logger } from "./channel-log.js";
+import { type InboundTrigger } from "./inbound-chat-type.js";
+import type { AutoRouteResult } from "./auto-model-router.js";
+import type { BotIdentity, WsMessageParams, XgImConfig } from "./types.js";
+import type { NasVolume } from "./agent-context-types.js";
+import { type InboundRecordFacts } from "./reply-dispatch-driver.js";
+/** 流式 BEGIN → dispatch → 可选 RUN_USAGE → 必发 FINISHED；首包超时仅日志（不对 IM 发超时话术） */
+export declare function dispatchMentionedReply(args: {
+    accountId: string;
+    rt: any;
+    cfg: OpenClawConfig;
+    config: XgImConfig;
+    log: Logger;
+    logPrefix: string;
+    route: {
+        sessionKey: string;
+        agentId: string;
+    };
+    inboundCtx: unknown;
+    params: WsMessageParams;
+    currentIdentity: BotIdentity;
+    streamClient: ImStreamClient;
+    /** Agent 在宿主机的 workspace 绝对路径，用于解析 /workspace/ 沙箱路径 */
+    agentWorkspaceDir?: string;
+    /** agentContext.nasVolumes；在 dispatch 前注入当前 session 的 Docker binds。 */
+    nasVolumes?: NasVolume[];
+    /** 单轮模型覆盖（msgContent.ext.ai_model → 登记 pending，由 before_model_resolve 消费） */
+    modelOverride?: string;
+    /** 单轮推理等级覆盖（Auto Router / 模型默认；用户显式 /think 时由入站侧置空） */
+    thinkingLevelOverride?: string;
+    /** Auto Router 结果元数据（仅日志/监控，不参与 dispatch 语义） */
+    autoRouteMeta?: AutoRouteResult;
+    /** 入站触发源（用户 / runtime continue 等） */
+    inboundTrigger?: InboundTrigger;
+    /** 严格匹配 `/stop` 的控制轮次：仍交给 OpenClaw fast-abort，但不创建 IM 流生命周期。 */
+    isStopControl?: boolean;
+    /** 已由调用方解析的 dispatch 驱动（official / legacy）；缺省按 config.dispatchDriver/auto 解析。 */
+    driver?: "official" | "legacy";
+    /** official 驱动下交给官方 turn 内部记录的会话事实；legacy 或缺失时忽略。 */
+    inboundRecord?: InboundRecordFacts;
+}): Promise<void>;
+//# sourceMappingURL=dispatch-mentioned-reply.d.ts.map

package/dist/src/dispatch-mentioned-reply.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dispatch-mentioned-reply.d.ts","sourceRoot":"","sources":["../../src/dispatch-mentioned-reply.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAA2C,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAqBtG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAyC9D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAmD,KAAK,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AA+BtH,4EAA4E;AAC5E,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,EAAE,EAAE,GAAG,CAAC;IACR,GAAG,EAAE,cAAc,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IACxB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,cAAc,CAAC;IAC7B,uDAAuD;IACvD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,uEAAuE;IACvE,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,gDAAgD;IAChD,aAAa,CAAC,EAAE,eAAe,CAAC;IAChC,qCAAqC;IACrC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,gEAAgE;IAChE,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,iFAAiF;IACjF,MAAM,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC/B,qDAAqD;IACrD,aAAa,CAAC,EAAE,kBAAkB,CAAC;CACtC,GAAG,OAAO,CAAC,IAAI,CAAC,CA0pChB"}