@xgjktech/xg_cwork_im 1.17.25 → 1.17.26

package/dist/src/nas-volumes.test.js

@@ -1,5 +1,5 @@
 import assert from "node:assert/strict";
-import { mkdtemp, mkdir, rm } from "node:fs/promises";
+import { mkdtemp, mkdir, rm, stat } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, it } from "node:test";
@@ -27,6 +27,12 @@ function openClawCfg() {
         },
     };
 }
+function mappingConfig(hostRoot) {
+    return {
+        baseUrl: "https://im.example.test",
+        nasVolumeRootMappings: [{ logicalRoot: "/data/touqian", hostRoot }],
+    };
+}
 describe("nasVolumes", () => {
     it("normalizes workspace-relative dockerDir", () => {
         assert.equal(normalizeNasDockerDir("/workspace/touqian/2026/08/a/"), "touqian/2026/08/a");
@@ -44,14 +50,14 @@ describe("nasVolumes", () => {
         assert.equal(result.specHash, undefined);
     });
     it("injects binds and reuses the same session spec", async () => {
-        const { root, caseA } = await fixture();
-        const config = { baseUrl: "https://im.example.test", nasVolumeAllowedRoots: [root] };
+        const { root } = await fixture();
+        const config = mappingConfig(root);
         const args = {
             cfg: openClawCfg(),
             config,
             agentId: "main",
             sessionKey: "agent:main:xg_cwork_im:group-1",
-            volumes: [{ realDir: caseA, dockerDir: "touqian/case-a", mode: "ro" }],
+            volumes: [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case-a", mode: "ro" }],
         };
         const first = resolveNasVolumeDispatchConfig(args);
         const second = resolveNasVolumeDispatchConfig(args);
@@ -64,10 +70,125 @@ describe("nasVolumes", () => {
         assert.ok(docker.binds.some((bind) => bind.endsWith(":/workspace/touqian/case-a:ro")));
         assert.equal(docker.dangerouslyAllowExternalBindSources, true);
         assert.equal(docker.dangerouslyAllowReservedContainerTargets, true);
+        assert.equal(docker.binds.at(-1), `${path.resolve(root, "case-a")}:/workspace/touqian/case-a:ro`);
+    });
+    it("rejects a NAS target that conflicts with an existing sandbox bind", async () => {
+        const { root } = await fixture();
+        const cfg = openClawCfg();
+        cfg.agents.defaults.sandbox.docker.binds.push("/other/source:/workspace/touqian/case-a:ro");
+        assert.throws(() => resolveNasVolumeDispatchConfig({
+            cfg,
+            config: mappingConfig(root),
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:existing-bind-conflict",
+            volumes: [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case-a", mode: "ro" }],
+        }), /NAS_VOLUME_TARGET_CONFLICT/);
+        const recovered = resolveNasVolumeDispatchConfig({
+            cfg: openClawCfg(),
+            config: mappingConfig(root),
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:existing-bind-conflict",
+            volumes: [{ realDir: "/data/touqian/case-b", dockerDir: "touqian/case-b", mode: "ro" }],
+        });
+        assert.equal(recovered.reused, false, "失败的配置注入不得污染会话挂载缓存");
+    });
+    it("expires an idle session mount state after two hours", async () => {
+        const { root } = await fixture();
+        const originalNow = Date.now;
+        let now = originalNow();
+        Date.now = () => now;
+        try {
+            const common = {
+                config: mappingConfig(root),
+                agentId: "main",
+                sessionKey: "agent:main:xg_cwork_im:ttl-session",
+            };
+            resolveNasVolumeDispatchConfig({
+                ...common,
+                cfg: openClawCfg(),
+                volumes: [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case-a", mode: "ro" }],
+            });
+            now += 2 * 60 * 60 * 1_000 + 1;
+            const cfg = openClawCfg();
+            const expired = resolveNasVolumeDispatchConfig({ ...common, cfg });
+            assert.strictEqual(expired.cfg, cfg);
+            assert.equal(expired.specHash, undefined);
+        }
+        finally {
+            Date.now = originalNow;
+        }
+    });
+    it("caps cached session mount states and evicts the least recently used entry", async () => {
+        const { root } = await fixture();
+        const config = mappingConfig(root);
+        const volume = [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case-a", mode: "ro" }];
+        for (let index = 0; index <= 2_000; index += 1) {
+            resolveNasVolumeDispatchConfig({
+                cfg: openClawCfg(),
+                config,
+                agentId: "main",
+                sessionKey: `agent:main:xg_cwork_im:bounded-${index}`,
+                volumes: volume,
+            });
+        }
+        const oldestCfg = openClawCfg();
+        const oldest = resolveNasVolumeDispatchConfig({
+            cfg: oldestCfg,
+            config,
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:bounded-0",
+        });
+        assert.strictEqual(oldest.cfg, oldestCfg);
+        assert.equal(oldest.specHash, undefined);
+        const newest = resolveNasVolumeDispatchConfig({
+            cfg: openClawCfg(),
+            config,
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:bounded-2000",
+        });
+        assert.ok(newest.specHash);
+        assert.equal(newest.reused, true);
+    });
+    it("creates a missing business source directory below an allowed root", async () => {
+        const { root } = await fixture();
+        const missing = path.join(root, "CP202205250005", "sequences", "0001", "input");
+        const result = resolveNasVolumeDispatchConfig({
+            cfg: openClawCfg(),
+            config: {
+                baseUrl: "https://im.example.test",
+                nasVolumeRootMappings: [
+                    { logicalRoot: "/data/touqian", hostRoot: root },
+                ],
+            },
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:group-create",
+            volumes: [
+                {
+                    realDir: "/data/touqian/CP202205250005/sequences/0001/input",
+                    dockerDir: "touqian/case/input",
+                    mode: "rw",
+                },
+            ],
+        });
+        assert.equal((await stat(missing)).isDirectory(), true);
+        const docker = result.cfg.agents.defaults.sandbox.docker;
+        assert.ok(docker.binds.some((bind) => bind.endsWith(":/workspace/touqian/case/input:rw")));
+    });
+    it("never creates a missing directory outside the allowed root", async () => {
+        const { root } = await fixture();
+        const outside = path.join(root, "outside", "must-not-exist");
+        assert.throws(() => resolveNasVolumeDispatchConfig({
+            cfg: openClawCfg(),
+            config: mappingConfig(root),
+            agentId: "main",
+            sessionKey: "agent:main:xg_cwork_im:group-outside",
+            volumes: [{ realDir: "/data/other/must-not-exist", dockerDir: "touqian/outside", mode: "rw" }],
+        }), /NAS_VOLUME_SOURCE_FORBIDDEN/);
+        await assert.rejects(stat(outside), /ENOENT/);
     });
     it("rejects changing NAS directories in the same session", async () => {
-        const { root, caseA, caseB } = await fixture();
-        const config = { baseUrl: "https://im.example.test", nasVolumeAllowedRoots: [root] };
+        const { root } = await fixture();
+        const config = mappingConfig(root);
         const common = {
             cfg: openClawCfg(),
             config,
@@ -76,15 +197,15 @@ describe("nasVolumes", () => {
         };
         resolveNasVolumeDispatchConfig({
             ...common,
-            volumes: [{ realDir: caseA, dockerDir: "touqian/case", mode: "ro" }],
+            volumes: [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case", mode: "ro" }],
         });
         assert.throws(() => resolveNasVolumeDispatchConfig({
             ...common,
-            volumes: [{ realDir: caseB, dockerDir: "touqian/case", mode: "ro" }],
+            volumes: [{ realDir: "/data/touqian/case-b", dockerDir: "touqian/case", mode: "ro" }],
         }), /NAS_VOLUME_SESSION_CONFLICT/);
     });
-    it("requires a configured realDir allowlist and rejects overlapping targets", async () => {
-        const { root, caseA, caseB } = await fixture();
+    it("requires root mappings and rejects overlapping targets", async () => {
+        const { root } = await fixture();
         const common = {
             cfg: openClawCfg(),
             agentId: "main",
@@ -93,17 +214,14 @@ describe("nasVolumes", () => {
         assert.throws(() => resolveNasVolumeDispatchConfig({
             ...common,
             config: { baseUrl: "https://im.example.test" },
-            volumes: [{ realDir: caseA, dockerDir: "touqian/case", mode: "ro" }],
+            volumes: [{ realDir: "/data/touqian/case-a", dockerDir: "touqian/case", mode: "ro" }],
         }), /NAS_VOLUME_ROOTS_NOT_CONFIGURED/);
         assert.throws(() => resolveNasVolumeDispatchConfig({
             ...common,
-            config: {
-                baseUrl: "https://im.example.test",
-                nasVolumeAllowedRoots: [root],
-            },
+            config: mappingConfig(root),
             volumes: [
-                { realDir: caseA, dockerDir: "touqian/case", mode: "ro" },
-                { realDir: caseB, dockerDir: "touqian/case/output", mode: "rw" },
+                { realDir: "/data/touqian/case-a", dockerDir: "touqian/case", mode: "ro" },
+                { realDir: "/data/touqian/case-b", dockerDir: "touqian/case/output", mode: "rw" },
             ],
         }), /NAS_VOLUME_TARGET_CONFLICT/);
     });

package/dist/src/nas-volumes.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"nas-volumes.test.js","sourceRoot":"","sources":["../../src/nas-volumes.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AAEpD,OAAO,EACH,2BAA2B,EAC3B,qBAAqB,EACrB,8BAA8B,GACjC,MAAM,kBAAkB,CAAC;AAG1B,MAAM,QAAQ,GAAa,EAAE,CAAC;AAE9B,SAAS,CAAC,KAAK,IAAI,EAAE;IACjB,2BAA2B,EAAE,CAAC;IAC9B,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,OAAO;IAClB,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACxC,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACnB,MAAM,KAAK,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,WAAW;IAChB,OAAO;QACH,MAAM,EAAE;YACJ,QAAQ,EAAE;gBACN,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,oBAAoB,CAAC,EAAE,EAAE;aAC3E;SACJ;KACc,CAAC;AACxB,CAAC;AAED,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IACxB,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,+BAA+B,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC1F,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACtE,MAAM,GAAG,GAAG,WAAW,EAAE,CAAC;QAC1B,MAAM,MAAM,GAAG,8BAA8B,CAAC;YAC1C,GAAG;YACH,MAAM,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAgB;YAC5D,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,qCAAqC;SACpD,CAAC,CAAC;QACH,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACpC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,EAAE,CAAC;QACxC,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,CAAC,IAAI,CAAC,EAAgB,CAAC;QACnG,MAAM,IAAI,GAAG;YACT,GAAG,EAAE,WAAW,EAAE;YAClB,MAAM;YACN,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,gCAAgC;YAC5C,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAa,EAAE,CAAC;SAClF,CAAC;QAEF,MAAM,KAAK,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE9C,MAAM,MAAM,GAAI,KAAK,CAAC,GAAW,CAAC,MAAM,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;QAC9C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACvD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;QAC/F,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,wCAAwC,EAAE,IAAI,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QAClE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,yBAAyB,EAAE,qBAAqB,EAAE,CAAC,IAAI,CAAC,EAAgB,CAAC;QACnG,MAAM,MAAM,GAAG;YACX,GAAG,EAAE,WAAW,EAAE;YAClB,MAAM;YACN,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,gCAAgC;SAC/C,CAAC;QACF,8BAA8B,CAAC;YAC3B,GAAG,MAAM;YACT,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACvE,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CACT,GAAG,EAAE,CACD,8BAA8B,CAAC;YAC3B,GAAG,MAAM;YACT,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACvE,CAAC,EACN,6BAA6B,CAChC,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG;YACX,GAAG,EAAE,WAAW,EAAE;YAClB,OAAO,EAAE,MAAM;YACf,UAAU,EAAE,gCAAgC;SAC/C,CAAC;QACF,MAAM,CAAC,MAAM,CACT,GAAG,EAAE,CACD,8BAA8B,CAAC;YAC3B,GAAG,MAAM;YACT,MAAM,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAgB;YAC5D,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;SACvE,CAAC,EACN,iCAAiC,CACpC,CAAC;QAEF,MAAM,CAAC,MAAM,CACT,GAAG,EAAE,CACD,8BAA8B,CAAC;YAC3B,GAAG,MAAM;YACT,MAAM,EAAE;gBACJ,OAAO,EAAE,yBAAyB;gBAClC,qBAAqB,EAAE,CAAC,IAAI,CAAC;aAClB;YACf,OAAO,EAAE;gBACL,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE;gBACzD,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,EAAE;aACnE;SACJ,CAAC,EACN,4BAA4B,CAC/B,CAAC;IACN,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"nas-volumes.test.js","sourceRoot":"","sources":["../../src/nas-volumes.test.ts"],"names":[],"mappings":"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"}

package/dist/src/session-im-context.d.ts

@@ -8,5 +8,6 @@ export declare function getSessionImContext(sessionKey: string): {
     replyToMsgId: string;
     agentId: string;
 } | undefined;
+export declare function clearSessionImContext(sessionKey: string, expectedReplyToMsgId?: string): boolean;
 export declare function touchSessionImContext(sessionKey: string): void;
 //# sourceMappingURL=session-im-context.d.ts.map

package/dist/src/session-im-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-im-context.d.ts","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AA6BA,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9D,IAAI,CAGN;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAOxE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAK9D"}
+{"version":3,"file":"session-im-context.d.ts","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AA6BA,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC9D,IAAI,CAGN;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAOxE;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhG;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAK9D"}

package/dist/src/session-im-context.js

@@ -27,6 +27,15 @@ export function getSessionImContext(sessionKey) {
     }
     return undefined;
 }
+export function clearSessionImContext(sessionKey, expectedReplyToMsgId) {
+    const current = sessionCtxMap.get(sessionKey);
+    if (!current || (expectedReplyToMsgId && current.replyToMsgId !== expectedReplyToMsgId)) {
+        return false;
+    }
+    clearCleanupTimer(sessionKey);
+    sessionCtxMap.delete(sessionKey);
+    return true;
+}
 export function touchSessionImContext(sessionKey) {
     if (sessionCtxMap.has(sessionKey)) {
         clearCleanupTimer(sessionKey);

package/dist/src/session-im-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-im-context.js","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,IAAI,GAAG,EAIzB,CAAA;AAEJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAA;AAEtE,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEvC,SAAS,iBAAiB,CAAC,UAAkB;IAC3C,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACpB,YAAY,CAAC,CAAC,CAAC,CAAA;QACf,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB;IACzC,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,GAAG,CACf,UAAU,EACV,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAChC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB,EAClB,GAA+D;IAE/D,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAClC,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB;IAElB,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;IAC7B,CAAC;AACH,CAAC"}
+{"version":3,"file":"session-im-context.js","sourceRoot":"","sources":["../../src/session-im-context.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAG,IAAI,GAAG,EAIzB,CAAA;AAEJ,MAAM,aAAa,GAAG,IAAI,GAAG,EAAyC,CAAA;AAEtE,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEvC,SAAS,iBAAiB,CAAC,UAAkB;IAC3C,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACvC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QACpB,YAAY,CAAC,CAAC,CAAC,CAAA;QACf,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB;IACzC,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,GAAG,CACf,UAAU,EACV,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAChC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAClC,CAAC,EAAE,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB,EAClB,GAA+D;IAE/D,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAClC,eAAe,CAAC,UAAU,CAAC,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,UAAkB;IAElB,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;QAC3B,OAAO,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB,EAAE,oBAA6B;IACrF,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAC7C,IAAI,CAAC,OAAO,IAAI,CAAC,oBAAoB,IAAI,OAAO,CAAC,YAAY,KAAK,oBAAoB,CAAC,EAAE,CAAC;QACxF,OAAO,KAAK,CAAA;IACd,CAAC;IACD,iBAAiB,CAAC,UAAU,CAAC,CAAA;IAC7B,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IAChC,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,IAAI,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC7B,eAAe,CAAC,UAAU,CAAC,CAAA;IAC7B,CAAC;AACH,CAAC"}

package/dist/src/single-chat-no-reply-fallback.d.ts

@@ -0,0 +1,14 @@
+/**
+ * 单聊轮次结束但未向 IM 发出正文时的兜底话术（如模型输出 NO_REPLY、deliver 未被调用）。
+ */
+import type { WsMessageParams } from "./types.js";
+export declare function shouldSendSingleChatNoReplyFallback(args: {
+    params: WsMessageParams;
+    hasFirstReply: boolean;
+    deliverCallCount: number;
+    dispatchError?: unknown;
+    lastDeliverError?: unknown;
+}): boolean;
+/** 单聊静默轮次兜底：简短告知并引导重试。 */
+export declare function buildSingleChatNoReplyFallbackText(): string;
+//# sourceMappingURL=single-chat-no-reply-fallback.d.ts.map

package/dist/src/single-chat-no-reply-fallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"single-chat-no-reply-fallback.d.ts","sourceRoot":"","sources":["../../src/single-chat-no-reply-fallback.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,wBAAgB,mCAAmC,CAAC,IAAI,EAAE;IACtD,MAAM,EAAE,eAAe,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,OAAO,CAMV;AAED,0BAA0B;AAC1B,wBAAgB,kCAAkC,IAAI,MAAM,CAE3D"}

package/dist/src/single-chat-no-reply-fallback.js

@@ -0,0 +1,20 @@
+/**
+ * 单聊轮次结束但未向 IM 发出正文时的兜底话术（如模型输出 NO_REPLY、deliver 未被调用）。
+ */
+import { isImSingleChat } from "./inbound-chat-type.js";
+export function shouldSendSingleChatNoReplyFallback(args) {
+    if (args.hasFirstReply)
+        return false;
+    if (args.dispatchError !== undefined || args.lastDeliverError !== undefined)
+        return false;
+    if (!isImSingleChat(args.params))
+        return false;
+    if (args.deliverCallCount > 0)
+        return false;
+    return true;
+}
+/** 单聊静默轮次兜底：简短告知并引导重试。 */
+export function buildSingleChatNoReplyFallbackText() {
+    return "消息已收到，但这一轮没有生成回复。请换个说法或把需求说具体一些后再试。";
+}
+//# sourceMappingURL=single-chat-no-reply-fallback.js.map

package/dist/src/single-chat-no-reply-fallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"single-chat-no-reply-fallback.js","sourceRoot":"","sources":["../../src/single-chat-no-reply-fallback.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,MAAM,UAAU,mCAAmC,CAAC,IAMnD;IACG,IAAI,IAAI,CAAC,aAAa;QAAE,OAAO,KAAK,CAAC;IACrC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC1F,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,IAAI,CAAC,gBAAgB,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5C,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,0BAA0B;AAC1B,MAAM,UAAU,kCAAkC;IAC9C,OAAO,qCAAqC,CAAC;AACjD,CAAC"}

package/dist/src/subagent-monitor.d.ts

@@ -1,24 +1,30 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk";
+import type { ImStreamClient } from "./connection.js";
 interface SubagentSpawnInfo {
     childSessionKey: string;
     runId: string;
     label?: string;
 }
-export type SendMessageFn = (text: string) => Promise<void>;
+export interface InterruptedSubagent {
+    runId: string;
+    label: string;
+    status: "completed" | "suspended";
+    messages: string[];
+}
 export declare function setPluginApi(api: OpenClawPluginApi): void;
-/** hook 调用：立即启动监控，发 HTTP 推送，首次 poll 立即执行 */
 export declare function startMonitor(params: {
+    roundKey: string;
+    generation: number;
     groupId: string;
     agentId: string;
+    streamClient: ImStreamClient;
+    replyToMsgId: string;
     spawn: SubagentSpawnInfo;
-}): void;
-/** dispatch 中 BEGIN 后调用：写入 replyToMsgId */
-export declare function storeReplyToMsgId(groupId: string, replyToMsgId: string): void;
-/** 检查指定 groupId 是否有活跃的 subagent（用于判断是否延迟 FINISHED） */
-export declare function hasActiveSubagents(groupId: string): boolean;
-/** 记录延迟的 FINISHED，等所有 subagent 完成后发送 */
-export declare function deferFinished(groupId: string, reason: string, replyToMsgId: string): void;
-/** subagent_ended hook 调用 */
+}): boolean;
+export declare function hasActiveSubagents(roundKey: string, generation: number): boolean;
+export declare function deferFinished(roundKey: string, generation: number, reason: string): void;
+export declare function prepareSubagentInterrupt(roundKey: string, generation: number, now?: number): InterruptedSubagent[];
 export declare function markSubagentCompleted(childSessionKey: string, runId: string): void;
+export declare function __resetSubagentMonitorForTests(): void;
 export {};
 //# sourceMappingURL=subagent-monitor.d.ts.map

package/dist/src/subagent-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAM7D,UAAU,iBAAiB;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAaD,MAAM,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAiC5D,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAGzD;AAED,4CAA4C;AAC5C,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,iBAAiB,CAAC;CAC1B,GAAG,IAAI,CA8CP;AAED,2CAA2C;AAC3C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAc7E;AAED,sDAAsD;AACtD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAS3D;AAED,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,CAGzF;AA8BD,6BAA6B;AAC7B,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CA8ElF"}
+{"version":3,"file":"subagent-monitor.d.ts","sourceRoot":"","sources":["../../src/subagent-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,UAAU,iBAAiB;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAmBD,MAAM,WAAW,mBAAmB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,GAAG,WAAW,CAAC;IAClC,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB;AAiBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI,CAEzD;AAkCD,wBAAgB,YAAY,CAAC,MAAM,EAAE;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,cAAc,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,iBAAiB,CAAC;CAC5B,GAAG,OAAO,CAuCV;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAOhF;AAED,wBAAgB,aAAa,CACzB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACf,IAAI,CAEN;AAED,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,GAAG,SAAa,GACjB,mBAAmB,EAAE,CAiBvB;AAED,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAmBlF;AAiID,wBAAgB,8BAA8B,IAAI,IAAI,CASrD"}