@morlay/dsh-tool-guidance 0.0.11-alpha.2 → 0.0.11-alpha.3

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
+import { RUN_CODE_NAME } from "@deepseek-ai/dsh-tools";
 import z from "@deepseek-ai/schemastery";
 // src/guidance/packs/ask.ts
 const ASK_PACK = {
@@ -68,19 +69,19 @@ const FLOW_PACK = {
 		},
 		{
 			tool: "schedule_create",
-			short: "在本会话里建定时提醒"
+			short: "按 rrule 建定时任务"
 		},
 		{
 			tool: "schedule_list",
-			short: "列出本会话的活动提醒"
+			short: "列出全部定时任务"
 		},
 		{
-			tool: "schedule_update",
-			short: "原地改一个提醒"
+			tool: "schedule_view",
+			short: "按 id 查看一个定时任务"
 		},
 		{
-			tool: "schedule_delete",
-			short: "删除一个提醒"
+			tool: "schedule_edit",
+			short: "按 id 改 / 暂停 / 删除任务"
 		},
 		{
 			tool: "plugin_manager",
@@ -104,6 +105,10 @@ const FS_PACK = {
 			tool: "edit",
 			short: "按精确匹配替换文件片段"
 		},
+		{
+			tool: "apply_patch",
+			short: "用一个补丁批量增删改移多个文件"
+		},
 		{
 			tool: "glob",
 			short: "按模式查找文件路径"
@@ -257,6 +262,10 @@ const BASE_GROUP = {
 				when: "edit",
 				text: "edit：按精确匹配替换；old_string 默认必须唯一，出现多次时给更长的上下文或 replace_all。"
 			},
+			{
+				when: "apply_patch",
+				text: "apply_patch：跨文件或分开的几处一起改时用它（Codex 风格补丁：`*** Begin Patch` … `*** End Patch`）；整份先校验、拒绝则什么都不改，开始应用后按序执行、遇错即停且不回滚——重试前先重读受影响的文件。"
+			},
 			{
 				when: "str_replace_editor",
 				text: "str_replace_editor：path 必须绝对路径、目录只能 view；str_replace 的 old_str 必须逐字且唯一（不唯一就不改），删除匹配要省略 new_str 而不是传 null。"
@@ -331,6 +340,7 @@ const BASE_GROUP = {
 			"tool:read",
 			"tool:write",
 			"tool:edit",
+			"tool:apply_patch",
 			"tool:glob",
 			"tool:grep",
 			"tool:bash",
@@ -344,6 +354,7 @@ const BASE_GROUP = {
 			"read",
 			"write",
 			"edit",
+			"apply_patch",
 			"str_replace_editor",
 			"glob",
 			"grep",
@@ -454,15 +465,16 @@ const FLOW_GROUP = {
 				text: "exit_plan_mode：动手前提交计划（计划模式下只读）；本部署装了计划模式才有这一行。"
 			},
 			{
-				when: "schedule_create",
-				text: "schedule_create：会话里的定时提醒，恰好给一个时间选择器（after_seconds / at / every_seconds / daily / weekly / cron，every_seconds 最小 60）；schedule_list 看本会话还挂着哪些。"
-			},
-			{
-				when: "schedule_update",
-				text: "schedule_update：原地改、保留 id（它没有 after_seconds，改相对延迟要新建提醒）；schedule_delete 不撤回已经入队的提醒消息。"
+				when: [
+					"schedule_create",
+					"schedule_list",
+					"schedule_view",
+					"schedule_edit"
+				],
+				text: "定时任务：schedule_create 用 rrule（一行 DTSTART + 一行 RRULE）与 target 指定投递去处，prompt 每次触发时作为用户消息送达；schedule_list 列 Host 全部任务（含别的会话建的，分页），schedule_view 看单个，schedule_edit 按 action 改 / 暂停 / 恢复 / 删除（带 expectedUpdatedAt 才防并发覆盖，删除不撤回已入队的消息）。"
 			}
 		],
-		drops: ["tool:goal"],
+		drops: ["tool:goal", "tool:schedule"],
 		tools: [
 			"todo_write",
 			"exit_plan_mode",
@@ -472,8 +484,8 @@ const FLOW_GROUP = {
 			"present",
 			"schedule_create",
 			"schedule_list",
-			"schedule_update",
-			"schedule_delete"
+			"schedule_view",
+			"schedule_edit"
 		]
 	}
 };
@@ -639,13 +651,13 @@ function apply(ctx, config) {
 			writable: true
 		});
 	};
-	ctx.on("system-prompt/assemble", async (_assembly, context, next) => {
+	ctx.on("system-prompt/assemble", async (assembly, context, next) => {
 		const result = await next();
 		const agent = context.agent;
 		if (agent !== void 0) {
-			const toolSet = context.toolSet;
-			const definitions = ctx.tools.definitions(agent, toolSet);
-			visibleTools.set(agent, new Set(definitions.map((tool) => tool.name)));
+			const definitions = ctx.tools.definitions(agent, context.toolSet);
+			const ptc = assembly.sections.some((section) => section.name === PTC_ONLY_SECTION);
+			visibleTools.set(agent, ptc ? /* @__PURE__ */ new Set([RUN_CODE_NAME]) : new Set(definitions.map((tool) => tool.name)));
 			for (const definition of definitions) project(definition);
 		}
 		return result;
@@ -664,6 +676,7 @@ function apply(ctx, config) {
 	projectVisible();
 }
 const baseGroup = groupByKey(BASE_GROUP_KEY);
+const PTC_ONLY_SECTION = "tools:ptc-only";
 function registeredIn(ctx, agent) {
 	return (tool) => ctx.tools.get(tool, agent) !== void 0;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/dsh-tool-guidance",
-  "version": "0.0.11-alpha.2",
+  "version": "0.0.11-alpha.3",
   "description": "Tool guidance for dsh: localized short tool descriptions, trimmed schema and usage groups as one host-plane row. The agent row list lives in the agent presets themselves (shipped or deployment-owned).",
   "keywords": [
     "dsh",
@@ -34,29 +34,29 @@
     "./locale/*.json": "./locale/*.json"
   },
   "devDependencies": {
-    "@deepseek-ai/cordis-plugin-include": "^1.0.11-alpha.1",
-    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-scope": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-system-prompt": "^0.2.2-alpha.2",
-    "@deepseek-ai/schemastery": "^3.18.6-alpha.1",
-    "@morlay/dsh-context-assembler": "0.0.11-alpha.2",
-    "@morlay/dsh-session-mode": "0.0.14-alpha.2",
+    "@deepseek-ai/cordis-plugin-include": "^1.0.11-alpha.2",
+    "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-scope": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-session": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-system-prompt": "^0.2.2-alpha.3",
+    "@deepseek-ai/schemastery": "^3.18.6-alpha.2",
+    "@morlay/dsh-context-assembler": "0.0.11-alpha.3",
+    "@morlay/dsh-session-mode": "0.0.14-alpha.3",
     "@types/js-yaml": "^4.0.9",
     "js-yaml": "^4.1.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "^4.0.6-alpha.1",
-    "@deepseek-ai/dsh-agent": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-skill": "^0.2.2-alpha.2",
-    "@deepseek-ai/dsh-tools": "^0.2.2-alpha.2",
-    "@deepseek-ai/schemastery": "^3.18.6-alpha.1",
-    "@morlay/dsh-context-assembler": "0.0.11-alpha.2"
+    "@deepseek-ai/cordis": "^4.0.6-alpha.2",
+    "@deepseek-ai/dsh-agent": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-llm": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-skill": "^0.2.2-alpha.3",
+    "@deepseek-ai/dsh-tools": "^0.2.2-alpha.3",
+    "@deepseek-ai/schemastery": "^3.18.6-alpha.2",
+    "@morlay/dsh-context-assembler": "0.0.11-alpha.3"
   },
   "engines": {
-    "dsh": ">= 0.2.2-alpha.2 < 0.2.3"
+    "dsh": ">= 0.2.2-alpha.3 < 0.2.3"
   },
   "scripts": {
     "build": "pnpm exec tsdown"

package/src/guidance/packs/flow.ts

@@ -10,10 +10,10 @@ export const FLOW_PACK: ToolPack = {
     { tool: "create_goal", short: "创建会话目标" },
     { tool: "update_goal", short: "更新会话目标状态" },
     { tool: "present", short: "声明交付给用户的产物" },
-    { tool: "schedule_create", short: "在本会话里建定时提醒" },
-    { tool: "schedule_list", short: "列出本会话的活动提醒" },
-    { tool: "schedule_update", short: "原地改一个提醒" },
-    { tool: "schedule_delete", short: "删除一个提醒" },
+    { tool: "schedule_create", short: "按 rrule 建定时任务" },
+    { tool: "schedule_list", short: "列出全部定时任务" },
+    { tool: "schedule_view", short: "按 id 查看一个定时任务" },
+    { tool: "schedule_edit", short: "按 id 改 / 暂停 / 删除任务" },
     { tool: "plugin_manager", short: "管理本 profile 的插件与 bundle" },
   ],
 };

package/src/guidance/packs/fs.ts

@@ -7,6 +7,7 @@ export const FS_PACK: ToolPack = {
     { tool: "read", short: "读文件内容（可指定行范围）" },
     { tool: "write", short: "写入文件或整文件覆盖" },
     { tool: "edit", short: "按精确匹配替换文件片段" },
+    { tool: "apply_patch", short: "用一个补丁批量增删改移多个文件" },
     { tool: "glob", short: "按模式查找文件路径" },
     { tool: "grep", short: "按正则搜索文件内容" },
     { tool: "working_directory", short: "查看当前工作目录，或用 cd 切换" },

package/src/guidance/packs/group-base.ts

@@ -21,6 +21,10 @@ export const BASE_GROUP: GroupPack = {
         when: "edit",
         text: "edit：按精确匹配替换；old_string 默认必须唯一，出现多次时给更长的上下文或 replace_all。",
       },
+      {
+        when: "apply_patch",
+        text: "apply_patch：跨文件或分开的几处一起改时用它（Codex 风格补丁：`*** Begin Patch` … `*** End Patch`）；整份先校验、拒绝则什么都不改，开始应用后按序执行、遇错即停且不回滚——重试前先重读受影响的文件。",
+      },
       {
         when: "str_replace_editor",
         text: "str_replace_editor：path 必须绝对路径、目录只能 view；str_replace 的 old_str 必须逐字且唯一（不唯一就不改），删除匹配要省略 new_str 而不是传 null。",
@@ -80,6 +84,7 @@ export const BASE_GROUP: GroupPack = {
       "tool:read",
       "tool:write",
       "tool:edit",
+      "tool:apply_patch",
       "tool:glob",
       "tool:grep",
       "tool:bash",
@@ -93,6 +98,7 @@ export const BASE_GROUP: GroupPack = {
       "read",
       "write",
       "edit",
+      "apply_patch",
       "str_replace_editor",
       "glob",
       "grep",

package/src/guidance/packs/group-flow.ts

@@ -19,15 +19,11 @@ export const FLOW_GROUP: GroupPack = {
         text: "exit_plan_mode：动手前提交计划（计划模式下只读）；本部署装了计划模式才有这一行。",
       },
       {
-        when: "schedule_create",
-        text: "schedule_create：会话里的定时提醒，恰好给一个时间选择器（after_seconds / at / every_seconds / daily / weekly / cron，every_seconds 最小 60）；schedule_list 看本会话还挂着哪些。",
-      },
-      {
-        when: "schedule_update",
-        text: "schedule_update：原地改、保留 id（它没有 after_seconds，改相对延迟要新建提醒）；schedule_delete 不撤回已经入队的提醒消息。",
+        when: ["schedule_create", "schedule_list", "schedule_view", "schedule_edit"],
+        text: "定时任务：schedule_create 用 rrule（一行 DTSTART + 一行 RRULE）与 target 指定投递去处，prompt 每次触发时作为用户消息送达；schedule_list 列 Host 全部任务（含别的会话建的，分页），schedule_view 看单个，schedule_edit 按 action 改 / 暂停 / 恢复 / 删除（带 expectedUpdatedAt 才防并发覆盖，删除不撤回已入队的消息）。",
       },
     ],
-    drops: ["tool:goal"],
+    drops: ["tool:goal", "tool:schedule"],
     tools: [
       "todo_write",
       "exit_plan_mode",
@@ -37,8 +33,8 @@ export const FLOW_GROUP: GroupPack = {
       "present",
       "schedule_create",
       "schedule_list",
-      "schedule_update",
-      "schedule_delete",
+      "schedule_view",
+      "schedule_edit",
     ],
   },
 };

package/src/index.ts

@@ -2,7 +2,7 @@ import type { Context } from "@deepseek-ai/cordis";
 import type { Agent } from "@deepseek-ai/dsh-agent";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import type {} from "@deepseek-ai/dsh-skill";
-import type { ToolDefinition } from "@deepseek-ai/dsh-tools";
+import { RUN_CODE_NAME, type ToolDefinition } from "@deepseek-ai/dsh-tools";
 import type {} from "@morlay/dsh-context-assembler";
 import z from "@deepseek-ai/schemastery";
 import {
@@ -114,24 +114,31 @@ export function apply(ctx: Context, config: Config): void {
       writable: true,
     });
   };
-  // 本行挂在**最外层**（`prepend`）：`base` 正文要按这个会话最终可见的工具目录过滤，而装配上下文里的
-  // `toolSet` 就是这一步的准入集（上游 0.2.1-rc.2 起工具声明由 `tools.resolve` 定，装配瀑布不再带 `tools`）。
+  // 本行挂在**最外层**（`prepend`）：`base` 正文要按这个会话**模型面能直接调的工具**过滤。准入集来自装配
+  // 上下文（上游 0.2.1-rc.2 起工具声明由 `tools.resolve` 定，装配瀑布不再带 `tools`），执行器再往上那一层
+  // 见下面 PTC 那段。
   ctx.on(
     "system-prompt/assemble",
-    async (_assembly, context, next) => {
+    async (assembly, context, next) => {
       const result = await next();
       const agent = context.agent;
-      // 记名字集合：准入集已应用这个会话的收窄（`tools.restrict`）与条件激活，名字不受描述改写影响。
-      // 诊断式的无 agent 装配不记（那种装配也不属于任何会话）。
+      // 记名字集合（`base` 正文的过滤判据）。诊断式的无 agent 装配不记。
       if (agent !== undefined) {
-        const toolSet = context.toolSet;
-        const definitions = ctx.tools.definitions(agent, toolSet);
+        const definitions = ctx.tools.definitions(agent, context.toolSet);
+        // 模型面 ≠ 准入集：执行器还会再投影一层，而那一层在装配瀑布**之后**（工具声明由 provider 在瀑布前
+        // 算好，瀑布只拿到 sections / contexts）。PTC 就是这一层——它把模型面收窄成 `run_code` 一条，
+        // 注册表与准入集里工具一个不少。信号是它注册的专属 section：`tools:ptc-only` 只有
+        // `@deepseek-ai/dsh-tool-executor-ptc` 会注册（原生执行器没有 sections）。
+        // 读**入参**那份（原始装配）：瀑布把同一份 value 传给每个监听，而通道会把非 keep 的 section
+        // 降级成 reminder，`result` 里已经看不到执行器那两条。
+        const ptc = assembly.sections.some((section) => section.name === PTC_ONLY_SECTION);
         visibleTools.set(
           agent,
-          new Set(definitions.map((tool) => tool.name)),
+          ptc ? new Set([RUN_CODE_NAME]) : new Set(definitions.map((tool) => tool.name)),
         );
         // 会话内晚注册的工具（MCP 重连、skill 重载）赶不上 `agent/created`：这里补一次改写。本次装配的声明已经
-        // 按旧定义收集过了，所以从**下一次**请求开始生效。
+        // 按旧定义收集过了，所以从**下一次**请求开始生效。改写走准入集的全部定义：PTC 的 SDK 正文就是拿
+        // 它们渲染的，描述与参数说明也要一起汉化精简。
         for (const definition of definitions) project(definition);
       }
       return result;
@@ -159,6 +166,10 @@ export function apply(ctx: Context, config: Config): void {
 
 const baseGroup = groupByKey(BASE_GROUP_KEY);
 
+// PTC 执行器在模型面只声明 `run_code` 一条：它注册的这条专属 section 是装配期唯一能看到的信号
+// （section 名来自 `@deepseek-ai/dsh-tool-executor-ptc` 的 `PTC_ONLY_INSTRUCTION`）。
+const PTC_ONLY_SECTION = "tools:ptc-only";
+
 // **兜底**判据 = 工具注册表（这一行装没装这个工具）：只有当 `visibleTools` 里还没有这个 agent 的记录时才用得上。
 // 为什么需要兜底：理论上 `agent/pre-step` 之前每个 agent 必有一次装配（loop 里先 `assemble` 再走这条瀑布），
 // 但直接调瀑布的路径（诊断、别的插件自造 pre-step）可能没有——退回注册表总比渲染一份全量正文或空正文强。
@@ -227,4 +238,3 @@ function slimSchema(schema: unknown): unknown {
   }
   return rest;
 }
-