@xgjktech/xg_cwork_im 1.19.28 → 1.19.30

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

@@ -0,0 +1,208 @@
+import assert from "node:assert/strict";
+import { mkdtempSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { describe, it } from "node:test";
+import { clearAllPendingPerMessageModel, normalizeModelRefForCompare, resolveSessionFallbackContextFromEntry, setPendingPerMessageModel, shouldSkipOverrideForActiveFallback, splitModelRef, takePendingPerMessageModel, targetMatchesFallbackOrigin, } from "./per-message-model-pending.js";
+import { registerPerMessageModelHook } from "./register-per-message-model-hook.js";
+import { resolveSessionModelFallbackContext } from "./session-model-fallback.js";
+function fakeApi() {
+    const captured = [];
+    const logs = [];
+    const api = {
+        on: (name, handler, opts) => {
+            captured.push({ name, handler, opts });
+        },
+        logger: {
+            info: (...args) => {
+                logs.push(args.join(" "));
+            },
+        },
+    };
+    return { api, captured, logs };
+}
+describe("splitModelRef / normalizeModelRefForCompare", () => {
+    it("splits provider/model refs and normalizes case", () => {
+        const pending = splitModelRef(" openai/gpt-5.6-sol ");
+        assert.equal(pending.provider, "openai");
+        assert.equal(pending.model, "gpt-5.6-sol");
+        assert.equal(pending.sessionInAutoFallback, false);
+        assert.equal(normalizeModelRefForCompare(" OpenAI ", " GPT-5.6-Sol "), "openai/gpt-5.6-sol");
+        assert.equal(normalizeModelRefForCompare(undefined, " gpt-5.6-sol "), "gpt-5.6-sol");
+    });
+    it("treats bare model ids as model-only refs", () => {
+        const pending = splitModelRef("gpt-5.6-sol");
+        assert.equal(pending.provider, undefined);
+        assert.equal(pending.model, "gpt-5.6-sol");
+    });
+});
+describe("targetMatchesFallbackOrigin", () => {
+    it("matches exact provider/model origin", () => {
+        const pending = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.ok(targetMatchesFallbackOrigin(pending));
+        clearAllPendingPerMessageModel();
+    });
+    it("matches model-only target against origin model", () => {
+        const pending = setPendingPerMessageModel("s1", "gpt-5.6-sol", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.ok(targetMatchesFallbackOrigin(pending));
+        clearAllPendingPerMessageModel();
+    });
+    it("does not match a different target", () => {
+        const pending = setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.equal(targetMatchesFallbackOrigin(pending), false);
+        clearAllPendingPerMessageModel();
+    });
+});
+describe("shouldSkipOverrideForActiveFallback", () => {
+    it("skips only when session is in auto-fallback and target is the origin", () => {
+        const origin = setPendingPerMessageModel("s1", "openai/gpt-5.6-sol", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.equal(shouldSkipOverrideForActiveFallback(origin), true);
+        const otherTarget = setPendingPerMessageModel("s2", "openai/gpt-6-astra", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.equal(shouldSkipOverrideForActiveFallback(otherTarget), false);
+        const notFallback = setPendingPerMessageModel("s3", "openai/gpt-5.6-sol", {
+            sessionInAutoFallback: false,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-sol" },
+        });
+        assert.equal(shouldSkipOverrideForActiveFallback(notFallback), false);
+        clearAllPendingPerMessageModel();
+    });
+});
+describe("resolveSessionFallbackContextFromEntry", () => {
+    it("returns empty context for missing entry", () => {
+        assert.deepEqual(resolveSessionFallbackContextFromEntry(undefined), {
+            sessionInAutoFallback: false,
+        });
+    });
+    it("reads auto fallback provenance", () => {
+        const ctx = resolveSessionFallbackContextFromEntry({
+            modelOverride: "openai/gpt-5.6-sol",
+            modelOverrideSource: "auto",
+            modelOverrideFallbackOriginProvider: "openai",
+            modelOverrideFallbackOriginModel: "gpt-6-astra",
+        });
+        assert.equal(ctx.sessionInAutoFallback, true);
+        assert.deepEqual(ctx.fallbackOrigin, { provider: "openai", model: "gpt-6-astra" });
+    });
+    it("ignores user overrides without fallback origin", () => {
+        const ctx = resolveSessionFallbackContextFromEntry({
+            modelOverride: "openai/gpt-6-astra",
+            modelOverrideSource: "user",
+        });
+        assert.equal(ctx.sessionInAutoFallback, false);
+        assert.equal(ctx.fallbackOrigin, undefined);
+    });
+});
+describe("resolveSessionModelFallbackContext", () => {
+    it("returns empty context for missing path or session key", () => {
+        assert.deepEqual(resolveSessionModelFallbackContext({ storePath: "", sessionKey: "s" }), {
+            sessionInAutoFallback: false,
+        });
+        assert.deepEqual(resolveSessionModelFallbackContext({ storePath: "p", sessionKey: "" }), {
+            sessionInAutoFallback: false,
+        });
+    });
+    it("returns empty context when the store has no matching session", () => {
+        const dir = mkdtempSync(join(tmpdir(), "xg-fallback-ctx-"));
+        const ctx = resolveSessionModelFallbackContext({
+            storePath: join(dir, "sessions.sqlite"),
+            sessionKey: "agent:main:xg_cwork_im:group:g1",
+        });
+        assert.deepEqual(ctx, { sessionInAutoFallback: false });
+    });
+});
+describe("registerPerMessageModelHook", () => {
+    it("registers before_model_resolve with priority 100", () => {
+        const { api, captured } = fakeApi();
+        registerPerMessageModelHook(api);
+        assert.equal(captured.length, 1);
+        assert.equal(captured[0].name, "before_model_resolve");
+        assert.deepEqual(captured[0].opts, { priority: 100 });
+    });
+    it("applies override even when the current candidate is the agent default", async () => {
+        const { api, captured, logs } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "openai/gpt-6-astra");
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-6-astra" });
+        assert.match(logs.join(" "), /hookDecision=apply/);
+        assert.equal(takePendingPerMessageModel("s1"), undefined);
+        clearAllPendingPerMessageModel();
+    });
+    it("applies model-only override when pending has no provider", async () => {
+        const { api, captured } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "gpt-6-astra");
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.deepEqual(result, { modelOverride: "gpt-6-astra" });
+        clearAllPendingPerMessageModel();
+    });
+    it("does not re-apply the override on a fallback retry for the same run", async () => {
+        const { api, captured, logs } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "openai/gpt-6-astra");
+        await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        // 同一个 run 的第二次模型解析（fallback 重试）即便再次登记也不覆盖。
+        setPendingPerMessageModel("s1", "openai/gpt-6-astra");
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-terra" });
+        assert.equal(result, undefined);
+        assert.match(logs.join(" "), /hookDecision=skip-fallback-retry/);
+        clearAllPendingPerMessageModel();
+    });
+    it("skips the override when the session is auto-falling back to a different model", async () => {
+        const { api, captured, logs } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-6-astra" },
+        });
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.equal(result, undefined);
+        assert.match(logs.join(" "), /hookDecision=skip-active-fallback/);
+        assert.equal(takePendingPerMessageModel("s1"), undefined);
+        clearAllPendingPerMessageModel();
+    });
+    it("still applies when auto-falling back but the requested model is not the origin", async () => {
+        const { api, captured } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "openai/gpt-6-astra", {
+            sessionInAutoFallback: true,
+            fallbackOrigin: { provider: "openai", model: "gpt-5.6-luna" },
+        });
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.deepEqual(result, { providerOverride: "openai", modelOverride: "gpt-6-astra" });
+        clearAllPendingPerMessageModel();
+    });
+    it("does not consume another session's pending model", async () => {
+        const { api, captured } = fakeApi();
+        registerPerMessageModelHook(api);
+        setPendingPerMessageModel("s1", "openai/gpt-5.6-sol");
+        await captured[0].handler({}, { sessionKey: "s2", runId: "run-2", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.equal(takePendingPerMessageModel("s2"), undefined);
+        const pendingForS1 = takePendingPerMessageModel("s1");
+        assert.equal(pendingForS1?.model, "gpt-5.6-sol");
+        clearAllPendingPerMessageModel();
+    });
+    it("does nothing when no pending model is registered", async () => {
+        const { api, captured } = fakeApi();
+        registerPerMessageModelHook(api);
+        clearAllPendingPerMessageModel();
+        const result = await captured[0].handler({}, { sessionKey: "s1", runId: "run-1", modelProviderId: "openai", modelId: "gpt-5.6-sol" });
+        assert.equal(result, undefined);
+    });
+});
+//# sourceMappingURL=register-per-message-model-hook.test.js.map

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

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

