@xgjktech/xg_cwork_im 1.18.8 → 1.19.0

package/dist/src/plan-tool-middleware.d.ts

@@ -1,24 +1,16 @@
 import type { OpenClawPluginApi } from "openclaw/plugin-sdk/channel-plugin-common";
-import { type Plan } from "@xgjktech/xg-openclaw-shared";
 import type { ActionDispatchEvent } from "./action-store-access.js";
 export type AgentToolResultMiddleware = Parameters<OpenClawPluginApi["registerAgentToolResultMiddleware"]>[0];
 export interface PlanMiddlewareDeps {
-    /** 按 planId 反查权威状态（注入 TASK-2 的 getPlanById） */
-    getPlanById: (planId: string) => Plan | undefined;
-    /** 发送 PLAN_STAT 增量事件（注入实现，便于单测假实现；本身设计为同步返回、内部自行 catch） */
-    sendPlanStat: (params: {
-        plan: Plan;
-        source: "tool" | "snapshot";
-    }) => void;
     /** 按 eventId 反查 action 的权威状态。 */
     getActionById: (eventId: string) => ActionDispatchEvent | undefined;
     /** 推送 Action Dispatch 事件（内部 fire-and-forget）。 */
     sendActionRunEvent: (action: ActionDispatchEvent) => void;
 }
 /**
- * 创建计划工具结果的 middleware handler。
+ * 创建 xg_action_dispatch 工具结果的 middleware handler。
  *
- * 三条硬约束（RULING-1 §2 / DESIGN.md D1b，红线）：
+ * 三条硬约束（沿用 RULING-1 红线）：
  * 1. 绝不抛异常：全身 try/catch，捕获后记 warn 并正常返回。
  * 2. 绝不修改结果：恒返回 void，不 mutate event.result。
  * 3. 不在 handler 内 await 网络 IO。

package/dist/src/plan-tool-middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-tool-middleware.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,EAAmB,KAAK,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAG1E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAC9C,iBAAiB,CAAC,mCAAmC,CAAC,CACzD,CAAC,CAAC,CAAC,CAAC;AAOL,MAAM,WAAW,kBAAkB;IAC/B,+CAA+C;IAC/C,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,SAAS,CAAC;IAClD,2DAA2D;IAC3D,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAAA;KAAE,KAAK,IAAI,CAAC;IAC5E,iCAAiC;IACjC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,GAAG,SAAS,CAAC;IACpE,iDAAiD;IACjD,kBAAkB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAC7D;AAwDD;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,kBAAkB,GAAG,yBAAyB,CAyDlG"}
+{"version":3,"file":"plan-tool-middleware.d.ts","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AACnF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,MAAM,MAAM,yBAAyB,GAAG,UAAU,CAC9C,iBAAiB,CAAC,mCAAmC,CAAC,CACzD,CAAC,CAAC,CAAC,CAAC;AAML,MAAM,WAAW,kBAAkB;IAC/B,iCAAiC;IACjC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,mBAAmB,GAAG,SAAS,CAAC;IACpE,iDAAiD;IACjD,kBAAkB,EAAE,CAAC,MAAM,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAC7D;AA+BD;;;;;;;GAOG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,kBAAkB,GAAG,yBAAyB,CAuBlG"}

package/dist/src/plan-tool-middleware.js

@@ -1,9 +1,5 @@
-import { isPlanCancelled } from "@xgjktech/xg-openclaw-shared";
-import { buildBlockedTelemetryLine, collectBlockedNotices } from "./plan-blocked-notice.js";
-import { parsePlanToolResultFromValue } from "./plan-tool-result.js";
-const PLAN_TOOL_NAME = "xg_plan_write";
 const ACTION_TOOL_NAME = "xg_action_dispatch";
-const LOG_PREFIX = "[xg_cwork_im] [plan-tool-middleware]";
+const LOG_PREFIX = "[xg_cwork_im] [action-tool-middleware]";
 function extractActionEventId(event) {
     const values = [event.result.details, safeJsonParse(firstTextContent(event.result) ?? "")];
     for (const value of values) {
@@ -23,27 +19,6 @@ function firstTextContent(result) {
     }
     return first.text;
 }
-/**
- * 从 middleware 事件中取计划工具结果（优先级见 DESIGN.md D1）：
- * 1. `event.result.details`（结构守卫，纯对象无需 JSON.parse）
- * 2. 回退解析 `event.result.content[0].text`
- * 都拿不到 → undefined
- */
-function extractPlanToolResult(event) {
-    const fromDetails = parsePlanToolResultFromValue(event.result.details);
-    if (fromDetails) {
-        return fromDetails;
-    }
-    const text = firstTextContent(event.result);
-    if (text === undefined) {
-        return undefined;
-    }
-    const fromText = parsePlanToolResultFromValue(safeJsonParse(text));
-    if (fromText) {
-        return fromText;
-    }
-    return undefined;
-}
 function safeJsonParse(text) {
     try {
         return JSON.parse(text);
@@ -53,9 +28,9 @@ function safeJsonParse(text) {
     }
 }
 /**
- * 创建计划工具结果的 middleware handler。
+ * 创建 xg_action_dispatch 工具结果的 middleware handler。
  *
- * 三条硬约束（RULING-1 §2 / DESIGN.md D1b，红线）：
+ * 三条硬约束（沿用 RULING-1 红线）：
  * 1. 绝不抛异常：全身 try/catch，捕获后记 warn 并正常返回。
  * 2. 绝不修改结果：恒返回 void，不 mutate event.result。
  * 3. 不在 handler 内 await 网络 IO。
@@ -63,44 +38,20 @@ function safeJsonParse(text) {
 export function createPlanToolResultMiddleware(deps) {
     return (event, _ctx) => {
         try {
-            if (event.toolName === ACTION_TOOL_NAME) {
-                const eventId = extractActionEventId(event);
-                if (!eventId) {
-                    console.warn(`${LOG_PREFIX} 无法从 action 工具返回中解析 eventId toolCallId=${event.toolCallId}`);
-                    return;
-                }
-                const action = deps.getActionById(eventId);
-                if (!action) {
-                    console.warn(`${LOG_PREFIX} 反查不到 action，跳过 toolCallId=${event.toolCallId} eventId=${eventId}`);
-                    return;
-                }
-                deps.sendActionRunEvent(action);
+            if (event.toolName !== ACTION_TOOL_NAME) {
                 return;
             }
-            if (event.toolName !== PLAN_TOOL_NAME) {
+            const eventId = extractActionEventId(event);
+            if (!eventId) {
+                console.warn(`${LOG_PREFIX} 无法从 action 工具返回中解析 eventId toolCallId=${event.toolCallId}`);
                 return;
             }
-            const extracted = extractPlanToolResult(event);
-            if (!extracted) {
-                console.warn(`${LOG_PREFIX} 无法从工具返回中解析出合法 plan toolName=${event.toolName} toolCallId=${event.toolCallId}`);
+            const action = deps.getActionById(eventId);
+            if (!action) {
+                console.warn(`${LOG_PREFIX} 反查不到 action，跳过 toolCallId=${event.toolCallId} eventId=${eventId}`);
                 return;
             }
-            const authoritative = deps.getPlanById(extracted.planId);
-            const plan = authoritative ?? extracted.plan;
-            if (!plan) {
-                console.warn(`${LOG_PREFIX} 反查不到 plan 且工具返回不含完整 plan，跳过 toolName=${event.toolName} toolCallId=${event.toolCallId} planId=${extracted.planId}`);
-                return;
-            }
-            // D2：每一条 blocked notice 都打一行遥测日志，不做任何去重——
-            // 日志重复恰恰是监控需要的频次信号（推群时代的去重是为了防刷屏，已不适用）。
-            if (!isPlanCancelled(plan)) {
-                for (const notice of collectBlockedNotices(plan)) {
-                    console.warn(buildBlockedTelemetryLine(plan, notice, event.toolName));
-                }
-            }
-            // D3：每次 xg_plan_write 成功调用都发一条 PLAN_STAT 增量，不做 diff、不去重。
-            // sendPlanStat 本身设计为同步返回、内部自行 catch，天然满足 fire-and-forget。
-            deps.sendPlanStat({ plan, source: "tool" });
+            deps.sendActionRunEvent(action);
             return;
         }
         catch (err) {

package/dist/src/plan-tool-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"plan-tool-middleware.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plan-tool-middleware.js","sourceRoot":"","sources":["../../src/plan-tool-middleware.ts"],"names":[],"mappings":"AAOA,MAAM,gBAAgB,GAAG,oBAAoB,CAAC;AAE9C,MAAM,UAAU,GAAG,wCAAwC,CAAC;AAS5D,SAAS,oBAAoB,CAAC,KAAwF;IAClH,MAAM,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3F,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAgC,CAAC;YAChD,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC3F,OAAO,MAAM,CAAC,OAAO,CAAC;YAC1B,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAS,gBAAgB,CAAC,MAA2D;IACjF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpE,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACtB,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IAC/B,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAwB;IACnE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACnB,IAAI,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,KAAK,gBAAgB,EAAE,CAAC;gBACtC,OAAO;YACX,CAAC;YACD,MAAM,OAAO,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,0CAA0C,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;gBACxF,OAAO;YACX,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,8BAA8B,KAAK,CAAC,UAAU,YAAY,OAAO,EAAE,CAAC,CAAC;gBAC/F,OAAO;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;QACX,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,qBAAqB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC9D,OAAO;QACX,CAAC;IACL,CAAC,CAAC;AACN,CAAC"}