@xgjktech/xg-openclaw-harness-tools 0.4.7 → 0.4.8

package/README.md

@@ -107,10 +107,13 @@ task；写入 schema 不接受 steps，但读取旧计划仍兼容旧 steps 数
 
 ## 主动计划提示词注入（before_prompt_build）
 
-插件在 `register` 时挂载 `before_prompt_build` hook，用 `appendSystemContext` 向每个 agent 的
+插件在 `register` 时挂载 `before_prompt_build` hook，用 `appendSystemContext` 向**主 agent** 的
 system prompt 追加一段"主动工作计划"纪律（`src/plan-prompt.ts`）：多步工作先建计划、逐项整张回写、
 blocked 带 note、台账≠执行。内容与工具 description 一致，仅抬升"主动触发"的优先级。
 
+- **subagent 不参与计划**：hook 通过 `isSubagentSessionKey(sessionKey)` 识别 subagent 会话，
+  对 subagent 不注入纪律；同时 `xg_plan_write` / `xg_plan_view` 两个工具在 subagent 会话的
+  factory 阶段返回 `null` 不注册，只有主 agent 能建计划，避免 subagent 建计划污染主面板。
 - **与其他注入不冲突**：IM 通道的 `GroupSystemPrompt` 落在 base system prompt，本段追加在其后，
   纯叠加不覆盖；对内置 runtime 与 Codex runtime 均生效。
 - **如需关闭**：在部署配置里对该插件入口设 `hooks.allowPromptInjection: false`（默认放行）：

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,QAAA,MAAM,WAAW,kEAqDf,CAAC;AAUH,eAAe,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AA+BA,QAAA,MAAM,WAAW,kEA6Df,CAAC;AAaH,eAAe,WAAW,CAAC"}

package/dist/index.js

@@ -1,4 +1,5 @@
 import { defineToolPlugin } from "openclaw/plugin-sdk/tool-plugin";
+import { isSubagentSessionKey } from "openclaw/plugin-sdk/routing";
 import { resolvePlanDbPath, SqlitePlanStore, SqliteActionStore } from "@xgjktech/xg-openclaw-shared";
 import { PLAN_WRITE_DESCRIPTION, PlanWriteParams, buildPlanWriteTool } from "./plan-write-tool.js";
 import { PLAN_VIEW_DESCRIPTION, PlanViewParams, buildPlanViewTool, } from "./plan-view-tool.js";
