@xgjktech/xg_cwork_im 1.19.43 → 1.19.44

package/dist/src/register-exec-env-hook.test.js

@@ -0,0 +1,189 @@
+import assert from "node:assert/strict";
+import { afterEach, beforeEach, describe, it } from "node:test";
+import { registerExecEnvHook, stripLeadingXgOpenApiAppKeyAssignments, XG_OPENAPI_BASE_URL, } from "./register-exec-env-hook.js";
+import { __resetSessionEnvStoreForTests, linkChildSession, setSessionEnvEntry, XG_OPENAPI_APP_KEY, } from "./session-env-store.js";
+let registeredHandler;
+function captureApi(cfg) {
+    return {
+        runtime: {
+            config: {
+                current: () => ({
+                    channels: {
+                        xg_cwork_im: cfg?.baseUrl
+                            ? { baseUrl: cfg.baseUrl }
+                            : {},
+                    },
+                }),
+            },
+            agent: {
+                session: {
+                    getSessionEntry: ({ sessionKey }) => cfg?.entries?.[sessionKey],
+                    resolveStorePath: () => "test-session-store",
+                },
+            },
+        },
+        on: (_name, handler) => {
+            registeredHandler = handler;
+        },
+    };
+}
+beforeEach(() => {
+    registeredHandler = undefined;
+    __resetSessionEnvStoreForTests();
+});
+afterEach(() => __resetSessionEnvStoreForTests());
+describe("stripLeadingXgOpenApiAppKeyAssignments", () => {
+    it("剥掉行首无引号赋值", () => {
+        const result = stripLeadingXgOpenApiAppKeyAssignments("XG_OPENAPI_APP_KEY=*** python3 /tmp/script.py --x 1");
+        assert.equal(result.stripped, true);
+        assert.equal(result.command, "python3 /tmp/script.py --x 1");
+    });
+    it("剥掉行首引号赋值（含部分掩码）", () => {
+        const result = stripLeadingXgOpenApiAppKeyAssignments("XG_OPENAPI_APP_KEY='***RuyZWCYzkozPXL3XHs89B9xVGa' python3 script.py");
+        assert.equal(result.stripped, true);
+        assert.equal(result.command, "python3 script.py");
+    });
+    it("剥掉 export 与分号形式", () => {
+        const result = stripLeadingXgOpenApiAppKeyAssignments("export XG_OPENAPI_APP_KEY=***; python3 script.py");
+        assert.equal(result.stripped, true);
+        assert.equal(result.command, "python3 script.py");
+    });
+    it("剥掉 env 工具前缀", () => {
+        const result = stripLeadingXgOpenApiAppKeyAssignments("env XG_OPENAPI_APP_KEY=*** python3 script.py");
+        assert.equal(result.stripped, true);
+        assert.equal(result.command, "python3 script.py");
+    });
+    it("只剥本变量，保留其他行首赋值", () => {
+        const result = stripLeadingXgOpenApiAppKeyAssignments("XG_OPENAPI_APP_KEY=bad KEEP=1 python3 script.py");
+        assert.equal(result.stripped, true);
+        assert.equal(result.command, "KEEP=1 python3 script.py");
+    });
+    it("不碰命令正文中的同名提及", () => {
+        const cmd = 'python3 -c "print(\'XG_OPENAPI_APP_KEY\')"';
+        const result = stripLeadingXgOpenApiAppKeyAssignments(cmd);
+        assert.equal(result.stripped, false);
+        assert.equal(result.command, cmd);
+    });
+    it("不碰非行首的赋值", () => {
+        const cmd = "echo hi && XG_OPENAPI_APP_KEY=*** python3 script.py";
+        const result = stripLeadingXgOpenApiAppKeyAssignments(cmd);
+        assert.equal(result.stripped, false);
+        assert.equal(result.command, cmd);
+    });
+});
+describe("register-exec-env-hook", () => {
+    it("注册 before_tool_call handler", () => {
+        registerExecEnvHook(captureApi());
+        assert.equal(typeof registeredHandler, "function");
+    });
+    it("非 exec 工具不注入", () => {
+        registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "k");
+        const result = registeredHandler({ toolName: "read", params: {} }, { sessionKey: "session-a" });
+        assert.equal(result, undefined);
+    });
+    it("无 appKey 且无 baseUrl 时返回 undefined（不动作）", () => {
+        registerExecEnvHook(captureApi());
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-empty" });
+        assert.equal(result, undefined);
+    });
+    it("只有 baseUrl（配置）时也注入", () => {
+        registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, { [XG_OPENAPI_BASE_URL]: "https://api.example.com" });
+    });
+    it("appKey 与 baseUrl 同时注入", () => {
+        registerExecEnvHook(captureApi({ baseUrl: "https://api.example.com" }));
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, {
+            [XG_OPENAPI_APP_KEY]: "key-a",
+            [XG_OPENAPI_BASE_URL]: "https://api.example.com",
+        });
+    });
+    it("有 appKey 但无 baseUrl 配置时只注入 appKey", () => {
+        registerExecEnvHook(captureApi());
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, { [XG_OPENAPI_APP_KEY]: "key-a" });
+    });
+    it("exec 且本会话有 appKey：注入 env，保留原 env 并覆盖同 key", () => {
+        registerExecEnvHook(captureApi());
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
+        const result = registeredHandler({
+            toolName: "exec",
+            params: { command: "echo hi", env: { EXISTING: "keep", [XG_OPENAPI_APP_KEY]: "old" } },
+        }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, {
+            EXISTING: "keep",
+            [XG_OPENAPI_APP_KEY]: "key-a",
+        });
+        assert.equal(resultParams.command, "echo hi");
+    });
+    it("有注入时剥掉 command 行首赋值并写入绑定值", () => {
+        registerExecEnvHook(captureApi());
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
+        const result = registeredHandler({
+            toolName: "exec",
+            params: {
+                command: "XG_OPENAPI_APP_KEY='***RuyZWCYzkozPXL3XHs89B9xVGa' python3 script.py",
+                env: { [XG_OPENAPI_APP_KEY]: "***" },
+            },
+        }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.equal(resultParams.command, "python3 script.py");
+        assert.deepEqual(resultParams.env, { [XG_OPENAPI_APP_KEY]: "key-a" });
+    });
+    it("无注入时不改 command 前缀", () => {
+        registerExecEnvHook(captureApi());
+        const command = "XG_OPENAPI_APP_KEY=*** python3 script.py";
+        const result = registeredHandler({ toolName: "exec", params: { command, env: { KEEP: "1" } } }, { sessionKey: "session-empty" });
+        assert.equal(result, undefined);
+    });
+    it("subagent 子会话经父子链反查父会话 appKey", () => {
+        registerExecEnvHook(captureApi());
+        setSessionEnvEntry("parent-session", XG_OPENAPI_APP_KEY, "parent-key");
+        linkChildSession("child-session", "parent-session");
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "child-session" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, { [XG_OPENAPI_APP_KEY]: "parent-key" });
+    });
+    it("原 params 无 env 时新建 env 字段", () => {
+        registerExecEnvHook(captureApi());
+        setSessionEnvEntry("session-a", XG_OPENAPI_APP_KEY, "key-a");
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "session-a" });
+        const resultParams = result.params;
+        assert.deepEqual(resultParams.env, { [XG_OPENAPI_APP_KEY]: "key-a" });
+    });
+    it("使用 OpenClaw Session 元数据解析父链，不依赖 subagent_spawned", () => {
+        registerExecEnvHook(captureApi({
+            entries: {
+                "agent:agent-a:child": { spawnedBy: "agent:agent-a:parent" },
+                "agent:agent-a:parent": { parentSessionKey: "agent:agent-a:root" },
+            },
+        }));
+        setSessionEnvEntry("agent:agent-a:root", XG_OPENAPI_APP_KEY, "parent-key");
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi" } }, { sessionKey: "agent:agent-a:child" });
+        assert.deepEqual(result.params.env, { [XG_OPENAPI_APP_KEY]: "parent-key" });
+    });
+    it("无绑定时删除普通 Session 的 AI AppKey，但不阻断 exec", () => {
+        registerExecEnvHook(captureApi());
+        const result = registeredHandler({ toolName: "exec", params: { command: "echo hi", env: { XG_OPENAPI_APP_KEY: "ai-wrong", KEEP: "1" } } }, { sessionKey: "agent:agent-a:main" });
+        assert.deepEqual(result.params.env, { KEEP: "1" });
+    });
+    it("父 Session 属于其他 agent 时不注入 AppKey", () => {
+        registerExecEnvHook(captureApi({
+            entries: {
+                "agent:agent-a:child": { spawnedBy: "agent:agent-b:parent" },
+            },
+        }));
+        setSessionEnvEntry("agent:agent-b:parent", XG_OPENAPI_APP_KEY, "other-agent-key");
+        const result = registeredHandler({ toolName: "exec", params: { env: { XG_OPENAPI_APP_KEY: "ai-wrong" } } }, { sessionKey: "agent:agent-a:child", agentId: "agent-a" });
+        assert.deepEqual(result.params.env, {});
+    });
+});
+//# sourceMappingURL=register-exec-env-hook.test.js.map

