@ai-setting/roy-agent-core 1.7.75 → 1.7.77

package/dist/shared/@ai-setting/{roy-agent-core-y7x2qzwc.js → roy-agent-core-rsn44n9y.js}

@@ -3,11 +3,11 @@ import {
 } from "./roy-agent-core-na18zwj0.js";
 import {
   WORKFLOW_EXTRACT_PROMPT
-} from "./roy-agent-core-3e6gg17d.js";
+} from "./roy-agent-core-9vxh6f8h.js";
 import {
   createCompatibleDatabase,
   init_sqlite_task_store
-} from "./roy-agent-core-abqhkbn3.js";
+} from "./roy-agent-core-ezvpreqz.js";
 import {
   TaskHookPoints
 } from "./roy-agent-core-1pg0fepg.js";
@@ -24,13 +24,13 @@ import {
 import {
   LarkCardPatchNotifier,
   humanizeValue
-} from "./roy-agent-core-nmx9934r.js";
+} from "./roy-agent-core-w0qjeq2v.js";
 import {
   validateWorkflowDefinition
 } from "./roy-agent-core-1v4g0d4x.js";
 import {
   enqueueToAddFakeUserMessage
-} from "./roy-agent-core-f77k3gqt.js";
+} from "./roy-agent-core-h21gngxf.js";
 import {
   BasePlugin
 } from "./roy-agent-core-az13yzmc.js";
@@ -1515,8 +1515,8 @@ class LayaCompletionPlugin {
       logger5.warn("[laya-completion] taskComponent not injected — skip");
       return;
     }
