aws-runtime-bridge 1.9.108 → 1.9.110

package/package/aws-client-agent-mcp/dist/mcp-server.test.js

@@ -56,6 +56,15 @@ async function withScopedMemoryServers(callback) {
 function getHandleToolCall(server) {
     return Reflect.get(server, "handleToolCall");
 }
+/**
+ * 测试辅助：访问 McpServer 的私有 messageBuffer（WebSocket 本地消息队列），
+ * 用于模拟外部消息到达后唤醒阻塞中的 poll_message。
+ * 注意：直接依赖私有字段名，若 mcp-server.ts 重命名该字段需同步修改本函数，
+ * 避免测试在字段改名后静默失效（Reflect 访问不会报编译错误）。
+ */
+function getMessageBuffer(server) {
+    return Reflect.get(server, "messageBuffer");
+}
 function attachMemoryStatsReporter(server, reportedStats) {
     const existingClient = Reflect.get(server, "agentClient");
     Reflect.set(server, "agentClient", {
@@ -167,7 +176,7 @@ describe("McpServer unread backlog hydration", () => {
         });
         // Simulate a WebSocket message arriving after hydration returns empty.
         // poll_message must keep blocking on the local buffer until the message arrives.
-        const buffer = Reflect.get(server, "messageBuffer");
+        const buffer = getMessageBuffer(server);
         setTimeout(() => {
             buffer.push(directMessage);
         }, 50);
@@ -202,7 +211,7 @@ describe("McpServer unread backlog hydration", () => {
             },
         });
         // Simulate WebSocket message arriving after hydration fails
-        const buffer = Reflect.get(server, "messageBuffer");
+        const buffer = getMessageBuffer(server);
         setTimeout(() => {
             buffer.push(directMessage);
         }, 50);
@@ -233,7 +242,7 @@ describe("McpServer unread backlog hydration", () => {
             directMessages: [],
             groupMessages: [groupMessage],
         });
-        const messageBuffer = Reflect.get(server, "messageBuffer");
+        const messageBuffer = getMessageBuffer(server);
         messageBuffer.setProfileMessage({
             id: "agent-1",
             displayName: "Agent One",
@@ -469,7 +478,7 @@ describe("McpServer unread backlog hydration", () => {
                 return { directMessages: [taskNotification], groupMessages: [] };
             },
         });
-        const messageBuffer = Reflect.get(server, "messageBuffer");
+        const messageBuffer = getMessageBuffer(server);
         messageBuffer.push(cachedMessage);
         const handleToolCall = getHandleToolCall(server);
         const result = (await handleToolCall.call(server, "poll_message", {}));
@@ -501,7 +510,7 @@ describe("McpServer unread backlog hydration", () => {
             },
         });
         // Simulate WebSocket message arriving after backend returns empty
-        const buffer = Reflect.get(server, "messageBuffer");
+        const buffer = getMessageBuffer(server);
         setTimeout(() => {
             buffer.push(delayedMessage);
         }, 50);
@@ -1129,7 +1138,7 @@ describe("McpServer memory tools", () => {
                 });
             }
             // Override poll to resolve immediately with empty (simulating timeout without waiting 30s)
-            const buffer = Reflect.get(server, "messageBuffer");
+            const buffer = getMessageBuffer(server);
             let pollCallCount = 0;
             buffer.poll = ((_timeoutMs) => {
                 pollCallCount++;
@@ -1144,7 +1153,7 @@ describe("McpServer memory tools", () => {
             assert.equal(result.directMessages[0]?.receiverId, "agent-self");
             assert.match(result.directMessages[0]?.content ?? "", /本地 memory 已超过建议容量/);
             assert.match(result.directMessages[0]?.content ?? "", /get_memory_stats/);
-            assert.match(result.directMessages[0]?.prompt ?? "", /无需持久化/);
+            assert.equal(result.directMessages[0]?.prompt, undefined);
             // 非紧急类在初始路径直接返回，不进入 while 循环
             assert.equal(pollCallCount, 0);
         });
@@ -1215,7 +1224,7 @@ describe("McpServer memory tools", () => {
             assert.equal(result.directMessages[0]?.receiverId, "agent-self");
             assert.match(result.directMessages[0]?.content ?? "", /本地 memory 已超过建议容量/);
             assert.match(result.directMessages[0]?.content ?? "", /agent_memory\/recent 类型下当前 33 条 memory/);
-            assert.match(result.directMessages[0]?.prompt ?? "", /无需持久化/);
+            assert.equal(result.directMessages[0]?.prompt, undefined);
         });
     });
     it("rejects incomplete memory update arguments", async () => {
@@ -1232,6 +1241,48 @@ describe("McpServer memory tools", () => {
             }), /old_string and new_string must be provided together/);
         });
     });
