@xgjktech/xg-openclaw-harness-tools 0.3.0 → 0.3.2

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAYA,wBAmCG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAYA,wBAoCG"}

package/dist/index.js

@@ -34,7 +34,7 @@ export default defineToolPlugin({
                 description: PLAN_EXECUTE_DESCRIPTION,
                 parameters: PlanExecuteParams,
                 optional: true,
-                factory: ({ api }) => buildPlanExecuteTool({ store: getStore(api) }),
+                factory: ({ api, toolContext }) => buildPlanExecuteTool({ store: getStore(api), origin: toPlanOrigin(toolContext) }),
             }),
         ];
     },

package/dist/plan-execute-tool.d.ts

@@ -1,6 +1,6 @@
 import { Type, type Static } from "typebox";
 import type { AnyAgentTool } from "openclaw/plugin-sdk/plugin-entry";
-import type { PlanStore } from "@xgjktech/xg-openclaw-shared";
+import { type PlanOrigin, type PlanStore } from "@xgjktech/xg-openclaw-shared";
 export declare const PlanExecuteParams: Type.TObject<{
     planId: Type.TOptional<Type.TString>;
 }>;
@@ -8,5 +8,6 @@ export type PlanExecuteParamsT = Static<typeof PlanExecuteParams>;
 export declare const PLAN_EXECUTE_DESCRIPTION: string;
 export declare function buildPlanExecuteTool(deps: {
     store: PlanStore;
+    origin?: PlanOrigin;
 }): AnyAgentTool;
 //# sourceMappingURL=plan-execute-tool.d.ts.map

