@ai-setting/roy-task-plugin 0.7.12 → 0.7.13

package/dist/claude-plugin/agents/roy.md

@@ -67,7 +67,7 @@ the user sees.
 
 5. RECORD — operation records (see Operation Discipline below)
 
-6. COMPLETE — 收尾：用 `task_complete` after item-by-item verification
+6. COMPLETE — 收尾：用 `task_complete` after item-by-item verification (see Complete Discipline below)
 
 ### Goals 子项拆分规则
 
@@ -141,7 +141,6 @@ stage is reached, **not after the fact** (not in a batch at the end).
 
 ### Task Complete — 核实义务
 
-
 Before calling `task_complete`, you MUST:
 
 1. Read the task's `goal` (description) and `delivery` (goals_and_expected_deliverables) fields.

package/dist/cli.js

@@ -458,10 +458,15 @@ import {
 } from "@ai-setting/roy-agent-core/env/task/prompt";
 
 // ../agent/src/trim-permission.ts
+var ROLE_SCOPE_QUALIFIER = /验收方|收尾分两种角色/;
 var TRIM_RULES = Object.freeze([
   {
     name: "complete-禁止调用",
-    match: (line) => /不要调用/.test(line) && /task_complete/.test(line) && /权限/.test(line)
+    match: (line) => /(不要|禁止|别|无需|不需要|不能|无权|不得|仍无|不持有|不具备|未获得)/.test(line) && /task_complete/.test(line)
+  },
+  {
+    name: "角色权限断言",
+    match: (line) => /(执行方|验收方)/.test(line) && /(权限|资格|无权|不能|没有)/.test(line) && /task_complete/.test(line) && !/你的收尾动作是/.test(line)
   },
   {
     name: "track-禁止置终态",
@@ -470,19 +475,45 @@ var TRIM_RULES = Object.freeze([
   {
     name: "lifecycle-角色二分标题",
     match: (line) => /收尾分两种角色/.test(line),
-    replace: () => "6. COMPLETE — 收尾：用 `task_complete` after item-by-item verification",
-    dropFollowing: 5
+    replace: () => "6. COMPLETE — 收尾：用 `task_complete` after item-by-item verification" + " (see Complete Discipline below)"
+  },
+  {
+    name: "lifecycle-执行方条目",
+    match: (line) => /执行方/.test(line) && /(roy )?sub-agent/.test(line)
+  },
+  {
+    name: "lifecycle-执行方收尾指令",
+    match: (line, ctx) => (/结束并返回结果|结束并返回/.test(line) || /最后一条/.test(line) && /task_operation_create/.test(line)) && (/执行方/.test(line) || /执行方/.test(ctx.prevLine ?? ""))
+  },
+  {
+    name: "lifecycle-验收方条目",
+    match: (line) => /验收方/.test(line) && /(default agent|接待员)/.test(line)
   },
   {
     name: "complete-标题角色限定",
-    match: (line) => /^#{1,6}\s/.test(line) && /仅验收方适用/.test(line),
-    replace: (line) => line.replace(/\s*（\*\*仅验收方适用\*\*）/, "")
+    match: (line) => /^#{1,6}\s/.test(line) && /验收方/.test(line),
+    replace: (line) => line.replace(/\s*[（(][^）)]*验收方[^）)]*[）)]/g, "")
   },
   {
     name: "complete-角色作用域引用块",
     match: (line) => /角色作用域/.test(line) || /若你是/.test(line) && /执行方/.test(line) && /权限/.test(line) || /你的收尾动作是/.test(line) && /验收由主智能体负责/.test(line)
   }
 ]);
+function isListItemHead(line) {
+  return /^\s*([-*+]\s|\d+\.\s)/.test(line);
+}
+function isContinuationOf(line, head) {
+  if (isListItemHead(line))
+    return false;
+  if (/^\s*(#{1,6}\s|>)/.test(line))
+    return false;
+  if (/^\s*```/.test(line))
+    return false;
+  if (line.trim() === "")
+    return false;
+  const indent = (s) => s.match(/^\s*/)?.[0].length ?? 0;
+  return indent(line) > indent(head);
+}
 function trimTaskCompletePermissionText(text) {
   if (!text)
     return text;
@@ -491,19 +522,39 @@ function trimTaskCompletePermissionText(text) {
   const out = [];
   for (let i = 0;i < lines.length; i++) {
     const line = lines[i];
-    const rule = TRIM_RULES.find((r) => r.match(line));
+    const rule = TRIM_RULES.find((r) => r.match(line, { prevLine: lines[i - 1] }));
     if (!rule) {
       out.push(line);
       continue;
     }
-    if (rule.replace)
-      out.push(rule.replace(line));
-    const drop = rule.dropFollowing ?? 0;
-    for (let k = 0;k < drop && i + 1 < lines.length; k++) {
-      i++;
+    if (rule.replace) {
+      const replaced = rule.replace(line);
+      if (ROLE_SCOPE_QUALIFIER.test(replaced)) {
+        throw new Error(`trim-permission: rule "${rule.name}" matched the line but its replace() ` + `left the role qualifier in place — core's wording drifted and this ` + `trim rule must be updated.
+  line: ${line}`);
+      }
+      out.push(replaced);
+    }
+    if (!rule.replace && isListItemHead(line)) {
+      while (i + 1 < lines.length && isContinuationOf(lines[i + 1], line)) {
+        i++;
+      }
+    }
+  }
+  const collapsed = [];
+  let inFence = false;
+  for (const line of out) {
+    if (/^\s*```/.test(line)) {
+      inFence = !inFence;
+      collapsed.push(line);
+      continue;
+    }
+    if (!inFence && line.trim() === "" && collapsed.length > 0 && collapsed[collapsed.length - 1].trim() === "") {
+      continue;
     }
+    collapsed.push(line);
   }
-  return out.join(`
+  return collapsed.join(`
 `);
 }
 
@@ -1211,7 +1262,8 @@ function errMsg(err) {
 
 // ../../../packages/cli/src/daemon/discipline.ts
 import { TASK_DISCIPLINE_PROMPT } from "@ai-setting/roy-agent-core/env/task/prompt";
-var PLUGIN_TASK_DISCIPLINE_PROMPT = trimTaskCompletePermissionText(TASK_DISCIPLINE_PROMPT);
+var CORE_TASK_DISCIPLINE_PROMPT_RAW = TASK_DISCIPLINE_PROMPT;
+var PLUGIN_TASK_DISCIPLINE_PROMPT = trimTaskCompletePermissionText(CORE_TASK_DISCIPLINE_PROMPT_RAW);
 var RUNTIMES_WITH_AGENT_SYSTEM_PROMPT = Object.freeze([
   "opencode",
   "claude"
@@ -3559,7 +3611,7 @@ function formatStatus(report) {
 }
 
 // ../../../packages/cli/src/main.ts
-var VERSION = "0.7.12";
+var VERSION = "0.7.13";
 async function main(argv) {
   const parsed = parseArgs(argv);
   switch (parsed.command) {