package/dist/src/register-exec-env-hook.test.js.map

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

package/dist/src/register-group-prompt-hook.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 续轮群背景补注入 hook。
+ *
+ * 问题：`GroupSystemPrompt`（`userInfo.background` + `agentContext`）只在入站 @ 回合注入，
+ * heartbeat / exec 完成唤醒等自触发回合没有入站消息，OpenClaw 不会重新注入，
+ * 导致 agent 在续轮丢失「待办背景」并反问用户补充材料。
+ *
+ * 方案：入站回合已把动态段写入 `session-group-prompt` 缓存（`account-connection.ts`），
+ * 这里在**非入站回合**把缓存补回模型上下文：
+ * - `heartbeat_prompt_contribution`：仅在 `trigger === "heartbeat"` 触发，返回 `prependContext`；
+ * - `before_prompt_build`：每轮都触发，因此跳过 `user`（core 已注入 GroupSystemPrompt）与
+ *   `heartbeat`（上一个钩子已处理），其余自触发回合（cron / tool / system / runtime_continue）
+ *   返回 `appendSystemContext` 进系统提示。
+ */
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
+export declare function registerGroupPromptHook(api: OpenClawPluginApi): void;
+//# sourceMappingURL=register-group-prompt-hook.d.ts.map

package/dist/src/register-group-prompt-hook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-group-prompt-hook.d.ts","sourceRoot":"","sources":["../../src/register-group-prompt-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAYnF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAkBpE"}