+    it("get_message with _aws_force_inject returns only force messages and keeps normal ones", async () => {
+        await withMemoryServer(async (server) => {
+            const handleToolCall = getHandleToolCall(server);
+            Reflect.set(server, "agentClient", {
+                fetchUnreadMessages: async () => ({
+                    directMessages: [],
+                    groupMessages: [],
+                }),
+                getState: () => ({ agentId: "agent-self" }),
+                getStatusReporter: () => null,
+            });
+            const messageBuffer = getMessageBuffer(server);
+            messageBuffer.push({
+                msgId: "dm-force-1",
+                senderId: "human-1",
+                senderName: "Human One",
+                content: "紧急消息",
+                requireReply: false,
+                force: true,
+                timestamp: new Date().toISOString(),
+            });
+            messageBuffer.push({
+                msgId: "dm-normal-1",
+                senderId: "agent-2",
+                senderName: "Agent Two",
+                content: "普通消息",
+                requireReply: false,
+                timestamp: new Date().toISOString(),
+            });
+            // runtime 迭代边界强制注入调用：只取 force=true 的私信
+            const result = (await handleToolCall.call(server, "get_message", {
+                _aws_force_inject: true,
+            }));
+            assert.equal(result.directMessages.length, 1);
+            assert.equal(result.directMessages[0]?.msgId, "dm-force-1");
+            assert.equal(result.groupMessages.length, 0);
+            // 普通消息留在缓冲区，下一次 get_message 正常返回
+            const rest = (await handleToolCall.call(server, "get_message", {}));
+            assert.equal(rest.directMessages.length, 1);
+            assert.equal(rest.directMessages[0]?.msgId, "dm-normal-1");
+        });
+    });
     it("redacts memory content from status reporting", async () => {
         await withMemoryServer(async (server) => {
             const reported = [];
@@ -1737,7 +1788,7 @@ describe("McpServer incoming group message filtering", () => {
         };
         const handleIncomingMessage = Reflect.get(server, "handleIncomingMessage");
         await handleIncomingMessage.call(server, selfGroupMessage);
-        const messageBuffer = Reflect.get(server, "messageBuffer");
+        const messageBuffer = getMessageBuffer(server);
         const drained = messageBuffer.get();
         assert.deepEqual(drained, {
             directMessages: [],
@@ -1767,7 +1818,7 @@ describe("McpServer incoming group message filtering", () => {
         };
         const handleIncomingMessage = Reflect.get(server, "handleIncomingMessage");
         await handleIncomingMessage.call(server, taskAssignedMessage);
-        const messageBuffer = Reflect.get(server, "messageBuffer");
+        const messageBuffer = getMessageBuffer(server);
         const drained = messageBuffer.get();
         assert.deepEqual(drained, {
             directMessages: [],
@@ -1967,7 +2018,7 @@ describe("AgentClient group room aggregation", () => {
         assert.equal(result.count, 2);
     });
 });
-describe("McpServer todo reminder on poll_message", () => {
+describe("McpServer todo guard on poll_message", () => {
     // 使用唯一 agentId 避免污染开发者真实 todo 文件；每次测试写入并清理
     const testAgentId = `test-todo-reminder-${process.pid}-${Date.now()}`;
     const todoDir = path.join(os.homedir(), ".acode", "todos");
@@ -2004,7 +2055,7 @@ describe("McpServer todo reminder on poll_message", () => {
             timestamp: new Date().toISOString(),
         };
     }
-    it("returns todo alone when incomplete todos exist and no unread messages", async () => {
+    it("returns todo block message when incomplete todos exist", async () => {
         await writeTodoFile([
             { content: "任务A", status: "pending", priority: "high" },
             { content: "任务B", status: "completed", priority: "low" },
@@ -2012,51 +2063,48 @@ describe("McpServer todo reminder on poll_message", () => {
         try {
             const server = createServerForTodo();
             const handleToolCall = getHandleToolCall(server);
+            // 有未完成 todo 时 poll_message 正常 JSON 返回提示消息（非异常）
             const result = (await handleToolCall.call(server, "poll_message", {}));
-            // 无未读消息时，todo 单独返回（组合2）
             assert.equal(result.directMessages.length, 1);
             assert.equal(result.directMessages[0].senderId, "MCP-System");
-            assert.equal(result.directMessages[0].senderName, "系统");
-            assert.match(result.directMessages[0].content, /Todo 列表存在 1 项未完成/);
+            assert.equal(result.directMessages[0].content, "当前有未处理的todo list不能使用poll_message阻塞获取消息");
         }
         finally {
             await cleanupTodoFile();
         }
     });
-    it("returns messages + todo when both unread messages and incomplete todos exist", async () => {
+    it("returns todo block message even with unread messages", async () => {
         await writeTodoFile([
             { content: "任务A", status: "pending", priority: "high" },
         ]);
         try {
             const server = createServerForTodo();
             // 先把消息放入 buffer，模拟已有未读消息
-            const buffer = Reflect.get(server, "messageBuffer");
+            const buffer = getMessageBuffer(server);
             const msg = makeDirectMessage("msg-before-poll");
             buffer.push(msg);
             const handleToolCall = getHandleToolCall(server);
+            // todo 前置检查在 hydrate 之前，即使有未读消息也先返回提示
             const result = (await handleToolCall.call(server, "poll_message", {}));
-            // 有未读消息 + todo -> 组合4: 未读消息 + todo
-            assert.equal(result.directMessages.length, 2);
-            assert.equal(result.directMessages[0].senderId, "MCP-System");
-            assert.match(result.directMessages[0].content, /Todo 列表存在 1 项未完成/);
-            assert.equal(result.directMessages[1].msgId, "msg-before-poll");
+            assert.equal(result.directMessages.length, 1);
+            assert.equal(result.directMessages[0].content, "当前有未处理的todo list不能使用poll_message阻塞获取消息");
         }
         finally {
             await cleanupTodoFile();
         }
     });
-    it("does not inject todo reminder when all todos are completed", async () => {
+    it("allows poll_message when all todos are completed", async () => {
         await writeTodoFile([
             { content: "任务A", status: "completed", priority: "high" },
         ]);
         try {
             const server = createServerForTodo();
-            const buffer = Reflect.get(server, "messageBuffer");
+            const buffer = getMessageBuffer(server);
             const wake = makeDirectMessage("wake-completed");
             setTimeout(() => buffer.push(wake), 50);
             const handleToolCall = getHandleToolCall(server);
             const result = (await handleToolCall.call(server, "poll_message", {}));
-            // 全完成时无 todo，进入 while 循环等待消息后返回
+            // 全完成时无未完成 todo，进入 while 循环等待消息后返回
             assert.equal(result.directMessages.length, 1);
             assert.equal(result.directMessages[0].msgId, "wake-completed");
         }
@@ -2064,62 +2112,58 @@ describe("McpServer todo reminder on poll_message", () => {
             await cleanupTodoFile();
         }
     });
-    it("returns todo alone on every poll_message when incomplete todos exist", async () => {
+    it("allows poll_message when todo file is absent", async () => {
+        // 确保文件不存在
+        await cleanupTodoFile();
+        const server = createServerForTodo();
+        const buffer = getMessageBuffer(server);
+        const wake = makeDirectMessage("wake-no-file");
+        setTimeout(() => buffer.push(wake), 50);
+        const handleToolCall = getHandleToolCall(server);
+        const result = (await handleToolCall.call(server, "poll_message", {}));
+        // 无 todo 文件 -> 进入 while 循环等待消息后返回
+        assert.equal(result.directMessages.length, 1);
+        assert.equal(result.directMessages[0].msgId, "wake-no-file");
+    });
+    it("returns todo block message when todo has in_progress status", async () => {
         await writeTodoFile([
-            { content: "任务A", status: "pending", priority: "high" },
+            { content: "任务A", status: "in_progress", priority: "high" },
         ]);
         try {
             const server = createServerForTodo();
             const handleToolCall = getHandleToolCall(server);
-            // 第一次 poll：无未读消息 -> todo 单独返回（组合2）
-            const result1 = (await handleToolCall.call(server, "poll_message", {}));
-            assert.equal(result1.directMessages.length, 1);
-            assert.match(result1.directMessages[0].content, /Todo 列表存在 1 项未完成/);
-            // 第二次 poll（待办未变）：仍返回 todo
-            const result2 = (await handleToolCall.call(server, "poll_message", {}));
-            assert.equal(result2.directMessages.length, 1);
-            assert.match(result2.directMessages[0].content, /Todo 列表存在 1 项未完成/);
+            const result = (await handleToolCall.call(server, "poll_message", {}));
+            assert.equal(result.directMessages.length, 1);
+            assert.equal(result.directMessages[0].content, "当前有未处理的todo list不能使用poll_message阻塞获取消息");
         }
         finally {
             await cleanupTodoFile();
         }
     });
-    it("returns todo with updated count when todo file changes", async () => {
+    it("allows poll_message again after todos are all completed", async () => {
         await writeTodoFile([
             { content: "任务A", status: "pending", priority: "high" },
         ]);
         try {
             const server = createServerForTodo();
             const handleToolCall = getHandleToolCall(server);
-            // 第一次 poll：1 项未完成
+            // 第一次 poll：有未完成项 -> 返回提示消息（正常 JSON）
             const result1 = (await handleToolCall.call(server, "poll_message", {}));
             assert.equal(result1.directMessages.length, 1);
-            assert.match(result1.directMessages[0].content, /Todo 列表存在 1 项未完成/);
-            // 修改 todo：新增一项
+            assert.equal(result1.directMessages[0].content, "当前有未处理的todo list不能使用poll_message阻塞获取消息");
+            // 全部完成后：poll_message 恢复正常阻塞，等消息返回
             await writeTodoFile([
-                { content: "任务A", status: "pending", priority: "high" },
-                { content: "任务B", status: "in_progress", priority: "medium" },
+                { content: "任务A", status: "completed", priority: "high" },
             ]);
-            // 第二次 poll：2 项未完成
-            const result2 = (await handleToolCall.call(server, "poll_message", {}));
-            assert.equal(result2.directMessages.length, 1);
-            assert.match(result2.directMessages[0].content, /Todo 列表存在 2 项未完成/);
+            const buffer = getMessageBuffer(server);
+            const wake = makeDirectMessage("wake-after-complete");
+            setTimeout(() => buffer.push(wake), 50);
+            const result = (await handleToolCall.call(server, "poll_message", {}));
+            assert.equal(result.directMessages.length, 1);
+            assert.equal(result.directMessages[0].msgId, "wake-after-complete");
         }
         finally {
             await cleanupTodoFile();
         }
     });
-    it("does not inject todo reminder when todo file is absent", async () => {
-        // 确保文件不存在
-        await cleanupTodoFile();
-        const server = createServerForTodo();
-        const buffer = Reflect.get(server, "messageBuffer");
-        const wake = makeDirectMessage("wake-no-file");
-        setTimeout(() => buffer.push(wake), 50);
-        const handleToolCall = getHandleToolCall(server);
-        const result = (await handleToolCall.call(server, "poll_message", {}));
-        // 无 todo 文件 -> 进入 while 循环等待消息后返回
-        assert.equal(result.directMessages.length, 1);
-        assert.equal(result.directMessages[0].msgId, "wake-no-file");
-    });
 });

package/package/aws-client-agent-mcp/dist/message-buffer.d.ts

@@ -43,6 +43,8 @@ export declare class MessageBuffer {
     
     get(): ClassifiedMessages;
     
+    takeForceDirectMessages(): ClassifiedMessages;
+    
     size(): number;
     
     clear(): void;

package/package/aws-client-agent-mcp/dist/message-buffer.js

@@ -1,2 +1,2 @@
-import{logger as r}from"./logger.js";const g=500;function h(l){if(!(l.msgId===void 0||l.msgId===null))return l.msgId}class u{buffer=[];resolvers=[];onMessageArrived=null;isPolling=!1;seenMsgIds=new Map;setOnMessageArrived(e){this.onMessageArrived=e}setIsPolling(e){this.isPolling=e}markSeen(e){const s=h(e);s!==void 0&&(this.seenMsgIds.set(s,Date.now()),this.cleanupSeenMsgIds())}isDuplicate(e){const s=h(e);return s===void 0?!1:this.seenMsgIds.has(s)?!0:(this.seenMsgIds.set(s,Date.now()),this.cleanupSeenMsgIds(),!1)}cleanupSeenMsgIds(){if(this.seenMsgIds.size<=g)return;let e=0;const s=this.seenMsgIds.size-g;for(const t of this.seenMsgIds.keys()){if(e>=s)break;this.seenMsgIds.delete(t),e++}}push(e){if(this.isDuplicate(e)){r.info(`[MessageBuffer] \u5FFD\u7565\u91CD\u590D\u6D88\u606F\uFF0CmsgId: ${e.msgId}`);return}this.buffer.push(e),r.info(`[MessageBuffer] \u6D88\u606F\u5165\u7F13\u51B2\u533A\uFF0C\u5F53\u524D\u6570\u91CF: ${this.buffer.length}`),this.isPolling&&this.onMessageArrived&&(r.info("[MessageBuffer] \u68C0\u6D4B\u5230 poll \u7B49\u5F85\u4E2D\uFF0C\u89E6\u53D1\u6D88\u606F\u5230\u8FBE\u56DE\u8C03"),this.onMessageArrived()),this.tryDispatch()}setProfileMessage(e){r.info(`[MessageBuffer] \u6536\u5230 Profile \u63A8\u9001\uFF0CdisplayName: ${e.displayName}\u3002\u8EAB\u4EFD\u4FE1\u606F\u8BF7\u901A\u8FC7 get_profile \u83B7\u53D6\u3002`)}removeProfileMessage(){r.info("[MessageBuffer] removeProfileMessage \u88AB\u8C03\u7528\uFF0C\u5F53\u524D\u65E0\u9700\u79FB\u9664\u672A\u8BFB\u8EAB\u4EFD\u6D88\u606F")}hasProfileMessage(){return!1}wakeUpWaiters(){if(this.tryDispatch(),this.buffer.length===0&&this.resolvers.length>0){const e=this.resolvers.shift();e&&(this.updatePollingState(),r.info("[MessageBuffer] wakeUpWaiters: \u5524\u9192 poll \u8D70 hydrate \u91CD\u67E5"),e({directMessages:[],groupMessages:[]}))}}getProfileMessage(){return null}updatePollingState(){this.isPolling=this.resolvers.length>0}poll(e){if(r.info(`[MessageBuffer] poll() \u88AB\u8C03\u7528\uFF0Cbuffer: ${this.buffer.length}${e?`\uFF0C\u8D85\u65F6: ${e}ms`:""}`),this.buffer.length>0){const s=this.consumeAll();return r.info(`[MessageBuffer] poll \u7ACB\u5373\u8FD4\u56DE\uFF0C\u79C1\u804A: ${s.directMessages.length}\uFF0C\u7FA4\u804A: ${s.groupMessages.length}`),Promise.resolve(s)}return this.resolvers.length===0&&(this.isPolling=!0),new Promise(s=>{let t=null,n=!1;const f=i=>{if(n)return;n=!0;const o=this.resolvers.indexOf(f);o>-1&&this.resolvers.splice(o,1),t&&(clearTimeout(t),t=null),this.updatePollingState(),r.info(`[MessageBuffer] poll \u6536\u5230\u6D88\u606F\uFF0C\u79C1\u804A: ${i.directMessages.length}\uFF0C\u7FA4\u804A: ${i.groupMessages.length}`),s(i)};this.resolvers.push(f),this.tryDispatch(),e&&e>0&&(t=setTimeout(()=>{if(n)return;n=!0;const i=this.resolvers.indexOf(f);i>-1&&this.resolvers.splice(i,1),this.updatePollingState(),r.info(`[MessageBuffer] poll \u8D85\u65F6\uFF08${e}ms\uFF09\uFF0C\u8FD4\u56DE\u7A7A\u6D88\u606F`),s({directMessages:[],groupMessages:[]})},e))})}get(){if(this.buffer.length>0){const e=this.consumeAll();return r.info(`[MessageBuffer] get \u8FD4\u56DE\u6D88\u606F\uFF0C\u79C1\u804A: ${e.directMessages.length}\uFF0C\u7FA4\u804A: ${e.groupMessages.length}`),e}return{directMessages:[],groupMessages:[]}}size(){return this.buffer.length}clear(){this.buffer=[];for(const e of this.resolvers)e({directMessages:[],groupMessages:[]});this.resolvers=[],this.isPolling=!1,this.seenMsgIds.clear()}tryDispatch(){for(;this.resolvers.length>0&&this.buffer.length>0;){const e=this.resolvers.shift();if(e){const s=this.consumeAll();e(s)}}this.updatePollingState()}consumeAll(){const e=[],s=[];for(;this.buffer.length>0;){const t=this.buffer.shift();t&&(this.markSeen(t),this.isDirectMessage(t)?e.push(t):s.push(t))}return{directMessages:e,groupMessages:s}}isDirectMessage(e){return typeof e.msgId=="string"}}export{u as MessageBuffer};
+import{logger as r}from"./logger.js";const o=500;function h(n){if(!(n.msgId===void 0||n.msgId===null))return n.msgId}class u{buffer=[];resolvers=[];onMessageArrived=null;isPolling=!1;seenMsgIds=new Map;setOnMessageArrived(e){this.onMessageArrived=e}setIsPolling(e){this.isPolling=e}markSeen(e){const s=h(e);s!==void 0&&(this.seenMsgIds.set(s,Date.now()),this.cleanupSeenMsgIds())}isDuplicate(e){const s=h(e);return s===void 0?!1:this.seenMsgIds.has(s)?!0:(this.seenMsgIds.set(s,Date.now()),this.cleanupSeenMsgIds(),!1)}cleanupSeenMsgIds(){if(this.seenMsgIds.size<=o)return;let e=0;const s=this.seenMsgIds.size-o;for(const t of this.seenMsgIds.keys()){if(e>=s)break;this.seenMsgIds.delete(t),e++}}push(e){if(this.isDuplicate(e)){r.info(`[MessageBuffer] \u5FFD\u7565\u91CD\u590D\u6D88\u606F\uFF0CmsgId: ${e.msgId}`);return}this.buffer.push(e),r.info(`[MessageBuffer] \u6D88\u606F\u5165\u7F13\u51B2\u533A\uFF0C\u5F53\u524D\u6570\u91CF: ${this.buffer.length}`),this.isPolling&&this.onMessageArrived&&(r.info("[MessageBuffer] \u68C0\u6D4B\u5230 poll \u7B49\u5F85\u4E2D\uFF0C\u89E6\u53D1\u6D88\u606F\u5230\u8FBE\u56DE\u8C03"),this.onMessageArrived()),this.tryDispatch()}setProfileMessage(e){r.info(`[MessageBuffer] \u6536\u5230 Profile \u63A8\u9001\uFF0CdisplayName: ${e.displayName}\u3002\u8EAB\u4EFD\u4FE1\u606F\u8BF7\u901A\u8FC7 get_profile \u83B7\u53D6\u3002`)}removeProfileMessage(){r.info("[MessageBuffer] removeProfileMessage \u88AB\u8C03\u7528\uFF0C\u5F53\u524D\u65E0\u9700\u79FB\u9664\u672A\u8BFB\u8EAB\u4EFD\u6D88\u606F")}hasProfileMessage(){return!1}wakeUpWaiters(){if(this.tryDispatch(),this.buffer.length===0&&this.resolvers.length>0){const e=this.resolvers.shift();e&&(this.updatePollingState(),r.info("[MessageBuffer] wakeUpWaiters: \u5524\u9192 poll \u8D70 hydrate \u91CD\u67E5"),e({directMessages:[],groupMessages:[]}))}}getProfileMessage(){return null}updatePollingState(){this.isPolling=this.resolvers.length>0}poll(e){if(r.info(`[MessageBuffer] poll() \u88AB\u8C03\u7528\uFF0Cbuffer: ${this.buffer.length}${e?`\uFF0C\u8D85\u65F6: ${e}ms`:""}`),this.buffer.length>0){const s=this.consumeAll();return r.info(`[MessageBuffer] poll \u7ACB\u5373\u8FD4\u56DE\uFF0C\u79C1\u804A: ${s.directMessages.length}\uFF0C\u7FA4\u804A: ${s.groupMessages.length}`),Promise.resolve(s)}return this.resolvers.length===0&&(this.isPolling=!0),new Promise(s=>{let t=null,l=!1;const f=i=>{if(l)return;l=!0;const g=this.resolvers.indexOf(f);g>-1&&this.resolvers.splice(g,1),t&&(clearTimeout(t),t=null),this.updatePollingState(),r.info(`[MessageBuffer] poll \u6536\u5230\u6D88\u606F\uFF0C\u79C1\u804A: ${i.directMessages.length}\uFF0C\u7FA4\u804A: ${i.groupMessages.length}`),s(i)};this.resolvers.push(f),this.tryDispatch(),e&&e>0&&(t=setTimeout(()=>{if(l)return;l=!0;const i=this.resolvers.indexOf(f);i>-1&&this.resolvers.splice(i,1),this.updatePollingState(),r.info(`[MessageBuffer] poll \u8D85\u65F6\uFF08${e}ms\uFF09\uFF0C\u8FD4\u56DE\u7A7A\u6D88\u606F`),s({directMessages:[],groupMessages:[]})},e))})}get(){if(this.buffer.length>0){const e=this.consumeAll();return r.info(`[MessageBuffer] get \u8FD4\u56DE\u6D88\u606F\uFF0C\u79C1\u804A: ${e.directMessages.length}\uFF0C\u7FA4\u804A: ${e.groupMessages.length}`),e}return{directMessages:[],groupMessages:[]}}takeForceDirectMessages(){const e=[],s=[];for(const t of this.buffer)this.isDirectMessage(t)&&t.force===!0?(this.markSeen(t),e.push(t)):s.push(t);return this.buffer=s,e.length>0&&(r.info(`[MessageBuffer] takeForceDirectMessages \u53D6\u8D70\u5F3A\u5236\u79C1\u4FE1 ${e.length} \u6761\uFF0C\u5269\u4F59 ${s.length} \u6761`),this.tryDispatch()),{directMessages:e,groupMessages:[]}}size(){return this.buffer.length}clear(){this.buffer=[];for(const e of this.resolvers)e({directMessages:[],groupMessages:[]});this.resolvers=[],this.isPolling=!1,this.seenMsgIds.clear()}tryDispatch(){for(;this.resolvers.length>0&&this.buffer.length>0;){const e=this.resolvers.shift();if(e){const s=this.consumeAll();e(s)}}this.updatePollingState()}consumeAll(){const e=[],s=[];for(;this.buffer.length>0;){const t=this.buffer.shift();t&&(this.markSeen(t),this.isDirectMessage(t)?e.push(t):s.push(t))}return{directMessages:e,groupMessages:s}}isDirectMessage(e){return typeof e.msgId=="string"}}export{u as MessageBuffer};
 

package/package/aws-client-agent-mcp/dist/message-buffer.test.js

@@ -40,4 +40,43 @@ describe('MessageBuffer poll', () => {
         assert.equal(messages.groupMessages.length, 1);
         assert.deepEqual(messages.groupMessages[0], groupMessage);
     });
+    it('takeForceDirectMessages only takes force=true direct messages and keeps others', () => {
+        const buffer = new MessageBuffer();
+        const forcedMessage = {
+            msgId: 'dm-force-1',
+            senderId: 'human-1',
+            senderName: 'Human One',
+            content: '紧急：先停下处理这个',
+            requireReply: false,
+            force: true,
+            timestamp: new Date().toISOString()
+        };
+        const normalMessage = {
+            msgId: 'dm-normal-1',
+            senderId: 'agent-2',
+            senderName: 'Agent Two',
+            content: '普通消息',
+            requireReply: false,
+            timestamp: new Date().toISOString()
+        };
+        const groupMessage = {
+            msgId: 2,
+            senderId: 'human-1',
+            senderName: 'Human One',
+            content: '群消息',
+            timestamp: new Date().toISOString()
+        };
+        buffer.push(normalMessage);
+        buffer.push(groupMessage);
+        buffer.push(forcedMessage);
+        const taken = buffer.takeForceDirectMessages();
+        assert.equal(taken.directMessages.length, 1);
+        assert.deepEqual(taken.directMessages[0], forcedMessage);
+        assert.deepEqual(taken.groupMessages, []);
+        const rest = buffer.get();
+        assert.equal(rest.directMessages.length, 1);
+        assert.deepEqual(rest.directMessages[0], normalMessage);
+        assert.equal(rest.groupMessages.length, 1);
+        assert.deepEqual(rest.groupMessages[0], groupMessage);
+    });
 });

package/package/aws-client-agent-mcp/dist/types.d.ts

@@ -208,6 +208,8 @@ export interface DirectMessage {
     receiverId?: string;
     content: string;
     requireReply: boolean;
+    
+    force?: boolean;
     prompt?: string;
     
     role?: 'system' | 'user' | 'assistant';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.9.108",
+  "version": "1.9.110",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",