-    if (ctx.terminalStatus !== "completed") {
-      logger5.debug(`[laya-completion] terminalStatus=${ctx.terminalStatus} — skip (only completed)`);
+    if (ctx.terminalStatus !== "completed" && ctx.terminalStatus !== "to_validate") {
+      logger5.debug(`[laya-completion] terminalStatus=${ctx.terminalStatus} — skip (only completed / to_validate)`);
       return;
     }
     const task = ctx.task;
@@ -2116,6 +2116,10 @@ class LarkCliTaskNotifyHook {
       return;
     if (!this.isCardModeEnabled())
       return;
+    const terminalStatus = data.terminalStatus;
+    if (terminalStatus === "to_validate" || task.status === "to_validate") {
+      return;
+    }
     await this.sendCardFinish(task);
   }
   async onAfterDelete(ctx) {

package/dist/shared/@ai-setting/{roy-agent-core-hnyk1by7.js → roy-agent-core-vffccgf6.js}

@@ -3,11 +3,16 @@ import {
   NEW_TASK_ID_PLACEHOLDER
 } from "./roy-agent-core-tr3ep81v.js";
 import {
+  TASK_DISCIPLINE_GOALS
+} from "./roy-agent-core-m46fe3x4.js";
+import {
+  TASK_ARCHIVED_STATUS_WORD,
+  TASK_CANCELLED_STATUS_WORD,
   TASK_COMPLETE_ITEM_BY_ITEM,
   TASK_COMPLETE_VERIFY_DUTY,
   TASK_COMPLETION_HINT_ANCHOR,
-  TASK_DISCIPLINE_GOALS
-} from "./roy-agent-core-11shp00p.js";
+  TERMINAL_NON_ACCEPTABLE_STATUSES
+} from "./roy-agent-core-4rtg69cn.js";
 import {
   getEnvContextOrEmpty,
   init_env_context,
@@ -63,7 +68,7 @@ var GetTaskToolSchema = withLegacyTaskId({
   include_operations: z.boolean().optional().default(true).describe("Include operation records (milestones / process log) with the task. " + "Defaults to true — the task's operation history is part of its detail. " + "Pass false for a lean task-only response.")
 });
 var ListTasksToolSchema = z.object({
-  status: z.enum(["todo", "active", "completed", "paused", "cancelled", "archived"]).optional(),
+  status: z.enum(["todo", "active", "to_validate", "completed", "paused", "cancelled", "archived"]).optional(),
   priority: z.enum(["low", "medium", "high"]).optional(),
   type: z.enum(["normal", "cycle", "longterm"]).optional().describe("Filter by task type"),
   limit: z.number().optional().default(20),
@@ -75,7 +80,7 @@ var SearchTasksToolSchema = z.object({
   keywords: z.array(z.string()).describe("关键词列表（AND 逻辑，匹配 title/description/goals/tags/operations）"),
   limit: z.number().optional().default(20).describe("返回数量"),
   offset: z.number().optional().default(0).describe("偏移量"),
-  status: z.enum(["todo", "active", "completed", "paused", "cancelled", "archived"]).optional().describe("按状态筛选"),
+  status: z.enum(["todo", "active", "to_validate", "completed", "paused", "cancelled", "archived"]).optional().describe("按状态筛选"),
   priority: z.enum(["low", "medium", "high"]).optional().describe("按优先级筛选"),
   type: z.enum(["normal", "cycle", "longterm"]).optional().describe("按类型筛选"),
   exclude_task_id: z.number().optional().describe("排除的 task ID"),
@@ -85,7 +90,7 @@ var SearchTasksToolSchema = z.object({
 var UpdateTaskToolSchema = withLegacyTaskId({
   title: z.string().optional(),
   description: z.string().optional(),
-  status: z.enum(["todo", "active", "completed", "paused", "cancelled", "archived"]).optional(),
+  status: z.enum(["todo", "active", "to_validate", "completed", "paused", "cancelled", "archived"]).optional(),
   priority: z.enum(["low", "medium", "high"]).optional(),
   type: z.enum(["normal", "cycle", "longterm"]).optional().describe("Task type"),
   progress: z.number().min(0).max(100).optional(),
@@ -100,8 +105,10 @@ var UpdateTaskToolSchema = withLegacyTaskId({
 var DeleteTaskToolSchema = z.object({
   task_id: z.number().describe("Task ID")
 });
-var CompleteTaskToolSchema = withLegacyTaskId({
-  deliverable_storage_path: z.string().optional().describe("交付物的寻址地址（路径 / URL / 分支名等）。" + "调用本工具前，请先读取任务的 goal（description）和 delivery（goals_and_expected_deliverables）栏位，" + "建议验证目标和交付物是否符合预期，然后将实际交付物的寻址地址填入此参数。")
+var CompleteTaskToolSchema = withLegacyTaskId({});
+var PreCompleteTaskToolSchema = withLegacyTaskId({
+  deliverable_storage_path: z.string().optional().describe("交付物的寻址地址（路径 / URL / 分支名等）。" + "会持久化到 task.context.deliverable_storage_path，" + "并写入 operation 记录（Deliverable 行），供验收方 task_complete 时逐条对照。"),
+  current_status: z.string().optional().describe("本次交付的进展摘要（可选）。" + "会拼进「待验证：」文案，作为任务当前状态展示给验收方（default agent）。")
 });
 var CancelTaskToolSchema = withLegacyTaskId({
   reason: z.string().optional().describe("取消原因（可选）。会写入该任务的 operation 记录，便于事后追溯验收结论。")
@@ -116,7 +123,7 @@ var BatchDeleteToolSchema = z.object({
 var TreeTasksToolSchema = z.object({
   depth: z.number().optional().default(2).describe("树的展开深度。默认 2 (根 + 一层子任务 + 二层孙任务)。" + "0 = 只返回根任务，不展开任何子节点。" + "-1 或负数 = 无限层级（全部展开）。"),
   parent_task_id: z.number().optional().describe("只看指定父任务的子树。不传则从所有根任务（forest）开始。"),
-  status: z.enum(["todo", "active", "completed", "paused", "cancelled", "archived"]).optional().describe("按状态过滤（与 task_list 一致）。"),
+  status: z.enum(["todo", "active", "to_validate", "completed", "paused", "cancelled", "archived"]).optional().describe("按状态过滤（与 task_list 一致）。"),
   priority: z.enum(["low", "medium", "high"]).optional().describe("按优先级过滤。"),
   type: z.enum(["normal", "cycle", "longterm"]).optional().describe("按任务类型过滤。"),
   include_archived: z.boolean().optional().default(false).describe("是否包含已归档任务（默认 false，与 task_list 一致）。")
@@ -702,7 +709,10 @@ function batchArchiveTaskTool(taskComponent) {
       let archivedCount = 0;
       for (const taskId of taskIds) {
         try {
-          const task = await taskComponent.updateTask(taskId, { status: "archived" });
+          const task = await taskComponent.updateTask(taskId, {
+            status: "archived",
+            current_status: params.reason ? `${TASK_ARCHIVED_STATUS_WORD}：${params.reason}` : TASK_ARCHIVED_STATUS_WORD
+          });
           if (task) {
             await taskComponent.createOperation({
               taskId,
@@ -940,7 +950,11 @@ init_env_context();
 init_logger();
 var logger4 = createLogger("task:tools:complete");
 var TASK_COMPLETE_DESCRIPTION = `
-Mark a task as completed (progress=100, status=completed). Creates an operation record.
+Final acceptance of a submitted task: set status=completed, progress=100
+(two-phase acceptance, Task #5073).
+
+**Who should call this** — the **acceptance side** (default agent). The
+executor (sub-agent) has NO permission to call it (deniedTools, Task #5007).
 
 **Before calling this tool**, you MUST:
 
@@ -968,21 +982,27 @@ Mark a task as completed (progress=100, status=completed). Creates an operation
          (milestone_type=decision) — the reason **must** land in the
          operation record (必须落到操作记录里), not merely a line in
          your final report (不能只在报告里带一句).
-3. **Provide \`deliverable_storage_path\`** parameter with the deliverable's address:
-   - Feishu doc URL (e.g., https://my.feishu.cn/docx/abc)
-   - Local file path (e.g., /tmp/report.md)
-   - Git branch or worktree path (e.g., feature/my-feature)
-   - GitHub commit URL or PR URL
-   - Cloud drive URL (e.g., https://my.feishu.cn/file/abc)
-   - Or any other locator that points to where the work product lives
-
-The \`deliverable_storage_path\` will be persisted to the task's \`context.deliverable_storage_path\` for future reference and traceability.
+3. Deliverables were already submitted by the executor via
+   \`task_pre_complete\` (they live in \`context.deliverable_storage_path\`
+   and the operation trail — Task #5073 design: task_complete takes **no**
+   deliverable parameter). Cross-check them in step 2; do NOT ask the
+   executor to resubmit.
 
 **Restrictions**:
 - Cannot complete cycle-type tasks (they are periodic). Use \`task_update\` to reset progress instead.
 - Marks the task as 100% complete; use \`task_update\` to record partial progress first if needed.
 
-**Backward compatibility**: \`deliverable_storage_path\` is optional. Existing callers that omit it continue to work as before.
+**Side effects**:
+- Sets \`status = "completed"\`, \`progress = 100\` **and refreshes \`current_status\`**
+  to the completed wording. You do **NOT** need a follow-up
+  \`task_update(current_status=...)\` call — a task must never keep a stale
+  pre-completion progress sentence (e.g. "paused, not committed") that would
+  contradict \`status = "completed"\`.
+- The goal-check decision model does **NOT** run here — it already ran at
+  \`task_pre_complete\` time (Task #5073 design v2). This tool is the final
+  state commit by the acceptance side.
+- Cannot complete a task that is already in a terminal state (cancelled /
+  archived) — reopen it first via \`task_update(status="active")\`.
 `.trim();
 function completeTaskTool(taskComponent) {
   return {
@@ -1010,7 +1030,18 @@ function completeTaskTool(taskComponent) {
             metadata: { execution_time_ms: 0 }
           };
         }
-        const task = await taskComponent.completeTask(params.task_id, sessionId, params.deliverable_storage_path);
+        const TERMINAL_NON_ACCEPTABLE = new Set([
+          ...TERMINAL_NON_ACCEPTABLE_STATUSES
+        ]);
+        if (TERMINAL_NON_ACCEPTABLE.has(currentTask.status)) {
+          return {
+            success: false,
+            output: "",
+            error: `Cannot complete task #${params.task_id}: it is already in terminal status "${currentTask.status}". Reopen it first via task_update(status="active") if acceptance should proceed.`,
+            metadata: { execution_time_ms: 0 }
+          };
+        }
+        const task = await taskComponent.completeTask(params.task_id, sessionId);
         if (!task) {
           return {
             success: false,
@@ -1020,12 +1051,10 @@ function completeTaskTool(taskComponent) {
           };
         }
         setCurrentTaskId(undefined);
-        logger4.info(`[completeTask] Trace: Task #${params.task_id} completed, deliverable=${params.deliverable_storage_path || "(none)"}, currentTaskId cleared from EnvContext`);
+        logger4.info(`[completeTask] Trace: Task #${params.task_id} completed (acceptance committed), currentTaskId cleared from EnvContext`);
         return {
           success: true,
-          output: params.deliverable_storage_path ? `Task completed: #${task.id} - ${task.title}
-Deliverable (context + operation): ${params.deliverable_storage_path}` : `Task completed: #${task.id} - ${task.title}
-Deliverable: (no path provided)`,
+          output: `Task completed: #${task.id} - ${task.title}`,
           metadata: { execution_time_ms: 0, task }
         };
       } catch (error) {
@@ -1044,13 +1073,17 @@ init_logger();
 var logger5 = createLogger("tool:cancel-task");
 var NON_CANCELLABLE_STATUSES = new Set(["completed", "cancelled", "archived"]);
 var TASK_CANCEL_DESCRIPTION = `
-Cancel a task (task.status = "cancelled"). This is the **acceptance-side** cancel:
-use it when the work is abandoned, the user asked to stop, or acceptance failed.
+Cancel a task (task.status = "cancelled"). This is the **acceptance-side** cancel.
 
-**When to use**:
-- The user asks to cancel / stop / drop the task
-- Acceptance failed and re-delegation is not worth it
-- The sub-agent timed out or went off-track and the task is no longer relevant
+**When to use** — ONLY when the user explicitly asks (用户明令):
+- The user asks to cancel / stop / drop the task (用户明令取消 / 停掉 / 放弃这个任务)
+
+**When NOT to use**:
+- ❌ A sub-agent failed / timed out / went off-track — that is NOT a cancellation.
+  Find the root cause, propose a fix, and re-delegate (with \`sub_session_id\` to resume).
+  If it truly cannot be moved forward, report the situation to the user and **wait for
+  the user's decision** — do NOT cancel it on your own.
+- ❌ Acceptance found gaps but re-delegation is still possible — re-delegate instead.
 
 **What it does NOT do**:
 - It does **NOT** stop a running background process — that is \`stop_task\`
@@ -1060,6 +1093,9 @@ use it when the work is abandoned, the user asked to stop, or acceptance failed.
 **Side effects**:
 - Sets \`status = "cancelled"\` and fires the task terminal-state hooks
   (notifications / card state machine converge to the cancelled state).
+- Also refreshes \`current_status\` to the cancelled wording (with your \`reason\`
+  appended when given) — the task no longer keeps a stale pre-cancel progress
+  sentence that would contradict \`status = "cancelled"\`.
 - Writes an operation record so the cancellation reason stays auditable.
 - A cancelled task can be reopened later with \`task_update(status="active")\`.
 
@@ -1094,7 +1130,8 @@ function cancelTaskTool(taskComponent) {
           };
         }
         const task = await taskComponent.updateTask(params.task_id, {
-          status: "cancelled"
+          status: "cancelled",
+          current_status: params.reason ? `${TASK_CANCELLED_STATUS_WORD}：${params.reason}` : TASK_CANCELLED_STATUS_WORD
         });
         if (!task) {
           return {
@@ -1128,6 +1165,88 @@ function cancelTaskTool(taskComponent) {
     }
   };
 }
+// src/env/task/tools/pre-complete-tool.ts
+init_logger();
+var logger6 = createLogger("task:tools:pre-complete");
+var TASK_PRE_COMPLETE_DESCRIPTION = `
+Submit a task for acceptance (two-phase acceptance, Task #5073).
+
+**Who should call this** — the **executor** (sub-agent) when it believes
+the work is done and deliverables are ready.
+
+**What it does**:
+- Sets \`status = "to_validate"\` (待验证) — the task enters the
+  acceptance queue. This is **NOT** a terminal state.
+- Persists \`deliverable_storage_path\` to \`task.context.deliverable_storage_path\`
+  and writes a \`Deliverable: <path>\` line into the operation trail.
+- Refreshes \`current_status\` to the to-validate wording
+  (with your progress summary appended when given).
+- Creates an operation record so the submission stays auditable.
+
+**What it does NOT do**:
+- It does **NOT** mark the task completed — final acceptance
+  (\`task_complete\`) belongs to the **default agent** (验收权分离, Task #5007).
+
+**Goal self-check (design v2)**:
+- Submitting **does** fire the completion goal-check hook once
+  (\`terminalStatus="to_validate"\`) as a self-check gate — the
+  decision model reviews your goals/operations at submission time.
+  If it produces a hint, read it and address the gaps **before**
+  ending your turn. The final acceptance (\`task_complete\`) does
+  **not** re-run the goal check.
+
+**After calling**:
+- Push progress to 100 via \`task_update(progress=100)\` if not already,
+  then **end your turn and return the result** to the main agent.
+- The default agent will pick up the notification, verify the goals
+  item-by-item, and call \`task_complete\` (or re-delegate on gaps).
+
+**Parameters**:
+- \`task_id\` (required): the task to submit
+- \`deliverable_storage_path\` (optional): where the work product lives
+  (file path / Feishu doc URL / git branch / PR URL ...)
+- \`current_status\` (optional): a one-line progress summary shown to the
+  acceptance side (e.g. "实现完成，测试全绿")
+
+**Restrictions**:
+- Cannot pre-complete cycle-type tasks (they are periodic).
+`.trim();
+function preCompleteTaskTool(taskComponent) {
+  return {
+    name: "task_pre_complete",
+    description: TASK_PRE_COMPLETE_DESCRIPTION,
+    parameters: PreCompleteTaskToolSchema,
+    execute: async (args, ctx) => {
+      const params = PreCompleteTaskToolSchema.parse(args);
+      const sessionId = ctx.session_id || "unknown";
+      try {
+        const task = await taskComponent.preCompleteTask(params.task_id, sessionId, params.deliverable_storage_path, params.current_status);
+        if (!task) {
+          return {
+            success: false,
+            output: "",
+            error: `Task not found: ${params.task_id}`,
+            metadata: { execution_time_ms: 0 }
+          };
+        }
+        return {
+          success: true,
+          output: params.deliverable_storage_path ? `Task submitted for acceptance (to_validate): #${task.id} - ${task.title}
+Deliverable (context + operation): ${params.deliverable_storage_path}` : `Task submitted for acceptance (to_validate): #${task.id} - ${task.title}
+Deliverable: (no path provided)`,
+          metadata: { execution_time_ms: 0, task }
+        };
+      } catch (error) {
+        return {
+          success: false,
+          output: "",
+          error: error instanceof Error ? error.message : String(error),
+          metadata: { execution_time_ms: 0 }
+        };
+      }
+    }
+  };
+}
 // src/env/task/tools/task-tree-tool.ts
 function compareTasksDesc(a, b) {
   if (a.updatedAt < b.updatedAt)
@@ -1266,4 +1385,4 @@ function treeTasksTool(taskComponent) {
     }
   };
 }
-export { createTaskTool, getTaskTool, listTasksTool, searchTasksTool, batchArchiveTaskTool, batchDeleteTaskTool, updateTaskTool, deleteTaskTool, completeTaskTool, cancelTaskTool, treeTasksTool };
+export { createTaskTool, getTaskTool, listTasksTool, searchTasksTool, batchArchiveTaskTool, batchDeleteTaskTool, updateTaskTool, deleteTaskTool, completeTaskTool, cancelTaskTool, preCompleteTaskTool, treeTasksTool };

package/dist/shared/@ai-setting/{roy-agent-core-nmx9934r.js → roy-agent-core-w0qjeq2v.js}

@@ -60,7 +60,7 @@ function sanitizeInlineText(text, maxLen = 300) {
   if (!text)
     return "";
   const flat = text.replace(/\r\n?/g, `
-`).replace(/^#{1,6}\s+/gm, "").replace(/^\s*[-*+]\s+/gm, "· ").replace(/^\s*\d+\.\s+/gm, "· ").replace(/\*\*/g, "").replace(/`/g, "").replace(/\n+/g, " · ").replace(/\s{2,}/g, " ").replace(/(?:\s*·\s*){2,}/g, " · ").replace(/^(\s*·\s*)+/, "").replace(/(\s*·\s*)+$/, "").trim();
+`).replace(/^#{1,6}\s+/gm, "").replace(/!\[([^\]]*)\]\([^)]*\)/g, (_m, alt) => alt.trim() ? `${alt.trim()}[图片]` : "[图片]").replace(/^\s*[-*+]\s+/gm, "· ").replace(/^\s*\d+\.\s+/gm, "· ").replace(/\*\*/g, "").replace(/`/g, "").replace(/\n+/g, " · ").replace(/\s{2,}/g, " ").replace(/(?:\s*·\s*){2,}/g, " · ").replace(/^(\s*·\s*)+/, "").replace(/(\s*·\s*)+$/, "").trim();
   return flat.length <= maxLen ? flat : `${flat.slice(0, maxLen)}…`;
 }
 var HEAD_TITLE_MAX_WIDTH = 40;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.7.75",
+  "version": "1.7.77",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",

package/dist/shared/@ai-setting/roy-agent-core-f77k3gqt.js

@@ -1,71 +0,0 @@
-import {
-  init_decorator,
-  wrapFunction
-} from "./roy-agent-core-qq96p0tj.js";
-
-// src/env/task/plugins/fake-user-message-helper.ts
-init_decorator();
-var KIND_FIELD = "__fakeUserMessageKind";
-function ensureMetadata(toolResult) {
-  if (!toolResult)
-    return;
-  if (!toolResult.result)
-    toolResult.result = {};
-  if (!toolResult.result.metadata)
-    toolResult.result.metadata = {};
-  return toolResult.result.metadata;
-}
-function stringContent(msg) {
-  const c = msg?.content;
-  return typeof c === "string" ? c : JSON.stringify(c);
-}
-function enqueueToAddFakeUserMessageImpl(toolResult, newMsg, newKind) {
-  const meta = ensureMetadata(toolResult);
-  if (!meta)
-    return { willMerge: false, finalKind: newKind };
-  const existing = meta.toAddFakeUserMessage;
-  const existingKind = meta[KIND_FIELD];
-  if (!existing) {
-    meta.toAddFakeUserMessage = newMsg;
-    meta[KIND_FIELD] = newKind;
-    return { willMerge: false, finalKind: newKind };
-  }
-  let merged;
-  if (newKind === "max-iter") {
-    merged = {
-      role: "user",
-      content: `${stringContent(existing)}
-
-${stringContent(newMsg)}`
-    };
-  } else if (newKind === "delegate" && existingKind === "max-iter") {
-    merged = {
-      role: "user",
-      content: `${stringContent(newMsg)}
-
-${stringContent(existing)}`
-    };
-  } else {
-    merged = {
-      role: "user",
-      content: `${stringContent(existing)}
-
-${stringContent(newMsg)}`
-    };
-  }
-  meta.toAddFakeUserMessage = merged;
-  const finalKind = newKind === "max-iter" || existingKind === "max-iter" ? "max-iter" : newKind;
-  meta[KIND_FIELD] = finalKind;
-  return { willMerge: true, finalKind };
-}
-var enqueueToAddFakeUserMessage = wrapFunction(enqueueToAddFakeUserMessageImpl, "plugin.fake-user-message.enqueue", {
-  recordParams: false,
-  recordResult: false,
-  log: true,
-  resultFilter: (result) => ({
-    "fake-user-message.will_merge": result.willMerge,
-    "fake-user-message.final_kind": result.finalKind
-  })
-});
-
-export { enqueueToAddFakeUserMessage };