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

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/dist/plan-write-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-write-tool.d.ts","sourceRoot":"","sources":["../src/plan-write-tool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,SAAS,EAGf,MAAM,8BAA8B,CAAC;AAkCtC,eAAO,MAAM,eAAe;;;;;;;;;EAwB3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,sBAAsB,QA4BvB,CAAC;AA0Eb,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,CA2HtF"}
+{"version":3,"file":"plan-write-tool.d.ts","sourceRoot":"","sources":["../src/plan-write-tool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAIL,KAAK,UAAU,EACf,KAAK,SAAS,EAGf,MAAM,8BAA8B,CAAC;AAkCtC,eAAO,MAAM,eAAe;;;;;;;;;EAwB3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,sBAAsB,QA6BvB,CAAC;AA+Gb,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,CA4ItF"}

package/dist/plan-write-tool.js

@@ -62,6 +62,7 @@ export const PLAN_WRITE_DESCRIPTION = [
     "- 更新计划内容时必须重新提交 goal 和所有要保留的 tasks，包括未变化任务及其当前 status/note。只提交变化项会删除其他任务；记不清时先用 xg_plan_view 查看。",
     "- goal 用一句话；tasks 通常 3-7 项，每项是能判断是否完成的具体动作，不写 TODO、待定或内部思考。",
     "- status 为 pending、in_progress、completed 或 blocked。通常只有一项 in_progress，确实并行时可以有多项；blocked 时必须用 note 写明原因和继续所需条件。",
+    "- 已完成任务不可回退：一旦某项标记 completed，后续回写必须保持 completed，禁止改回 pending/in_progress/blocked。若执行中发现此前完成结论不成立或需返工，保留该 completed 项（可在 note 中说明返工原因），新增一条后续任务承接返工/补做，并相应调整其后的步骤。",
     "- 同一件工作只维护一份计划；任务方向变化时，先取消不再推进的旧计划（{planId, cancel:true}）再新建。",
 ].join("\n");
 function toTask(input) {
@@ -74,6 +75,32 @@ function toTask(input) {
     }
     return task;
 }
+function normalizeTaskTitle(title) {
+    return title.trim();
+}
+/**
+ * 检测"已完成任务被回退"：以规范化标题对齐旧任务与新提交任务，
+ * 凡旧任务为 completed 而新提交同名任务状态不再是 completed，即为回退。
+ * 同名任务整体删除属于整张覆盖语义（未提交即删除），不算回退。
+ */
+function findTaskStatusRegressions(existing, nextTasks) {
+    const completedTitles = new Set();
+    for (const task of existing.tasks) {
+        if (task.status === "completed") {
+            completedTitles.add(normalizeTaskTitle(task.title));
+        }
+    }
+    const regressions = [];
+    for (const task of nextTasks) {
+        const nextStatus = (task.status ?? "pending");
+        if (nextStatus === "completed")
+            continue;
+        if (completedTitles.has(normalizeTaskTitle(task.title))) {
+            regressions.push({ title: task.title, from: "completed", to: nextStatus });
+        }
+    }
+    return regressions;
+}
 function buildPlan(goal, tasks, existing, planId, origin, now) {
     const plan = {
         planId,
@@ -191,6 +218,21 @@ export function buildPlanWriteTool(store, origin) {
                         return toolJsonResult(result);
                     }
                 }
+                if (existing !== undefined) {
+                    const regressions = findTaskStatusRegressions(existing, params.tasks);
+                    if (regressions.length > 0) {
+                        const detail = `${regressions
+                            .map((regression) => `「${compactText(regression.title)}」${regression.from} → ${regression.to}`)
+                            .join("；")}。` +
+                            "已完成任务禁止回退：若执行中发现此前完成结论不成立或需返工，请保留该 completed 项，" +
+                            "新增一条后续任务说明补救/返工动作并相应调整后续步骤，而不是把已完成项改回未完成。";
+                        const result = {
+                            ok: false,
+                            error: { code: "TASK_STATUS_REGRESSION", detail },
+                        };
+                        return toolJsonResult(result);
+                    }
+                }
                 let warnings;
                 if (planIdParam === undefined && scope !== undefined) {
                     const warning = unfinishedPlanWarning(store.listPlansByOrigin(scope), Date.now());

package/package.json

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