package/dist/src/register-group-prompt-hook.js

@@ -0,0 +1,45 @@
+/**
+ * 续轮群背景补注入 hook。
+ *
+ * 问题：`GroupSystemPrompt`（`userInfo.background` + `agentContext`）只在入站 @ 回合注入，
+ * heartbeat / exec 完成唤醒等自触发回合没有入站消息，OpenClaw 不会重新注入，
+ * 导致 agent 在续轮丢失「待办背景」并反问用户补充材料。
+ *
+ * 方案：入站回合已把动态段写入 `session-group-prompt` 缓存（`account-connection.ts`），
+ * 这里在**非入站回合**把缓存补回模型上下文：
+ * - `heartbeat_prompt_contribution`：仅在 `trigger === "heartbeat"` 触发，返回 `prependContext`；
+ * - `before_prompt_build`：每轮都触发，因此跳过 `user`（core 已注入 GroupSystemPrompt）与
+ *   `heartbeat`（上一个钩子已处理），其余自触发回合（cron / tool / system / runtime_continue）
+ *   返回 `appendSystemContext` 进系统提示。
+ */
+import { getSessionGroupPrompt } from "./session-group-prompt.js";
+/** 注入标题：让模型知道这是此前 @ 消息下发的会话背景，而不是新一轮用户输入。 */
+const INJECTION_HEADER = "以下为本会话群背景（由此前 @ 消息下发，供续轮参考）：";
+function buildInjection(sessionKey) {
+    const cached = getSessionGroupPrompt(sessionKey);
+    if (!cached)
+        return undefined;
+    return `${INJECTION_HEADER}\n\n${cached}`;
+}
+export function registerGroupPromptHook(api) {
+    // heartbeat 回合（含 exec 完成唤醒，OpenClaw 归为 trigger=heartbeat）：天然不与入站回合重复。
+    api.on("heartbeat_prompt_contribution", (_event, ctx) => {
+        const text = buildInjection(ctx?.sessionKey);
+        if (!text)
+            return;
+        return { prependContext: text };
+    });
+    // 其余自触发回合：before_prompt_build 每轮（含回合内每次模型调用）都会跑，
+    // 必须跳过 user（core 已把 GroupSystemPrompt 写进系统提示）与 heartbeat（已由上面的钩子处理），
+    // 否则同一份背景会被重复注入。
+    api.on("before_prompt_build", (_event, ctx) => {
+        const trigger = ctx?.trigger;
+        if (trigger === "user" || trigger === "heartbeat")
+            return;
+        const text = buildInjection(ctx?.sessionKey);
+        if (!text)
+            return;
+        return { appendSystemContext: text };
+    });
+}
+//# sourceMappingURL=register-group-prompt-hook.js.map