package/dist/src/register-run-model-context-hook.d.ts

@@ -0,0 +1,11 @@
+/**
+ * llm_output hook：记录本回合「生效模型 + 有效上下文预算」。
+ *
+ * 供 RUN_USAGE 在 session entry 缺 `model` / `contextTokens` 时兜底
+ * （OpenClaw 在 preserveRuntimeModel 场景下只写用量、不写模型/上下文窗口）。
+ *
+ * `llm_output` 为较新 hook；宿主不支持时由调用方 try/catch 兜住，不影响主流程。
+ */
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
+export declare function registerRunModelContextHook(api: OpenClawPluginApi): void;
+//# sourceMappingURL=register-run-model-context-hook.d.ts.map

package/dist/src/register-run-model-context-hook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-run-model-context-hook.d.ts","sourceRoot":"","sources":["../../src/register-run-model-context-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAGnF,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAYxE"}

package/dist/src/register-run-model-context-hook.js

@@ -0,0 +1,23 @@
+/**
+ * llm_output hook：记录本回合「生效模型 + 有效上下文预算」。
+ *
+ * 供 RUN_USAGE 在 session entry 缺 `model` / `contextTokens` 时兜底
+ * （OpenClaw 在 preserveRuntimeModel 场景下只写用量、不写模型/上下文窗口）。
+ *
+ * `llm_output` 为较新 hook；宿主不支持时由调用方 try/catch 兜住，不影响主流程。
+ */
+import { recordRunModelContext } from "./run-model-context.js";
+export function registerRunModelContextHook(api) {
+    api.on("llm_output", (event, ctx) => {
+        recordRunModelContext(ctx?.sessionKey, {
+            provider: event.provider,
+            model: event.model,
+            resolvedRef: event.resolvedRef,
+            contextTokenBudget: event.contextTokenBudget,
+            contextWindowSource: event.contextWindowSource,
+            contextWindowReferenceTokens: event.contextWindowReferenceTokens,
+            runId: event.runId,
+        });
+    });
+}
+//# sourceMappingURL=register-run-model-context-hook.js.map