@@ -6,6 +7,15 @@ import { ACTION_DISPATCH_DESCRIPTION, ActionDispatchParams, buildActionDispatchT
 import { toPlanOrigin } from "./plan-origin.js";
 import { buildPlanPromptInjection } from "./plan-prompt.js";
 const PLUGIN_ID = "xg-harness-tools";
+// 临时诊断日志：确认 subagent 会话的 sessionKey 是否到达 hook/tool factory 且判定正确。确认后删除。
+function logPlanGate(api, tag, sessionKey) {
+    api.runtime?.logging
+        ?.getChildLogger({ plugin: PLUGIN_ID })
+        ?.info?.(`plan-gate:${tag}`, {
+        sessionKey: sessionKey ?? null,
+        subagent: isSubagentSessionKey(sessionKey),
+    });
+}
 const pluginEntry = defineToolPlugin({
     id: PLUGIN_ID,
     name: "XG Harness Tools",
@@ -34,7 +44,13 @@ const pluginEntry = defineToolPlugin({
                 description: PLAN_WRITE_DESCRIPTION,
                 parameters: PlanWriteParams,
                 optional: true,
-                factory: ({ api, toolContext }) => buildPlanWriteTool(getPlanStore(api), toPlanOrigin(toolContext)),
+                factory: ({ api, toolContext }) => {
+                    // 计划只允许主 agent 维护；subagent 会话不注册计划工具，杜绝其建计划。
+                    logPlanGate(api, "plan_write_factory", toolContext.sessionKey);
+                    if (isSubagentSessionKey(toolContext.sessionKey))
+                        return null;
+                    return buildPlanWriteTool(getPlanStore(api), toPlanOrigin(toolContext));
+                },
             }),
             tool({
                 name: "xg_plan_view",
@@ -42,7 +58,12 @@ const pluginEntry = defineToolPlugin({
                 description: PLAN_VIEW_DESCRIPTION,
                 parameters: PlanViewParams,
                 optional: true,
-                factory: ({ api, toolContext }) => buildPlanViewTool({ store: getPlanStore(api), origin: toPlanOrigin(toolContext) }),
+                factory: ({ api, toolContext }) => {
+                    logPlanGate(api, "plan_view_factory", toolContext.sessionKey);
+                    if (isSubagentSessionKey(toolContext.sessionKey))
+                        return null;
+                    return buildPlanViewTool({ store: getPlanStore(api), origin: toPlanOrigin(toolContext) });
+                },
             }),
             tool({
                 name: "xg_action_dispatch",
@@ -60,6 +81,9 @@ const pluginEntry = defineToolPlugin({
 const baseRegister = pluginEntry.register;
 pluginEntry.register = (api) => {
     baseRegister(api);
-    api.on("before_prompt_build", buildPlanPromptInjection);
+    api.on("before_prompt_build", (event, ctx) => {
+        logPlanGate(api, "hook", ctx.sessionKey);
+        return buildPlanPromptInjection(event, ctx);
+    });
 };
 export default pluginEntry;

package/dist/plan-prompt.d.ts

@@ -1,4 +1,4 @@
-import type { PluginHookBeforePromptBuildResult } from "openclaw/plugin-sdk/types";
+import type { PluginHookAgentContext, PluginHookBeforePromptBuildEvent, PluginHookBeforePromptBuildResult } from "openclaw/plugin-sdk/types";
 /**
  * 追加到 agent system prompt 的"主动建计划"纪律（appendSystemContext）。
  * 与 IM 通道的 GroupSystemPrompt 纯叠加不冲突：本段拼在 base systemPrompt 之后。
@@ -6,8 +6,9 @@ import type { PluginHookBeforePromptBuildResult } from "openclaw/plugin-sdk/type
  */
 export declare const PLAN_FIRST_SYSTEM_CONTEXT: string;
 /**
- * before_prompt_build 钩子处理器：向 agent system prompt 追加主动建计划纪律。
- * 返回 void 语义由宿主管控，插件侧始终返回该静态段。
+ * before_prompt_build 钩子处理器：仅向主 agent 的 system prompt 追加主动建计划纪律。
+ * subagent 会话（sessionKey 命中 isSubagentSessionKey）不注入，避免其主动建计划污染主面板；
+ * 返回 void 语义由宿主管控。
  */
-export declare function buildPlanPromptInjection(): PluginHookBeforePromptBuildResult;
+export declare function buildPlanPromptInjection(_event: PluginHookBeforePromptBuildEvent, ctx: PluginHookAgentContext): PluginHookBeforePromptBuildResult | void;
 //# sourceMappingURL=plan-prompt.d.ts.map

package/dist/plan-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-prompt.d.ts","sourceRoot":"","sources":["../src/plan-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,2BAA2B,CAAC;AAEnF;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAQ1B,CAAC;AAEb;;;GAGG;AACH,wBAAgB,wBAAwB,IAAI,iCAAiC,CAE5E"}
+{"version":3,"file":"plan-prompt.d.ts","sourceRoot":"","sources":["../src/plan-prompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,gCAAgC,EAChC,iCAAiC,EAClC,MAAM,2BAA2B,CAAC;AAGnC;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,QAQ1B,CAAC;AAEb;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,gCAAgC,EACxC,GAAG,EAAE,sBAAsB,GAC1B,iCAAiC,GAAG,IAAI,CAG1C"}

package/dist/plan-prompt.js

@@ -1,3 +1,4 @@
+import { isSubagentSessionKey } from "openclaw/plugin-sdk/routing";
 /**
  * 追加到 agent system prompt 的"主动建计划"纪律（appendSystemContext）。
  * 与 IM 通道的 GroupSystemPrompt 纯叠加不冲突：本段拼在 base systemPrompt 之后。
@@ -13,9 +14,12 @@ export const PLAN_FIRST_SYSTEM_CONTEXT = [
     "- xg_plan_write / xg_plan_view 只是台账，不执行、不调度、无后台运行；保存/查看之后必须继续逐项实际执行任务。",
 ].join("\n");
 /**
- * before_prompt_build 钩子处理器：向 agent system prompt 追加主动建计划纪律。
- * 返回 void 语义由宿主管控，插件侧始终返回该静态段。
+ * before_prompt_build 钩子处理器：仅向主 agent 的 system prompt 追加主动建计划纪律。
+ * subagent 会话（sessionKey 命中 isSubagentSessionKey）不注入，避免其主动建计划污染主面板；
+ * 返回 void 语义由宿主管控。
  */
-export function buildPlanPromptInjection() {
+export function buildPlanPromptInjection(_event, ctx) {
+    if (isSubagentSessionKey(ctx.sessionKey))
+        return undefined;
     return { appendSystemContext: PLAN_FIRST_SYSTEM_CONTEXT };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xgjktech/xg-openclaw-harness-tools",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "企业工具插件：plan_write / plan_view / action_dispatch（OpenClaw 第三方工具插件）",
   "license": "MIT",
   "type": "module",