package/dist/src/register-group-prompt-hook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-group-prompt-hook.js","sourceRoot":"","sources":["../../src/register-group-prompt-hook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,6CAA6C;AAC7C,MAAM,gBAAgB,GAAG,8BAA8B,CAAC;AAExD,SAAS,cAAc,CAAC,UAA8B;IAClD,MAAM,MAAM,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACjD,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,OAAO,GAAG,gBAAgB,OAAO,MAAM,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,GAAsB;IAC1D,sEAAsE;IACtE,GAAG,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,iDAAiD;IACjD,qEAAqE;IACrE,iBAAiB;IACjB,GAAG,CAAC,EAAE,CAAC,qBAAqB,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QAC1C,MAAM,OAAO,GAAG,GAAG,EAAE,OAAO,CAAC;QAC7B,IAAI,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,WAAW;YAAE,OAAO;QAC1D,MAAM,IAAI,GAAG,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/src/register-group-prompt-hook.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=register-group-prompt-hook.test.d.ts.map

package/dist/src/register-group-prompt-hook.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"register-group-prompt-hook.test.d.ts","sourceRoot":"","sources":["../../src/register-group-prompt-hook.test.ts"],"names":[],"mappings":""}

package/dist/src/register-group-prompt-hook.test.js

@@ -0,0 +1,60 @@
+import assert from "node:assert/strict";
+import { beforeEach, describe, it } from "node:test";
+import { registerGroupPromptHook } from "./register-group-prompt-hook.js";
+import { clearAllSessionGroupPrompts, setSessionGroupPrompt } from "./session-group-prompt.js";
+function captureApi() {
+    const handlers = new Map();
+    const api = {
+        on: (name, handler) => {
+            handlers.set(name, handler);
+        },
+    };
+    return { api, handlers };
+}
+function setup() {
+    const { api, handlers } = captureApi();
+    registerGroupPromptHook(api);
+    const heartbeat = handlers.get("heartbeat_prompt_contribution");
+    const promptBuild = handlers.get("before_prompt_build");
+    assert.ok(heartbeat, "heartbeat_prompt_contribution hook must be registered");
+    assert.ok(promptBuild, "before_prompt_build hook must be registered");
+    return { heartbeat: heartbeat, promptBuild: promptBuild };
+}
+describe("register-group-prompt-hook", () => {
+    beforeEach(() => {
+        clearAllSessionGroupPrompts();
+    });
+    it("injects the cached group prompt on heartbeat turns", () => {
+        const { heartbeat } = setup();
+        setSessionGroupPrompt("agent:a:xg_cwork_im:group:g1", "## 当前项目\n\n- 项目根目录：`./p`");
+        const result = heartbeat({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "heartbeat" });
+        assert.ok(result);
+        assert.match(result.prependContext ?? "", /本会话群背景/);
+        assert.match(result.prependContext ?? "", /## 当前项目/);
+    });
+    it("returns nothing on heartbeat turns without a cached prompt", () => {
+        const { heartbeat } = setup();
+        assert.equal(heartbeat({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "heartbeat" }), undefined);
+        assert.equal(heartbeat({}, { trigger: "heartbeat" }), undefined);
+    });
+    it("never double-injects on inbound user or heartbeat turns via before_prompt_build", () => {
+        const { promptBuild } = setup();
+        setSessionGroupPrompt("agent:a:xg_cwork_im:group:g1", "bg");
+        assert.equal(promptBuild({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "user" }), undefined);
+        assert.equal(promptBuild({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "heartbeat" }), undefined);
+    });
+    it("injects the cached group prompt into the system prompt on other wake turns", () => {
+        const { promptBuild } = setup();
+        setSessionGroupPrompt("agent:a:xg_cwork_im:group:g1", "## 当前用户\n\n发送者：张三");
+        const result = promptBuild({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "cron" });
+        assert.ok(result);
+        assert.match(result.appendSystemContext ?? "", /本会话群背景/);
+        assert.match(result.appendSystemContext ?? "", /发送者：张三/);
+    });
+    it("does not inject for sessions without a cached prompt", () => {
+        const { promptBuild } = setup();
+        assert.equal(promptBuild({}, { sessionKey: "agent:a:xg_cwork_im:group:g1", trigger: "cron" }), undefined);
+        assert.equal(promptBuild({}, { trigger: "cron" }), undefined);
+    });
+});
+//# sourceMappingURL=register-group-prompt-hook.test.js.map

package/dist/src/register-group-prompt-hook.test.js.map

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

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

@@ -1,6 +1,14 @@
 /**
- * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型，优先于 session autoFallback 探测。
+ * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
+ *
+ * 守卫语义（两层）：
+ * 1. 只作用于本轮 run 的「首次模型解析」；同一 runId 的后续调用（模型 fallback 重试）不再覆盖，
+ *    避免把降级候选改回主模型。
+ * 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源（冷却中的原模型）时，
+ *    静默放弃覆盖，尊重 OpenClaw 的自动降级选择。
+ *
+ * 取后即删：无论命中与否，首个候选钩子就消费本次单轮覆盖，避免残留到下一轮消息。
  */
-import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
 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;;GAEG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAyBxE"}
+{"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"}

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

@@ -1,21 +1,47 @@
 /**
- * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型，优先于 session autoFallback 探测。
+ * before_model_resolve：消费 IM ext.ai_model 登记的单轮模型。
+ *
+ * 守卫语义（两层）：
+ * 1. 只作用于本轮 run 的「首次模型解析」；同一 runId 的后续调用（模型 fallback 重试）不再覆盖，
+ *    避免把降级候选改回主模型。
+ * 2. 登记时该 session 正处于自动降级、且用户点名的就是降级来源（冷却中的原模型）时，
+ *    静默放弃覆盖，尊重 OpenClaw 的自动降级选择。
+ *
+ * 取后即删：无论命中与否，首个候选钩子就消费本次单轮覆盖，避免残留到下一轮消息。
  */
-import { takePendingPerMessageModel } from "./per-message-model-pending.js";
+import { claimPerMessageModelRun, shouldSkipOverrideForActiveFallback, 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;;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"}
+{"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"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=register-per-message-model-hook.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"register-per-message-model-hook.test.d.ts","sourceRoot":"","sources":["../../src/register-per-message-model-hook.test.ts"],"names":[],"mappings":""}