package/dist/src/register-run-model-context-hook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-run-model-context-hook.js","sourceRoot":"","sources":["../../src/register-run-model-context-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,UAAU,2BAA2B,CAAC,GAAsB;IAC9D,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAChC,qBAAqB,CAAC,GAAG,EAAE,UAAU,EAAE;YACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,4BAA4B,EAAE,KAAK,CAAC,4BAA4B;YAChE,KAAK,EAAE,KAAK,CAAC,KAAK;SACrB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}

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

@@ -0,0 +1,89 @@
+/**
+ * XG-IM 入站 reply 的 dispatch 驱动选择器。
+ *
+ * 目标：把插件自研的「直接调 `rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher`」内核，
+ * 替换为官方 channel 消息流推荐的 assembled turn 入口
+ * （`rt.channel.inbound.dispatchReply` = `dispatchAssembledChannelTurn`）。
+ *
+ * 驱动选择（优先级从高到低）：
+ * 1. 环境变量 `XG_CWORK_IM_DISPATCH_DRIVER=official|legacy` 显式指定；
+ * 2. `auto`（默认）：宿主 runtime 暴露 `channel.inbound.dispatchReply` 时用 official，否则 legacy。
+ *
+ * 语义约定（与旧版保持一致）：
+ * - WS/HTTP 出站字节不变（deliver/onSkip/onError 仍由插件闭包提供，见 dispatch-mentioned-reply）。
+ * - **会话记录由官方 turn 在内部完成**：official 驱动下把 `rt.channel.session.recordInboundSession`
+ *   原样传给 assembled turn，并透传 `record`（sessionKey / updateLastRoute / onRecordError）。
+ *   调用方（account-connection）在 official 驱动下不得再手动 record，8.x 的 CAS deferral 补丁随之移除。
+ * - official 内核自身在 8.x 会对 dispatch 内的 reply-session init 做 CAS 冲突重试；本模块不重复实现。
+ */
+import type { OpenClawConfig } from "openclaw/plugin-sdk/core";
+type AnyRuntime = any;
+export type DispatchDriver = "auto" | "official" | "legacy";
+export interface DispatchDriverResolution {
+    driver: "official" | "legacy";
+    officialSupported: boolean;
+    source: "env" | "auto" | "forced";
+}
+/** 宿主 runtime 是否暴露官方 assembled-turn 入口。 */
+export declare function supportsOfficialAssembledTurn(rt: AnyRuntime): boolean;
+/** 解析本轮实际使用的 dispatch 驱动。 */
+export declare function resolveDispatchDriver(rt: AnyRuntime, prefer?: DispatchDriver): DispatchDriverResolution;
+/** 由调用方（account-connection）转交的会话记录事实；official 驱动下传给官方 turn 内部记录。 */
+export interface InboundRecordFacts {
+    storePath: string;
+    sessionKey: string;
+    updateLastRoute?: unknown;
+    groupResolution?: unknown;
+    createIfMissing?: boolean;
+    onRecordError?: (err: unknown) => void;
+}
+export interface DispatchXgImInboundReplyParams {
+    rt: AnyRuntime;
+    /** 插件自持的入站 ctx（FinalizedMsgContext）。 */
+    ctx: unknown;
+    cfg: OpenClawConfig;
+    channel: string;
+    accountId: string;
+    agentId: string;
+    routeSessionKey: string;
+    storePath: string;
+    replyOptions: Record<string, unknown>;
+    /** 由 dispatch-mentioned-reply 提供的 dispatcher 载荷（含 deliver/onSkip/onError）。 */
+    dispatcherOptions: Record<string, unknown>;
+    driver: "official" | "legacy";
+    logPrefix: string;
+    /**
+     * official 驱动下交给官方 turn 内部记录的会话事实。
+     * legacy 驱动或未提供时忽略（旧行为由调用方自行 record）。
+     */
+    inboundRecord?: InboundRecordFacts;
+    /**
+     * OpenClaw 2026.9.3+ published runtime 丢弃 ephemeral `cfg`；须经 `configOverride`
+     * 合并进 `applyMergePatch(runtimeReplyConfig, configOverride)`，NAS binds 才能进沙箱。
+     *
+     * `inbound.dispatchReply`（assembled turn）ownership 为 `legacy-dispatcher`：会调用
+     * 我们传入的 `dispatchReplyWithBufferedBlockDispatcher`，lifecycle 同时把 turn 级
+     * `dispatchReplyFromConfig` 传进该调用。两处都挂 override（buffered 包装 + turn 级），
+     * 避免只依赖其中一条。`inbound.dispatch`（routed-delivery）本插件未使用。
+     */
+    configOverride?: OpenClawConfig;
+    /**
+     * 可选告警出口（通常接 channel `log.warn`）。未提供时回退 `console.warn`。
+     * 仅用于 NAS configOverride 跳过/回退等可观测信息，不改变控制流。
+     */
+    warn?: (message: string) => void;
+}
+/**
+ * 按 driver 分发一次入站 reply。
+ *
+ * - legacy：等价旧行为，直接调 `rt.channel.reply.dispatchReplyWithBufferedBlockDispatcher`。
+ * - official：走 `rt.channel.inbound.dispatchReply`（assembled turn）。deliver/onError 移入
+ *   `delivery` 适配器；onSkip 等留在 dispatcherOptions；`recordInboundSession` 传真函数并透传
+ *   `record`（sessionKey / updateLastRoute / onRecordError），**会话记录由 core 在 turn 内完成**。
+ *
+ * 统一返回旧版可读的 `{ beforeAgentRunBlocked?, ... }` 形态（assembled turn 的
+ * `result.dispatchResult` 即底层 DispatchFromConfigResult）。
+ */
+export declare function dispatchXgImInboundReply(params: DispatchXgImInboundReplyParams): Promise<any>;
+export {};
+//# sourceMappingURL=reply-dispatch-driver.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"reply-dispatch-driver.d.ts","sourceRoot":"","sources":["../../src/reply-dispatch-driver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG/D,KAAK,UAAU,GAAG,GAAG,CAAC;AAEtB,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,UAAU,GAAG,QAAQ,CAAC;AAE5D,MAAM,WAAW,wBAAwB;IACrC,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC9B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,QAAQ,CAAC;CACrC;AAaD,2CAA2C;AAC3C,wBAAgB,6BAA6B,CAAC,EAAE,EAAE,UAAU,GAAG,OAAO,CAOrE;AAED,6BAA6B;AAC7B,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,GAAE,cAAuB,GAAG,wBAAwB,CAa/G;AAKD,oEAAoE;AACpE,MAAM,WAAW,kBAAkB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;CAC1C;AAED,MAAM,WAAW,8BAA8B;IAC3C,EAAE,EAAE,UAAU,CAAC;IACf,wCAAwC;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,cAAc,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,aAAa,CAAC,EAAE,kBAAkB,CAAC;IACnC;;;;;;;;OAQG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC;;;OAGG;IACH,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAgJD;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC1C,MAAM,EAAE,8BAA8B,GAEvC,OAAO,CAAC,GAAG,CAAC,CA4Ld"}