pi-pier 0.2.4 → 0.2.6

package/src/core/todo.ts

@@ -3,22 +3,22 @@
  *
  * A Cordis plugin keeps the master surface hot-swappable while allowing workers to mount the
  * one-shot subset directly. Injected services preserve the D79 registration boundary and keep
- * session-owned todo state in index. This module owns the tool, command, widget, and read hook;
- * reconciliation, mirroring, and agent reporting stay with the session state layer to avoid a
- * dependency cycle.
+ * session-owned todo state in index. This module owns the tool, command, widget, read hook,
+ * and master stop reminder; reconciliation, mirroring, and agent reporting stay with the
+ * session state layer to avoid a dependency cycle.
  */
 import { Context } from '@deepseek-ai/cordis';
 import { Type } from 'typebox';
 import type { PiSurface } from '../pi-surface.ts';
 import type { TodosService } from '../todos-service.ts';
 import { planTodoReadHook } from '../todo-read-hook.ts';
+import { TODO_REMINDER_CUSTOM_TYPE, planStopTodoReminder, todoReminderGraceMs } from '../todo-reminder-core.ts';
 import { makeProgressUpdate } from '../subagent-core.ts';
-import { TODO_DETAILS_KEY, TODO_TOOL_NAME, formatTodoConfirmation, type TodoItem, type TodoStatus } from '../vocab.ts';
+import { TODO_DETAILS_KEY, TODO_TOOL_NAME, formatTodoConfirmation, type TodoItem } from '../vocab.ts';
 import { formatAge, isArchived } from '../stale-core.ts';
 import {
   TODO_EDIT_CUSTOM_TYPE,
   completionTransitions,
-  countTodos,
   fuzzyFind,
   listsEqual,
   makeSnapshot,
@@ -26,6 +26,7 @@ import {
   revertedCompleted,
   validateTodos,
 } from '../todo-core.ts';
+import { anchorTodoRange, formatTodoSummary, renderTodoGroups } from '../todo-window.ts';
 
 export interface TodoUiSlot {
   /** Lets index lifecycle events render through the currently mounted plugin. */
@@ -40,6 +41,11 @@ interface TodoDeps {
   mirrorTodos: () => void;
   appendEntry: (customType: string, data: unknown) => void;
   state: TodoUiSlot;
+  /** Master-only unfinished-todo reminder; omitted on worker panes. */
+  stopReminder?: {
+    getBlockedDepth: () => number;
+    getRunningSubs: () => number;
+  };
 }
 
 const TOOL_DESCRIPTION = [
@@ -52,37 +58,9 @@ const TOOL_DESCRIPTION = [
   'Delegated work belongs on this list too. When you hand an entry to a subagent, append ` <sub>` to its content (the subagent is doing it, not you); when the subagent settles, a matching entry is auto-completed — you will see "Reconciled:" in the settlement note. If no auto-match fired, update the entry yourself.',
 ].join(' ');
 
-const TODO_MARKS: Record<TodoStatus, string> = {
-  pending: '○',
-  in_progress: '▶',
-  completed: '✓',
-  blocked: '■',
-  abandoned: '✗',
-};
-
 /** Stay within pi interactive mode's ten-line widget cap instead of relying on head truncation. */
 export const WIDGET_MAX_LINES = 10;
 
-/** Share phase rendering between the widget and /todos so both views order entries identically. */
-function renderGroups(items: readonly TodoItem[]): string[] {
-  const groups = new Map<string, TodoItem[]>();
-  for (const it of items) {
-    const key = it.phase ?? '';
-    const arr = groups.get(key) ?? [];
-    arr.push(it);
-    groups.set(key, arr);
-  }
-  const lines: string[] = [];
-  for (const [phase, list] of groups) {
-    if (phase) lines.push(`  [${phase}]`);
-    for (const it of list) {
-      const suffix = it.status === 'blocked' && it.blocker ? ` — ${it.blocker}` : '';
-      lines.push(`  ${TODO_MARKS[it.status]} ${it.content}${suffix}`);
-    }
-  }
-  return lines;
-}
-
 /**
  * Keep the active task visible within WIDGET_MAX_LINES instead of truncating to a fixed head or
  * tail. The window anchors on the first in-progress item, then the last open item, then recent
@@ -91,21 +69,23 @@ function renderGroups(items: readonly TodoItem[]): string[] {
  */
 export function widgetLines(items: readonly TodoItem[], opts?: { archivedAgeMs?: number | null }): string[] {
   if (items.length === 0) return [];
-  const c = countTodos(items);
   // Collapse archived plans to two lines so stale work cannot monopolize the widget.
   if (opts?.archivedAgeMs != null) {
     return [
-      `todo: ${c.inProgress}▶ ${c.pending}○ ${c.blocked}■ ${c.completed}✓ · archived ${formatAge(opts.archivedAgeMs)}`,
+      `${formatTodoSummary(items)} · archived ${formatAge(opts.archivedAgeMs)}`,
       '  archived — /todos 全量',
     ];
   }
 
   // Reserve summary and overflow lines, then shrink around the anchor because phase headers also consume the budget.
   const renderBudget = WIDGET_MAX_LINES - 1 - 1;
-  const [start, end] = anchorRange(items, renderBudget);
+  const [start, end] = anchorTodoRange(
+    items,
+    (s, e) => renderTodoGroups(items.slice(s, e)).length <= renderBudget,
+  );
   const kept = items.slice(start, end);
   const hidden = items.filter((_, i) => i < start || i >= end);
-  const lines = [`todo: ${c.inProgress}▶ ${c.pending}○ ${c.blocked}■ ${c.completed}✓`, ...renderGroups(kept)];
+  const lines = [formatTodoSummary(items), ...renderTodoGroups(kept)];
   if (hidden.length > 0) {
     const hiddenCompleted = hidden.filter((it) => it.status === 'completed').length;
     lines.push(`   +${hidden.length} hidden (${hiddenCompleted}✓) · /todos 全量`);
@@ -113,47 +93,9 @@ export function widgetLines(items: readonly TodoItem[], opts?: { archivedAgeMs?:
   return lines;
 }
 
-/**
- * Expand around the active anchor within the rendered-line budget, favoring upcoming work while
- * guaranteeing that the anchor remains visible.
- */
-function anchorRange(items: readonly TodoItem[], renderBudget: number): [number, number] {
-  if (renderGroups(items).length <= renderBudget) return [0, items.length];
-  const anchor = items.findIndex((it) => it.status === 'in_progress');
-  const anchorIdx = anchor >= 0
-    ? anchor
-    : items.reduce((acc, it, i) => (it.status !== 'completed' ? i : acc), -1);
-  if (anchorIdx < 0) {
-    // Completed plans keep the most recent tail visible within the line budget.
-    let end = items.length;
-    while (renderGroups(items.slice(0, end)).length > renderBudget && end > 1) end -= 1;
-    return [0, end];
-  }
-  let start = anchorIdx;
-  let end = anchorIdx + 1;
-  const fits = () => renderGroups(items.slice(start, end)).length <= renderBudget;
-  let growTail = true;
-  while ((end < items.length || start > 0) && (end - start) < items.length) {
-    if (growTail && end < items.length) {
-      end += 1;
-      if (!fits()) { end -= 1; break; }
-    } else if (start > 0) {
-      start -= 1;
-      if (!fits()) { start += 1; break; }
-    } else if (end < items.length) {
-      end += 1;
-      if (!fits()) { end -= 1; break; }
-    } else {
-      break;
-    }
-    growTail = !growTail; // Alternate sides so both context and upcoming work remain visible.
-  }
-  return [start, end];
-}
-
 export default function todoPlugin(ctx: Context): void {
   const surface = ctx.get('pi-herdr.surface') as PiSurface<object>;
-  const { todos, allowParallelInProgress, maxItems, mirrorTodos, appendEntry, state } =
+  const { todos, allowParallelInProgress, maxItems, mirrorTodos, appendEntry, state, stopReminder } =
     ctx.get('pi-herdr.todo-deps') as TodoDeps;
   const scoped = surface.forModule(import.meta.url);
 
@@ -242,6 +184,64 @@ export default function todoPlugin(ctx: Context): void {
     };
   });
 
+  if (stopReminder) {
+    const pi = surface.raw as {
+      sendMessage?: (
+        message: { customType: string; content: string; display?: boolean; details?: Record<string, unknown> },
+        opts?: { deliverAs?: string; triggerTurn?: boolean },
+      ) => Promise<void>;
+    };
+    let todoReminders = 0;
+    let lastAssistantStopReason: string | null = null;
+    let todoReminderTimer: NodeJS.Timeout | null = null;
+    function cancelTodoReminder(): void {
+      if (todoReminderTimer !== null) {
+        clearTimeout(todoReminderTimer);
+        todoReminderTimer = null;
+      }
+    }
+    scoped.on('turn_end', async (event: unknown) => {
+      if (event === null || typeof event !== 'object' || !('message' in event)) return;
+      const msg = (event as { message: unknown }).message;
+      if (msg === null || typeof msg !== 'object') return;
+      const { role, stopReason } = msg as { role?: unknown; stopReason?: unknown };
+      if (role === 'assistant' && typeof stopReason === 'string') {
+        lastAssistantStopReason = stopReason;
+      }
+    });
+    scoped.on('agent_start', () => cancelTodoReminder());
+    scoped.on('session_shutdown', () => cancelTodoReminder());
+    scoped.on('agent_settled', async () => {
+      cancelTodoReminder();
+      const plan = planStopTodoReminder({
+        lastStopReason: lastAssistantStopReason,
+        reminders: todoReminders,
+        runningSubs: stopReminder.getRunningSubs(),
+        blockedDepth: stopReminder.getBlockedDepth(),
+        items: todos.items,
+      });
+      if (!plan.due || plan.content == null) return;
+      const content = plan.content;
+      todoReminderTimer = setTimeout(() => {
+        todoReminderTimer = null;
+        void (async () => {
+          const send = pi.sendMessage;
+          if (typeof send !== 'function') return;
+          try {
+            await send(
+              { customType: TODO_REMINDER_CUSTOM_TYPE, content, display: true },
+              { deliverAs: 'followUp', triggerTurn: true },
+            );
+            todoReminders += 1;
+          } catch {
+            /* Delivery failure is non-fatal. */
+          }
+        })();
+      }, todoReminderGraceMs());
+      todoReminderTimer.unref?.();
+    });
+  }
+
   /* ── todo_write tool ───────────────────────────────────────────── */
   scoped.registerTool({
     name: TODO_TOOL_NAME,
@@ -372,14 +372,13 @@ export default function todoPlugin(ctx: Context): void {
         return;
       }
       // /todos is the unbounded view because the widget intentionally prioritizes active context.
-      const body = renderGroups(todos.items);
+      const body = renderTodoGroups(todos.items);
       if (body.length === 0) {
         ui?.notify?.('todo list is empty', 'info');
         return;
       }
-      const c = countTodos(todos.items);
       const age = archivedAgeMs();
-      const head = `todo: ${c.inProgress}▶ ${c.pending}○ ${c.blocked}■ ${c.completed}✓`
+      const head = formatTodoSummary(todos.items)
         + (age != null ? ` · archived ${formatAge(age)}（不再注入）` : '');
       ui?.notify?.([head, ...body].join('\n'), 'info');
     },

package/src/index-master.ts

@@ -89,6 +89,10 @@ export async function mountMasterPlugins(m: MasterPluginMount): Promise<void> {
       (m.pi as { appendEntry?: (t: string, d: unknown) => void }).appendEntry?.(customType, data);
     },
     state: m.todoUi,
+    stopReminder: {
+      getBlockedDepth: m.getBlockedDepth,
+      getRunningSubs: () => m.port.current?.listRunningSubs().length ?? 0,
+    },
   });
   await loadEntry(sessionRoot, useLoader, './core/todo.ts', todoPlugin);
 
@@ -101,12 +105,10 @@ export async function mountMasterPlugins(m: MasterPluginMount): Promise<void> {
     deliverNotice: m.deliverNotice,
     noticePending: m.noticePending,
     getSessionId: m.getSessionId,
-    getBlockedDepth: m.getBlockedDepth,
     reconcileOnSettlement: m.reconcileOnSettlement,
     withReconcileNotes: m.withReconcileNotes,
     claimSettleNotice: m.claimSettleNotice,
     terminalState: terminalDeps.state,
-    todos: m.todos,
   });
   await loadEntry(sessionRoot, useLoader, './core/subagent.ts', subagentPlugin);
 

package/src/index-runtime.ts

@@ -10,14 +10,18 @@ import { detectHerdrEnv } from './herdr-client.ts';
 export interface IndexMode {
   /** PI_HERDR_SUBAGENT=1 → worker pane (no subagent tools, no cordis loader). */
   readonly isSubagent: boolean;
-  /** herdr pane that is not a worker → apply builtin master manifest. */
+  /** HERDR_ENV + socket + pane are present. */
+  readonly hasHerdr: boolean;
+  /** herdr pane that is not a worker → apply builtin master manifest and mount workbench plugins. */
   readonly composeMaster: boolean;
 }
 
 export function planIndexMode(env: NodeJS.ProcessEnv = process.env): IndexMode {
   const isSubagent = env.PI_HERDR_SUBAGENT === '1';
+  const hasHerdr = Boolean(detectHerdrEnv(env));
   return {
     isSubagent,
-    composeMaster: Boolean(detectHerdrEnv(env)) && !isSubagent,
+    hasHerdr,
+    composeMaster: hasHerdr && !isSubagent,
   };
 }

package/src/index-worker.ts

@@ -1,8 +1,8 @@
 /**
- * Worker-process todo plugin mount (bare cordis root, no loader/hmr).
+ * Todo-only plugin mount (bare cordis root, no loader/hmr).
  *
- * Why: short-lived worker panes only need the todo coordination plugin.
- * Dynamically imported from the worker branch so bootstrap/loader stay out.
+ * Used by worker panes and by standalone pi outside herdr, so bootstrap/subagent/terminal
+ * stay out of those processes.
  */
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent';
 import { Context } from '@deepseek-ai/cordis';
@@ -11,14 +11,19 @@ import todoPlugin from './core/todo.ts';
 import type { TodosService } from './todos-service.ts';
 import type { TodoUiSlot } from './core/todo.ts';
 
-export interface WorkerPluginMount {
+export interface TodoOnlyMount {
   pi: ExtensionAPI;
   todos: TodosService;
   todoUi: TodoUiSlot;
   mirrorTodos: () => void;
+  /** Master-only stop reminder; omit on worker panes. */
+  stopReminder?: {
+    getBlockedDepth: () => number;
+    getRunningSubs: () => number;
+  };
 }
 
-export async function mountWorkerTodo(m: WorkerPluginMount): Promise<void> {
+export async function mountTodoOnly(m: TodoOnlyMount): Promise<void> {
   const workerRoot = new Context();
   const workerSurface = new PiSurface(m.pi as unknown as object);
   workerRoot.provide('pi-herdr.surface', workerSurface);
@@ -31,6 +36,7 @@ export async function mountWorkerTodo(m: WorkerPluginMount): Promise<void> {
       (m.pi as { appendEntry?: (t: string, d: unknown) => void }).appendEntry?.(customType, data);
     },
     state: m.todoUi,
+    ...(m.stopReminder ? { stopReminder: m.stopReminder } : {}),
   });
   await workerRoot.plugin(todoPlugin);
   m.pi.on('session_shutdown', () => {

package/src/index.ts

@@ -7,10 +7,7 @@
  * Capabilities:
  *  - `todo_write`: replace the complete todo list; the current pi session JSONL is authoritative,
  *    and branches automatically roll back in DSH-aligned semantics.
- *  - `subagent`: foreground/background delegation. Each child pane is an interactive pi TUI
- *    with an independent session/context that humans can enter directly; the controller uses
- *    herdr for state-gated injection (idle only), waiting (agent.wait), and JSONL result reads.
- *  - `list_agents` / `send_message` (followUp queue semantics) / `interrupt_agent` (esc).
+ *  - `subagent` / `terminal`: herdr-master only. Bare pi does not register them.
  *  - `/todos`, TUI widget, and herdr title projection with graceful degradation without herdr.
  *
  * pi 0.84.2 contract (validated):
@@ -111,9 +108,14 @@ export default async function (pi: ExtensionAPI) {
 
   /** Tier 2: worker role badge parsed from the env manifest and kept visible while idle. */
   let roleBadge: string | null = null;
+  /** Human-gate depth; ask_user_question and external herdr:blocked events share it. */
+  let blockedDepth = 0;
 
   function reportAgent(state: 'working' | 'idle' | 'blocked', activity: string | null): void {
     if (!client.available) return;
+    // While a human gate is open, never let tool-badge / turn_start / settle overwrite blocked.
+    // Needed when herdr:pi is absent (pi-herdr is the authority); no-op under full-lifecycle herdr:pi.
+    if (blockedDepth > 0 && state !== 'blocked') return;
     const message = activity ?? (state === 'idle' ? roleBadge : null);
     client.reportAgent(state, message).catch(() => {});
   }
@@ -156,8 +158,8 @@ export default async function (pi: ExtensionAPI) {
       progressSuffix: suffix,
       lastWriteAt: todos.lastWriteAt,
     });
-    // D97: narrow-frame static state shares inputs with the pane title; thinking tokens cannot reach it, so a static frame would freeze.
-    updateSlimFrame(title);
+    // D97: overlay content shares the todo snapshot; thinking tokens cannot reach it.
+    updateSlimFrame({ title, items: todos.items, lastWriteAt: todos.lastWriteAt });
     client.reportMetadata({
       session: label,
       items: todos.items,
@@ -226,11 +228,13 @@ export default async function (pi: ExtensionAPI) {
     }
   });
 
-  installWriteLocks(pi, {
-    client,
-    env,
-    hard: process.env[WRITE_LOCK_ENV] === '1',
-  });
+  if (env) {
+    installWriteLocks(pi, {
+      client,
+      env,
+      hard: process.env[WRITE_LOCK_ENV] === '1',
+    });
+  }
 
   /* ── todo family slot (core/todo.ts fills the plugin hook; widget rendering moved with the family) ── */
   const todoUi: { renderWidget: (ctx: unknown) => void } = {
@@ -369,15 +373,16 @@ export default async function (pi: ExtensionAPI) {
     if (plan.notice && !isSubagent) {
       const running = subagentPort.current?.listRunningSubs() ?? [];
       const brief = running.map((s) => `${s.paneId} (${s.description})`).join('、');
-      const notice = `注意：仍有 ${running.length} 个后台 subagent 在运行：${brief}。若你的任务依赖它们，请等待其结算（list_agents 查看状态）；若不等待，请说明放弃原因。`;
+      const notice = `注意：仍有 ${running.length} 个后台 subagent 在运行：${brief}。若你的任务依赖它们，请等待其结算（subagent list 查看状态）；若不等待，请说明放弃原因。`;
       void sendUserMessageIn(notice);
     }
   });
 
-  // v1.3 M8: report blocked state ourselves (D29's exemption relies on blocked visibility).
-  // Observed: pi 0.84.2 core emits no "herdr:blocked" (the official integration listener is dead code),
-  // so this extension manages enterBlocked/exitBlocked while ask_user_question waits for human input.
-  let blockedDepth = 0;
+  // Official herdr:pi is full-lifecycle authority when installed: it reports blocked
+  // only on the herdr:blocked event (pi core never emits it). Custom source=pi-herdr
+  // pane.report_agent is ignored while that authority is live
+  // (screen_detection_skip_reason=full_lifecycle_hook_authority). Emit the event so
+  // herdr:pi publishes blocked; keep report_agent as fallback when it is absent.
   function enterBlocked(label: string | null): void {
     blockedDepth += 1;
     reportAgent('blocked', label);
@@ -392,14 +397,34 @@ export default async function (pi: ExtensionAPI) {
       void client.reportAskFlag(null).catch(() => {});
     }
   }
-  (pi as { events?: { on?: (ev: string, cb: (data: unknown) => void) => void } }).events?.on?.(
-    'herdr:blocked',
-    (data) => {
-      const d = data as { active?: boolean; label?: string } | undefined;
-      if (d?.active) enterBlocked(typeof d.label === 'string' ? d.label : null);
+
+  // emit() is synchronous; this flag stops our own listener from double-counting depth.
+  let publishingHerdrBlocked = false;
+  function publishHerdrBlocked(active: boolean, label: string | null): void {
+    publishingHerdrBlocked = true;
+    try {
+      if (active) enterBlocked(label);
       else exitBlocked();
-    },
-  );
+      pi.events.emit(
+        'herdr:blocked',
+        active ? { active: true, ...(label ? { label } : {}) } : { active: false },
+      );
+    } finally {
+      publishingHerdrBlocked = false;
+    }
+  }
+  pi.events.on('herdr:blocked', (data) => {
+    if (publishingHerdrBlocked) return;
+    if (!data || typeof data !== 'object') {
+      exitBlocked();
+      return;
+    }
+    if (!('active' in data) || data.active !== true) {
+      exitBlocked();
+      return;
+    }
+    enterBlocked('label' in data && typeof data.label === 'string' ? data.label : null);
+  });
 
   /* ── Tool: ask_user_question (v1.3 M8 human gate, available to master and subagents) ── */
 
@@ -423,9 +448,10 @@ export default async function (pi: ExtensionAPI) {
       const ui = (ctx as {
         ui?: { input?: (title: string, placeholder?: string) => Promise<string | undefined> };
       }).ui;
-      enterBlocked(question);
-      // v1.3 M8 observed: herdr keeps detecting working while waiting for a human, overriding a one-shot blocked report;
-      // repeat it every 5s so the pane stays blocked and remains visible/GC-exempt.
+      publishHerdrBlocked(true, question);
+      // Fallback when herdr:pi is absent: a one-shot pi-herdr blocked report can lose
+      // to later working reports; refresh while the gate is open. Do not re-emit
+      // herdr:blocked here — official blockedCount is edge-triggered.
       const hb = setInterval(() => { reportAgent('blocked', question); }, 5000);
       try {
         const answer = await ui?.input?.(question, 'your answer');
@@ -435,7 +461,7 @@ export default async function (pi: ExtensionAPI) {
         };
       } finally {
         clearInterval(hb);
-        exitBlocked();
+        publishHerdrBlocked(false, null);
       }
     },
   });
@@ -533,8 +559,10 @@ export default async function (pi: ExtensionAPI) {
     }
   });
 
-  /* subagent tools are master-only (depth 1). C3: worker never loads bootstrap. */
-  if (!isSubagent) {
+  /* Workbench plugins (subagent/terminal + cordis) are herdr-master only.
+   * Bare pi and worker panes mount todo only so unused tools never appear.
+   * Dynamic import: worker/bare-pi must never load bootstrap/subagent-scope (C3). */
+  if (mode.composeMaster) {
     const { mountMasterPlugins } = await import('./index-master.ts');
     await mountMasterPlugins({
       pi,
@@ -555,7 +583,20 @@ export default async function (pi: ExtensionAPI) {
       claimSettleNotice,
     });
   } else {
-    const { mountWorkerTodo } = await import('./index-worker.ts');
-    await mountWorkerTodo({ pi, todos, todoUi, mirrorTodos });
+    const { mountTodoOnly } = await import('./index-worker.ts');
+    await mountTodoOnly({
+      pi,
+      todos,
+      todoUi,
+      mirrorTodos,
+      ...(isSubagent
+        ? {}
+        : {
+            stopReminder: {
+              getBlockedDepth: () => blockedDepth,
+              getRunningSubs: () => subagentPort.current?.listRunningSubs().length ?? 0,
+            },
+          }),
+    });
   }
 }

package/src/notice-buffer.ts

@@ -12,12 +12,12 @@ export const NOTICE_MAX_SHOWN = 3;
  * Collapse a batch into one message body.
  * - empty → null (do not inject)
  * - ≤max → originals joined with `\n\n` (single-item byte-identical to the old format)
- * - >max → first max originals + a tail pointing at history / list_agents
+ * - >max → first max originals + a tail pointing at history / subagent list
  */
 export function collapseNotices(contents: readonly string[], max = NOTICE_MAX_SHOWN): string | null {
   if (contents.length === 0) return null;
   if (contents.length <= max) return contents.join('\n\n');
   const hidden = contents.length - max;
-  const tail = `…另有 ${hidden} 条结算未逐条展示。全量结果看 history 台账（路径公式见 resume_subagent 工具描述）；在跑代理用 list_agents 查看。`;
+  const tail = `…另有 ${hidden} 条结算未逐条展示。全量结果看 history 台账（路径公式见 subagent resume 工具描述）；在跑代理用 subagent list 查看。`;
   return [...contents.slice(0, max), tail].join('\n\n');
 }

package/src/roles/master.json

@@ -1,13 +1,13 @@
 {
   "role": "master",
-  "version": "1.3.1",
-  "description": "主控角色（WS-D7 自应用；D83 镜像源）：自研核心全量（todos/协调/subagent 族/终端族）+ pi 内建检视执行 + web_search；D82 unknownTools=allow——用户安装的任意扩展默认可见可用（install 即授予）",
+  "version": "1.4.0",
+  "description": "主控角色（WS-D7 自应用；D83 镜像源）：核心工具（todos/协调/subagent/terminal）+ pi 内建 + web_search；D82 unknownTools=allow。v1.4.0: 工具合并 terminal 6→1, subagent 5→1",
   "manifest": {
     "unknownTools": "allow",
     "tools": [
       "todo_write", "ask_user_question",
-      "subagent", "resume_subagent", "list_agents", "send_message", "interrupt_agent",
-      "terminal_open", "terminal_send", "terminal_read", "terminal_signal", "terminal_close", "terminal_list",
+      "subagent",
+      "terminal",
       "read", "grep", "glob", "bash", "pwsh", "edit", "write",
       "web_search"
     ],

package/src/roles/worker-default.json

@@ -1,7 +1,7 @@
 {
   "role": "worker-default",
-  "version": "1.3.1",
-  "description": "默认worker角色（D83 继承制）：镜像 master.tools 减 subagent 族（禁嵌套）减 terminal 族（M14 资源归属）；排除族显式 deny——在 D82 unknownTools=allow 姿态下仍持禁令；todos serial",
+  "version": "1.4.0",
+  "description": "默认worker角色（D83 继承制）：镜像 master.tools 减 subagent/terminal（禁嵌套、资源归属）；排除族显式 deny——在 D82 unknownTools=allow 姿态下仍持禁令；todos serial。v1.4.0: 工具合并后更新 deny 列表",
   "manifest": {
     "unknownTools": "allow",
     "tools": [
@@ -11,16 +11,7 @@
     ],
     "rules": {
       "subagent": "deny",
-      "resume_subagent": "deny",
-      "list_agents": "deny",
-      "send_message": "deny",
-      "interrupt_agent": "deny",
-      "terminal_open": "deny",
-      "terminal_send": "deny",
-      "terminal_read": "deny",
-      "terminal_signal": "deny",
-      "terminal_close": "deny",
-      "terminal_list": "deny",
+      "terminal": "deny",
       "*": "allow"
     }
   },