package/dist/plan-execute-tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-execute-tool.d.ts","sourceRoot":"","sources":["../src/plan-execute-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,KAAK,EAAE,SAAS,EAAe,MAAM,8BAA8B,CAAC;AAI3E,eAAO,MAAM,iBAAiB;;EAK7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,wBAAwB,QAOzB,CAAC;AAOb,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,SAAS,CAAA;CAAE,GAAG,YAAY,CAsC7E"}
+{"version":3,"file":"plan-execute-tool.d.ts","sourceRoot":"","sources":["../src/plan-execute-tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,MAAM,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAGL,KAAK,UAAU,EACf,KAAK,SAAS,EAEf,MAAM,8BAA8B,CAAC;AAKtC,eAAO,MAAM,iBAAiB;;EAK7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,wBAAwB,QAQzB,CAAC;AAuBb,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,SAAS,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,YAAY,CA+ClG"}

package/dist/plan-execute-tool.js

@@ -1,19 +1,41 @@
 import { Type } from "typebox";
+import { isPlanCancelled, } from "@xgjktech/xg-openclaw-shared";
 import { renderPlanView } from "./plan-view.js";
+import { planInScope, scopeKey } from "./plan-scope.js";
 import { toolJsonResult } from "./tool-json-result.js";
 export const PlanExecuteParams = Type.Object({
     planId: Type.Optional(Type.String({ description: "要查看的计划 id；留空则列出最近计划" })),
 }, { additionalProperties: false });
 export const PLAN_EXECUTE_DESCRIPTION = [
     "用途：只读查看已保存的计划；不执行任务，也不修改计划。",
+    "只能看到当前会话来源的计划。",
     "",
     "- 带 planId：返回该计划当前的完整清单。",
     "- 不带 planId：返回最近计划的摘要列表，用于忘记或跨会话找回 planId。",
     "",
     "需要更新进度时，用 xg_plan_write 重新提交整张计划。",
 ].join("\n");
+function summarizePlan(plan) {
+    const taskCounts = { total: 0, completed: 0, blocked: 0, inProgress: 0 };
+    for (const task of plan.tasks) {
+        taskCounts.total += 1;
+        if (task.status === "completed")
+            taskCounts.completed += 1;
+        if (task.status === "blocked")
+            taskCounts.blocked += 1;
+        if (task.status === "in_progress")
+            taskCounts.inProgress += 1;
+    }
+    return {
+        planId: plan.planId,
+        goal: plan.goal,
+        updatedAt: plan.updatedAt,
+        taskCounts,
+    };
+}
 export function buildPlanExecuteTool(deps) {
-    const { store } = deps;
+    const { store, origin } = deps;
+    const scope = scopeKey(origin);
     return {
         name: "xg_plan_execute",
         label: "【xg-harness】查看计划",
@@ -23,11 +45,18 @@ export function buildPlanExecuteTool(deps) {
             const params = rawParams;
             try {
                 if (params.planId === undefined) {
-                    const result = { ok: true, plans: store.list().slice(0, 10) };
+                    const plans = scope === undefined
+                        ? []
+                        : store
+                            .listPlansByOrigin(scope)
+                            .filter((plan) => !isPlanCancelled(plan))
+                            .slice(0, 10)
+                            .map(summarizePlan);
+                    const result = { ok: true, plans };
                     return toolJsonResult(result);
                 }
                 const plan = store.get(params.planId);
-                if (plan === undefined) {
+                if (plan === undefined || !planInScope(plan, scope)) {
                     const result = { ok: false, error: { code: "PLAN_NOT_FOUND" } };
                     return toolJsonResult(result);
                 }

package/dist/plan-scope.d.ts

@@ -0,0 +1,8 @@
+import type { Plan, PlanOrigin } from "@xgjktech/xg-openclaw-shared";
+export interface PlanScope {
+    channel: string;
+    to: string;
+}
+export declare function scopeKey(origin?: PlanOrigin): PlanScope | undefined;
+export declare function planInScope(plan: Plan, scope: PlanScope | undefined): boolean;
+//# sourceMappingURL=plan-scope.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"plan-scope.d.ts","sourceRoot":"","sources":["../src/plan-scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAErE,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ;AAMD,wBAAgB,QAAQ,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,SAAS,GAAG,SAAS,CAKnE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAQ7E"}

package/dist/plan-scope.js

@@ -0,0 +1,16 @@
+function isNonEmptyString(value) {
+    return typeof value === "string" && value.trim() !== "";
+}
+export function scopeKey(origin) {
+    if (!isNonEmptyString(origin?.channel) || !isNonEmptyString(origin?.to)) {
+        return undefined;
+    }
+    return { channel: origin.channel, to: origin.to };
+}
+export function planInScope(plan, scope) {
+    const planScope = scopeKey(plan.origin);
+    return (scope !== undefined &&
+        planScope !== undefined &&
+        planScope.channel === scope.channel &&
+        planScope.to === scope.to);
+}

package/dist/plan-view.d.ts

@@ -1,3 +1,3 @@
-import type { Plan } from "@xgjktech/xg-openclaw-shared";
+import { type Plan } from "@xgjktech/xg-openclaw-shared";
 export declare function renderPlanView(plan: Plan): string;
 //# sourceMappingURL=plan-view.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"plan-view.d.ts","sourceRoot":"","sources":["../src/plan-view.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,8BAA8B,CAAC;AAoBjF,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAejD"}
+{"version":3,"file":"plan-view.d.ts","sourceRoot":"","sources":["../src/plan-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,IAAI,EAGV,MAAM,8BAA8B,CAAC;AAoBtC,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAgBjD"}

package/dist/plan-view.js

@@ -1,3 +1,4 @@
+import { isPlanCancelled, } from "@xgjktech/xg-openclaw-shared";
 const TASK_STATUS_MARKERS = {
     pending: "[ ]",
     in_progress: "[>]",
@@ -14,7 +15,8 @@ function singleLine(text) {
     return text.replace(/\s*\r?\n\s*/g, " ");
 }
 export function renderPlanView(plan) {
-    const lines = [`goal: ${singleLine(plan.goal)}`];
+    const cancelledMarker = isPlanCancelled(plan) ? "【已取消】" : "";
+    const lines = [`goal: ${cancelledMarker}${singleLine(plan.goal)}`];
     plan.tasks.forEach((task, taskIndex) => {
         const note = task.note !== undefined ? ` | note: ${singleLine(task.note)}` : "";
         lines.push(`T${taskIndex} ${TASK_STATUS_MARKERS[task.status]} ${singleLine(task.title)}${note}`);

package/dist/plan-write-tool.d.ts

@@ -3,12 +3,13 @@ import type { AnyAgentTool } from "openclaw/plugin-sdk/plugin-entry";
 import { type PlanOrigin, type PlanStore } from "@xgjktech/xg-openclaw-shared";
 export declare const PlanWriteParams: Type.TObject<{
     planId: Type.TOptional<Type.TString>;
-    goal: Type.TString;
-    tasks: Type.TArray<Type.TObject<{
+    goal: Type.TOptional<Type.TString>;
+    tasks: Type.TOptional<Type.TArray<Type.TObject<{
         title: Type.TString;
         status: Type.TOptional<Type.TUnion<[Type.TLiteral<"pending">, Type.TLiteral<"in_progress">, Type.TLiteral<"completed">, Type.TLiteral<"blocked">]>>;
         note: Type.TOptional<Type.TString>;
-    }>>;
+    }>>>;
+    cancel: Type.TOptional<Type.TBoolean>;
 }>;
 export type PlanWriteParamsT = Static<typeof PlanWriteParams>;
 export declare const PLAN_WRITE_DESCRIPTION: string;

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,EAGL,KAAK,UAAU,EACf,KAAK,SAAS,EAGf,MAAM,8BAA8B,CAAC;AA2BtC,eAAO,MAAM,eAAe;;;;;;;;EAiB3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,sBAAsB,QAkBvB,CAAC;AAwCb,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,CA2CtF"}
+{"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;AA8BtC,eAAO,MAAM,eAAe;;;;;;;;;EAwB3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,eAAO,MAAM,sBAAsB,QAmBvB,CAAC;AA0Eb,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,YAAY,CAsHtF"}

package/dist/plan-write-tool.js

@@ -1,8 +1,9 @@
 import { randomUUID } from "node:crypto";
 import { Type } from "typebox";
-import { assertPlanInvariants, } from "@xgjktech/xg-openclaw-shared";
+import { assertPlanInvariants, isPlanCancelled, } from "@xgjktech/xg-openclaw-shared";
 import { toolJsonResult } from "./tool-json-result.js";
 import { renderPlanView } from "./plan-view.js";
+import { planInScope, scopeKey } from "./plan-scope.js";
 const TaskInput = Type.Object({
     title: Type.String({
         minLength: 1,
@@ -19,16 +20,17 @@ const TaskInput = Type.Object({
 }, { additionalProperties: false });
 export const PlanWriteParams = Type.Object({
     planId: Type.Optional(Type.String({ maxLength: 128, description: "留空=新建；填写=整张覆盖该计划" })),
-    goal: Type.String({
+    goal: Type.Optional(Type.String({
         minLength: 1,
         maxLength: 500,
         description: "计划总目标，一句话说明完成态",
-    }),
-    tasks: Type.Array(TaskInput, {
+    })),
+    tasks: Type.Optional(Type.Array(TaskInput, {
         minItems: 1,
         maxItems: 20,
         description: "完整任务清单；更新时未提交的旧任务会被删除",
-    }),
+    })),
+    cancel: Type.Optional(Type.Boolean({ description: "取消该计划；true 时只需带 planId，不带 goal/tasks" })),
 }, { additionalProperties: false });
 export const PLAN_WRITE_DESCRIPTION = [
     "用途：维护一份对用户可见、可跨回合保存的任务清单。每次调用都是整张替换，不是增量更新。",
@@ -45,9 +47,10 @@ export const PLAN_WRITE_DESCRIPTION = [
     "",
     "提交规则：",
     "- 新建时不传 planId；更新时传入原 planId。",
-    "- 更新时必须重新提交 goal 和所有要保留的 tasks，包括未变化任务及其当前 status/note。只提交变化项会删除其他任务；记不清时先用 xg_plan_execute 查看。",
+    "- 更新计划内容时必须重新提交 goal 和所有要保留的 tasks，包括未变化任务及其当前 status/note。只提交变化项会删除其他任务；记不清时先用 xg_plan_execute 查看。",
     "- goal 用一句话；tasks 通常 3-7 项，每项是能判断是否完成的具体动作，不写 TODO、待定或内部思考。",
     "- status 为 pending、in_progress、completed 或 blocked。通常只有一项 in_progress，确实并行时可以有多项；blocked 时必须用 note 写明原因和继续所需条件。",
+    "- 同一件工作只维护一份计划；任务方向变化时，先取消不再推进的旧计划（{planId, cancel:true}）再新建。",
 ].join("\n");
 function toTask(input) {
     const task = {
@@ -59,24 +62,52 @@ function toTask(input) {
     }
     return task;
 }
-function buildPlan(params, existing, planId, origin) {
-    const now = new Date().toISOString();
+function buildPlan(goal, tasks, existing, planId, origin, now) {
     const plan = {
         planId,
-        goal: params.goal,
+        goal,
         createdAt: existing?.createdAt ?? now,
         updatedAt: now,
-        tasks: params.tasks.map(toTask),
+        tasks: tasks.map(toTask),
     };
-    // 改写已有计划时保留原 origin（改写是内容编辑，不是重新发起）；
-    // 仅当旧计划本就没有 origin（旧数据补齐）才写入本次采集到的 origin。
+    // 改写已有计划时保留原 origin（改写是内容编辑，不是重新发起）。
+    // 无 origin 的旧计划已在作用域校验阶段被拒绝，不会在这里被认领。
     const resolvedOrigin = existing !== undefined ? (existing.origin ?? origin) : origin;
     if (resolvedOrigin !== undefined) {
         plan.origin = resolvedOrigin;
     }
     return plan;
 }
+function compactText(text) {
+    return text.replace(/\s*\r?\n\s*/g, " ");
+}
+function relativeTime(updatedAt, nowMs) {
+    const updatedAtMs = Date.parse(updatedAt);
+    if (!Number.isFinite(updatedAtMs))
+        return "时间未知";
+    const elapsedMs = Math.max(0, nowMs - updatedAtMs);
+    const minutes = Math.floor(elapsedMs / 60_000);
+    if (minutes < 1)
+        return "刚刚";
+    if (minutes < 60)
+        return `${minutes} 分钟前`;
+    const hours = Math.floor(minutes / 60);
+    if (hours < 24)
+        return `${hours} 小时前`;
+    return `${Math.floor(hours / 24)} 天前`;
+}
+function unfinishedPlanWarning(plans, nowMs) {
+    const unfinished = plans.filter((plan) => !isPlanCancelled(plan) && plan.tasks.some((task) => task.status !== "completed"));
+    if (unfinished.length === 0)
+        return undefined;
+    const details = unfinished.slice(0, 3).map((plan) => {
+        const completed = plan.tasks.filter((task) => task.status === "completed").length;
+        return `${plan.planId} «${compactText(plan.goal)}»(${completed}/${plan.tasks.length}，最后更新 ${relativeTime(plan.updatedAt, nowMs)})`;
+    });
+    return `本会话还有 ${unfinished.length} 份未完成计划：${details.join("；")}。若已不再推进，请用 {planId, cancel:true} 取消，避免面板残留。`;
+}
 export function buildPlanWriteTool(store, origin) {
+    const scope = scopeKey(origin);
     return {
         name: "xg_plan_write",
         label: "【xg-harness】编写计划",
@@ -85,10 +116,61 @@ export function buildPlanWriteTool(store, origin) {
         async execute(_toolCallId, rawParams) {
             const params = rawParams;
             try {
+                if (params.cancel === true) {
+                    if (params.planId === undefined ||
+                        params.goal !== undefined ||
+                        params.tasks !== undefined) {
+                        const result = {
+                            ok: false,
+                            error: { code: "CANCEL_FIELDS_CONFLICT" },
+                        };
+                        return toolJsonResult(result);
+                    }
+                    const existing = store.get(params.planId);
+                    if (existing === undefined || !planInScope(existing, scope)) {
+                        const result = {
+                            ok: false,
+                            error: { code: "PLAN_NOT_FOUND" },
+                        };
+                        return toolJsonResult(result);
+                    }
+                    if (isPlanCancelled(existing)) {
+                        const result = {
+                            ok: true,
+                            planId: existing.planId,
+                            cancelled: true,
+                            view: renderPlanView(existing),
+                        };
+                        return toolJsonResult(result);
+                    }
+                    const now = new Date().toISOString();
+                    const cancelledPlan = {
+                        ...existing,
+                        status: "cancelled",
+                        cancelledAt: now,
+                        updatedAt: now,
+                    };
+                    assertPlanInvariants(cancelledPlan);
+                    store.set(cancelledPlan);
+                    const result = {
+                        ok: true,
+                        planId: cancelledPlan.planId,
+                        cancelled: true,
+                        view: renderPlanView(cancelledPlan),
+                    };
+                    return toolJsonResult(result);
+                }
+                if (params.goal === undefined || params.tasks === undefined) {
+                    const result = {
+                        ok: false,
+                        error: { code: "WRITE_FIELDS_REQUIRED" },
+                    };
+                    return toolJsonResult(result);
+                }
                 let existing;
                 if (params.planId !== undefined) {
                     existing = store.get(params.planId);
-                    if (existing === undefined) {
+                    if (existing === undefined || !planInScope(existing, scope)) {
                         const result = {
                             ok: false,
                             error: { code: "PLAN_NOT_FOUND" },
@@ -96,14 +178,21 @@ export function buildPlanWriteTool(store, origin) {
                         return toolJsonResult(result);
                     }
                 }
+                let warnings;
+                if (params.planId === undefined && scope !== undefined) {
+                    const warning = unfinishedPlanWarning(store.listPlansByOrigin(scope), Date.now());
+                    if (warning !== undefined)
+                        warnings = [warning];
+                }
                 const planId = params.planId ?? randomUUID();
-                const plan = buildPlan(params, existing, planId, origin);
+                const plan = buildPlan(params.goal, params.tasks, existing, planId, origin, new Date().toISOString());
                 assertPlanInvariants(plan);
                 store.set(plan);
                 const result = {
                     ok: true,
                     planId: plan.planId,
                     view: renderPlanView(plan),
+                    ...(warnings !== undefined ? { warnings } : {}),
                 };
                 return toolJsonResult(result);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xgjktech/xg-openclaw-harness-tools",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "企业工具插件：plan_write / plan_execute 计划工具（OpenClaw 第三方工具插件）",
   "license": "MIT",
   "type": "module",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "typebox": "1.1.39",
-    "@xgjktech/xg-openclaw-shared": "^0.2.1"
+    "@xgjktech/xg-openclaw-shared": "^0.2.2"
   },
   "devDependencies": {
     "@types/node": "^22.19.0",