@yeaft/webchat-agent 0.1.763 → 0.1.766

package/bin/yeaft-stats.js

@@ -0,0 +1,165 @@
+#!/usr/bin/env node
+/**
+ * yeaft-stats — CLI entry for tool-call usage statistics.
+ *
+ * Reads `~/.yeaft/stats/tool-usage.json` and renders a table (default),
+ * lists tools that have never been called (`--unused`), or dumps raw
+ * JSON (`--json`).
+ *
+ * Usage:
+ *   yeaft-stats               # ranked table by call count (desc)
+ *   yeaft-stats --unused      # tools registered but never called
+ *   yeaft-stats --json        # raw snapshot (pipe-friendly)
+ *   yeaft-stats --reset       # delete the stats file
+ *   yeaft-stats --yeaft-dir=/path
+ *   yeaft-stats --help
+ */
+
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import { ToolUsageStats } from '../unify/stats/tool-usage.js';
+import { allTools } from '../unify/tools/index.js';
+import { formatMs, formatPct, formatLastCalled } from '../unify/stats/format.js';
+
+function parseArgs(argv) {
+  const opts = {
+    unused: false,
+    json: false,
+    reset: false,
+    yeaftDir: null,
+    help: false,
+  };
+  for (const arg of argv.slice(2)) {
+    if (arg === '--unused') opts.unused = true;
+    else if (arg === '--json') opts.json = true;
+    else if (arg === '--reset') opts.reset = true;
+    else if (arg === '--help' || arg === '-h') opts.help = true;
+    else if (arg.startsWith('--yeaft-dir=')) opts.yeaftDir = arg.slice('--yeaft-dir='.length);
+  }
+  return opts;
+}
+
+function printHelp() {
+  console.log(`yeaft-stats — tool-call usage statistics
+
+Usage:
+  yeaft-stats               Ranked table by call count (desc)
+  yeaft-stats --unused      Tools registered but never called
+  yeaft-stats --json        Raw JSON snapshot (pipe-friendly)
+  yeaft-stats --reset       Delete the stats file
+  yeaft-stats --yeaft-dir=/path
+  yeaft-stats --help        Show this message`);
+}
+
+function padRight(s, n) {
+  const str = String(s);
+  return str.length >= n ? str : str + ' '.repeat(n - str.length);
+}
+
+function padLeft(s, n) {
+  const str = String(s);
+  return str.length >= n ? str : ' '.repeat(n - str.length) + str;
+}
+
+function printTable(snapshot) {
+  const entries = Object.entries(snapshot)
+    .sort((a, b) => b[1].callCount - a[1].callCount);
+  if (entries.length === 0) {
+    console.log('(no tool calls recorded yet)');
+    return;
+  }
+  const cols = [
+    { key: 'name', label: 'name', width: 28, align: 'l' },
+    { key: 'calls', label: 'calls', width: 7, align: 'r' },
+    { key: 'errors', label: 'errors', width: 7, align: 'r' },
+    { key: 'errRate', label: 'err%', width: 6, align: 'r' },
+    { key: 'p50', label: 'p50', width: 8, align: 'r' },
+    { key: 'p95', label: 'p95', width: 8, align: 'r' },
+    { key: 'avg', label: 'avg', width: 8, align: 'r' },
+    { key: 'last', label: 'last', width: 12, align: 'l' },
+  ];
+  const header = cols.map(c => (c.align === 'r' ? padLeft(c.label, c.width) : padRight(c.label, c.width))).join('  ');
+  console.log(header);
+  console.log('-'.repeat(header.length));
+  for (const [name, rec] of entries) {
+    const row = [
+      padRight(name.slice(0, cols[0].width), cols[0].width),
+      padLeft(rec.callCount, cols[1].width),
+      padLeft(rec.errorCount, cols[2].width),
+      padLeft(formatPct(rec.errorRate), cols[3].width),
+      padLeft(formatMs(rec.p50Ms), cols[4].width),
+      padLeft(formatMs(rec.p95Ms), cols[5].width),
+      padLeft(formatMs(rec.avgMs), cols[6].width),
+      padRight(formatLastCalled(rec.lastCalledAt), cols[7].width),
+    ].join('  ');
+    console.log(row);
+  }
+}
+
+async function getRegisteredToolNames() {
+  // Pull names directly from the static `allTools` export. MCP/skill
+  // dynamic tools aren't covered here — the unused list only flags
+  // built-in tools that have a definition in the source tree.
+  try {
+    if (Array.isArray(allTools)) {
+      return allTools
+        .filter(t => t && typeof t.name === 'string' && t.name)
+        .map(t => t.name);
+    }
+  } catch {
+    // fall through
+  }
+  return [];
+}
+
+async function main() {
+  const opts = parseArgs(process.argv);
+  if (opts.help) {
+    printHelp();
+    process.exit(0);
+  }
+
+  const yeaftDir = opts.yeaftDir || join(homedir(), '.yeaft');
+  const statsPath = join(yeaftDir, 'stats', 'tool-usage.json');
+  const stats = new ToolUsageStats({ path: statsPath });
+
+  if (opts.reset) {
+    await stats.reset();
+    console.log(`reset: ${statsPath}`);
+    process.exit(0);
+  }
+
+  stats.loadSync();
+  const snapshot = stats.snapshot();
+
+  if (opts.json) {
+    console.log(JSON.stringify({ path: statsPath, tools: snapshot }, null, 2));
+    process.exit(0);
+  }
+
+  if (opts.unused) {
+    const registered = await getRegisteredToolNames();
+    if (registered.length === 0) {
+      console.error('(could not enumerate registered tools — pass --json for raw stats)');
+      process.exit(1);
+    }
+    const unused = stats.getRegisteredButUncalled(registered);
+    console.log(`Registered: ${registered.length}   Called at least once: ${registered.length - unused.length}   Unused: ${unused.length}`);
+    console.log('-'.repeat(60));
+    if (unused.length === 0) {
+      console.log('(every registered tool has been called at least once)');
+    } else {
+      for (const name of unused) console.log(name);
+    }
+    process.exit(0);
+  }
+
+  console.log(`stats: ${statsPath}`);
+  console.log('');
+  printTable(snapshot);
+}
+
+main().catch(err => {
+  console.error(`yeaft-stats failed: ${err && err.message ? err.message : err}`);
+  process.exit(1);
+});

package/connection/message-router.js

@@ -36,7 +36,7 @@ import { sendToServer, flushMessageBuffer } from './buffer.js';
 import { handleRestartAgent, handleUpgradeAgent } from './upgrade.js';
 import { loadMcpServers, updateMcpConfig } from '../mcp.js';
 import { getLlmConfig, updateLlmConfig, getUnifySettings, updateUnifySettings, getSearchSettings, updateSearchSettings, fetchTavilyUsage } from '../unify/config-api.js';
-import { handleUnifyGroupChat, handleUnifyModeSwitch, handleUnifyModelSwitch, resetUnifySession, handleUnifyLoadHistory, handleUnifyLoadMoreHistory, handleUnifyAbortThread, handleUnifyAbortAll, handleUnifyAbortTurn, handleUnifyVpSubscribe, handleUnifyVpCreate, handleUnifyVpUpdate, handleUnifyVpDelete, handleUnifyVpRead, handleUnifyFetchSummaryHistory, handleUnifyFeatureCrud, handleUnifyListGroups, handleUnifyCreateGroup, handleUnifyRenameGroup, handleUnifyUpdateGroup, handleUnifyArchiveGroup, handleUnifyDeleteGroup, handleUnifyAddMember, handleUnifyRemoveMember, handleUnifySetDefaultVp, handleUnifyDreamTrigger, broadcastLanguageChange } from '../unify/web-bridge.js';
+import { handleUnifyGroupChat, handleUnifyModeSwitch, handleUnifyModelSwitch, resetUnifySession, handleUnifyLoadHistory, handleUnifyLoadMoreHistory, handleUnifyAbortThread, handleUnifyAbortAll, handleUnifyAbortTurn, handleUnifyVpSubscribe, handleUnifyVpCreate, handleUnifyVpUpdate, handleUnifyVpDelete, handleUnifyVpRead, handleUnifyListGroups, handleUnifyCreateGroup, handleUnifyRenameGroup, handleUnifyUpdateGroup, handleUnifyArchiveGroup, handleUnifyDeleteGroup, handleUnifyAddMember, handleUnifyRemoveMember, handleUnifySetDefaultVp, handleUnifyDreamTrigger, handleUnifyFetchToolStats, broadcastLanguageChange } from '../unify/web-bridge.js';
 
 export async function handleMessage(msg) {
   switch (msg.type) {
@@ -460,14 +460,6 @@ export async function handleMessage(msg) {
       handleUnifyVpRead(msg);
       break;
 
-    // R6 G1a — feature summary history + feature affiliation CRUD.
-    case 'unify_fetch_summary_history':
-      await handleUnifyFetchSummaryHistory(msg);
-      break;
-    case 'unify_feature_crud':
-      await handleUnifyFeatureCrud(msg);
-      break;
-
     // task-334m: Group CRUD + D1 seed wiring (§Δ10 334m + R6 §Δ31.2).
     // All handlers reply via `group_crud_result`; mutating ops additionally
     // emit `group_roster_changed` (add/remove/default) or
@@ -505,6 +497,11 @@ export async function handleMessage(msg) {
       await handleUnifyDreamTrigger(msg);
       break;
 
+    // 2026-05-13: per-tool call counters for the Unify debug drawer.
+    case 'unify_fetch_tool_stats':
+      await handleUnifyFetchToolStats(msg);
+      break;
+
     // Expert roles definition (for ExpertPanel detail view)
     case 'get_expert_roles': {
       const { getExpertRolesDefinition } = await import('../expert-roles.js');

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.763",
+  "version": "0.1.766",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",
   "bin": {
     "yeaft-agent": "./cli.js",
-    "yeaft": "./unify/cli.js"
+    "yeaft": "./unify/cli.js",
+    "yeaft-stats": "./bin/yeaft-stats.js"
   },
   "scripts": {
     "start": "node index.js",

package/unify/cli.js

@@ -454,6 +454,22 @@ async function runREPL(config, args) {
           console.log(`  Cold messages: ${conversationStore.countCold()}`);
           console.log(`  Registered tools: ${toolRegistry.size}`);
           console.log(`  Loaded skills: ${skillManager.size}`);
+          // 2026-05-13: per-tool call counters. Rendered inline so the
+          // REPL gives a one-shot snapshot — the `yeaft-stats` CLI is
+          // the dedicated entry for richer rendering / --unused mode.
+          if (session.toolStats && typeof session.toolStats.snapshot === 'function') {
+            const snap = session.toolStats.snapshot();
+            const entries = Object.entries(snap).sort((a, b) => b[1].callCount - a[1].callCount);
+            if (entries.length === 0) {
+              console.log(`  Tool calls: (none recorded yet)`);
+            } else {
+              console.log(`  Tool calls (top 10 by count):`);
+              for (const [name, rec] of entries.slice(0, 10)) {
+                const errPct = rec.callCount > 0 ? ((rec.errorCount / rec.callCount) * 100).toFixed(1) : '0';
+                console.log(`    ${name.padEnd(28)}  ${String(rec.callCount).padStart(5)} calls  ${errPct.padStart(5)}% err  p50=${rec.p50Ms}ms p95=${rec.p95Ms}ms`);
+              }
+            }
+          }
           break;
         }
 

package/unify/dream-v2/prompts/index.js

@@ -21,7 +21,6 @@ const FILES = {
   extractUser: 'extract-user.md',
   extractVp: 'extract-vp.md',
   extractGroup: 'extract-group.md',
-  extractFeature: 'extract-feature.md',
   extractTopic: 'extract-topic.md',
   // H2.e — per-scope summary compression
   summarizeScope: 'summarize-scope.md',
@@ -32,6 +31,10 @@ const FILES = {
  * extraction template name. Unknown scopes fall back to `extractTopic`
  * (the most generic template) so we never throw at extraction time.
  *
+ * (2026-05-13: `extractFeature` was removed along with the Feature
+ * system; legacy `feature/*` scopes — if any remain in old data — fall
+ * through to `extractTopic` here, which is harmless.)
+ *
  * @param {string} scope
  * @returns {keyof typeof FILES}
  */
@@ -40,7 +43,6 @@ export function extractTemplateForScope(scope) {
   if (scope === 'user') return 'extractUser';
   if (scope.startsWith('vp/')) return 'extractVp';
   if (scope.startsWith('group/')) return 'extractGroup';
-  if (scope.startsWith('feature/')) return 'extractFeature';
   if (scope.startsWith('topic/')) return 'extractTopic';
   return 'extractTopic';
 }

package/unify/dream-v2/session-wiring.js

@@ -77,7 +77,11 @@ export function buildRunDreamOpts(session, onProgress) {
 
 /**
  * Translate a group-store message record (id, from, role, text, ...) into
- * the shape runDream expects (id, role, body, vpId, author, featureId).
+ * the shape runDream expects (id, role, body, vpId, author).
+ *
+ * (2026-05-13: legacy `m.meta.featureId` propagation was dropped along
+ * with the Feature system. Historical messages on disk may still carry
+ * it, but it no longer influences dream scoping.)
  *
  * @param {Object} m
  */
@@ -91,9 +95,6 @@ function translateGroupMessage(m) {
   if (role === 'assistant' && m.from && m.from !== 'user') {
     out.vpId = m.from;
   }
-  if (m.meta && typeof m.meta === 'object' && m.meta.featureId) {
-    out.featureId = m.meta.featureId;
-  }
   return out;
 }
 

package/unify/dream-v2/triage.js

@@ -6,9 +6,9 @@
  *
  *   1. **Hard rules** (this module, no LLM): everything we can determine
  *      from message metadata. Always include the active group, every VP
- *      that spoke as an assistant in the diff, every feature referenced
- *      via `featureId`, and `user` (so painted-over user-profile signals
- *      can't be missed).
+ *      that spoke as an assistant in the diff, and `user` (so painted-over
+ *      user-profile signals can't be missed). (Feature scope was dropped
+ *      2026-05-13 along with the rest of the Feature system.)
  *
  *   2. **Soft classification** (LLM, two passes):
  *        Pass-1: high-recall — does the diff carry user-profile signal?
@@ -17,9 +17,9 @@
  *                              it to an exact existing path or propose
  *                              a new ≤2-level path.
  *
- *      VP / group / feature are deliberately NOT asked of the LLM —
- *      Hard Rules already cover them, and giving the LLM a chance to
- *      drop a structurally-required scope would weaken the contract.
+ *      VP / group are deliberately NOT asked of the LLM — Hard Rules
+ *      already cover them, and giving the LLM a chance to drop a
+ *      structurally-required scope would weaken the contract.
  *
  *      `user_profile_signals === true` does not need Pass-2 either: the
  *      Hard Rule already added `user` and Apply itself decides whether
@@ -75,10 +75,7 @@ export function applyHardRules({ groupId, messages }) {
       const vp = m.vpId || (m.author && /^vp:(.+)$/.exec(m.author)?.[1]);
       if (vp && /^[A-Za-z0-9_\-.一-鿿]+$/.test(vp)) add(`vp/${vp}`);
     }
-    // Active feature: explicit metadata.
-    if (m.featureId && /^[A-Za-z0-9_\-.一-鿿]+$/.test(m.featureId)) {
-      add(`feature/${m.featureId}`);
-    }
+    // (Active feature scope was dropped 2026-05-13 with the Feature system.)
   }
 
   return Array.from(out.values());

package/unify/engine.js

@@ -253,32 +253,17 @@ export class Engine {
   /** @type {string|null} */
   #yeaftDir;
 
+  /** @type {import('./stats/tool-usage.js').ToolUsageStats|null} — per-tool call/latency counters */
+  #toolStats = null;
+
   /** @type {object|null} — Config override for internal tasks (recall, consolidation, dream) using fastModel */
   #fastConfig;
 
   /** @type {((agentId: string, evt: object) => void) | null} */
   #subAgentEventSink = null;
 
-  /**
-   * PR-4 — current-featureId accessor.
-   *
-   * The feature arc lives in the per-VP web-bridge (`runVpTurn` creates
-   * one per turn) so the engine itself does NOT own the featureId. To
-   * let sub-agents inherit their parent's featureId without coupling the
-   * engine to FeatureArc, the bridge plugs in a thin accessor right
-   * after creating the arc — `engine.setCurrentFeatureIdAccessor(() =>
-   * arc.getFeatureId() || null)`. The engine surfaces the result via
-   * `parentEngineDeps.getCurrentFeatureId` (read lazily at sub-agent
-   * event-emit time, so a feature that opens mid-turn still tags the
-   * sub-agent's later events).
-   *
-   * The accessor is cleared (set to null) by the bridge in the same
-   * `finally` block that clears the per-turn AbortController, so a
-   * stale arc reference can't leak into the next turn.
-   *
-   * @type {(() => (string|null)) | null}
-   */
-  #currentFeatureIdAccessor = null;
+  // (removed 2026-05-13) `#currentFeatureIdAccessor` — sub-agent
+  // feature-inheritance plumbing that went with the Feature system.
 
   /**
    * task-325a — abort state.
@@ -347,7 +332,7 @@ export class Engine {
    *   yeaftDir?: string,
    * }} params
    */
-  constructor({ adapter, trace, config, conversationStore, memoryIndex, amsRegistry, toolRegistry, skillManager, mcpManager, yeaftDir }) {
+  constructor({ adapter, trace, config, conversationStore, memoryIndex, amsRegistry, toolRegistry, skillManager, mcpManager, yeaftDir, toolStats = null }) {
     this.#adapter = adapter;
     this.#trace = trace;
     this.#config = config;
@@ -360,6 +345,7 @@ export class Engine {
     this.#skillManager = skillManager || null;
     this.#mcpManager = mcpManager || null;
     this.#yeaftDir = yeaftDir || null;
+    this.#toolStats = toolStats || null;
 
     // PR-L: tool history reflection log. Keyed by traceId so distinct
     // engine instances don't stomp on each other's jsonl files. When
@@ -516,7 +502,6 @@ export class Engine {
    * @param {{
    *   groupId?: string,
    *   ownVpId?: string|null,
-   *   featureId?: string,
    *   summaries: { user?: string, group?: string, vp?: string },
    *   recallEntries: object[],
    * }} args
@@ -562,7 +547,6 @@ export class Engine {
     const scopes = buildRelevantScopes({
       groupId: args.groupId,
       vpId: ownVpId,
-      featureId: args.featureId,
     });
 
     return { ams, groupKey, ownVpId, scopes, snapshotBlock };
@@ -753,9 +737,21 @@ export class Engine {
       // VP-aware tool). Undefined when running in non-group / no-VP flows.
       router: vpCtx?.router,
       senderVpId: vpCtx?.senderVpId,
+      // Active VP persona — surfaced so tools like `StartPlan` can read
+      // the optional `planInstruction` override without re-reading
+      // role.md. Mirrors the symmetry already present in
+      // `parentEngineDeps.parentVpPersona` below — sub-agents inherit it
+      // through the parent deps; tools at this level read it directly.
+      // Null in non-VP / test contexts.
+      vpPersona: vpCtx?.vpPersona || null,
       inboundEnvelope: vpCtx?.inboundEnvelope,
       taskId: vpCtx?.taskId,
       taskMembers: vpCtx?.taskMembers,
+      // TodoWrite per-VP cache hooks. Threaded from web-bridge so each
+      // VP keeps its own todo list (see todo-write.js, web-bridge.js).
+      // Null in non-VP / test contexts — tools tolerate missing slots.
+      getCurrentTodos: vpCtx?.getCurrentTodos || null,
+      setCurrentTodos: vpCtx?.setCurrentTodos || null,
       // task-707: tool-callable end-turn signal. The engine threads this
       // setter when constructing toolCtx so a tool (e.g. route_forward)
       // can mark "after this batch, end the turn — do NOT call adapter
@@ -776,13 +772,6 @@ export class Engine {
         parentVpPersona: vpCtx?.vpPersona || null,
         onEvent: this.#subAgentEventSink || null,
         language: this.#config?.language || 'en',
-        // PR-4: lazy accessor so the sub-agent runner can stamp the
-        // parent's active featureId on every forwarded event. Read at
-        // emit-time (NOT at spawn-time) so a feature that opens AFTER
-        // the sub-agent starts still tags later events.
-        getCurrentFeatureId: () => {
-          try { return this.#currentFeatureIdAccessor?.() || null; } catch { return null; }
-        },
       },
     };
   }
@@ -799,36 +788,6 @@ export class Engine {
     this.#subAgentEventSink = typeof sink === 'function' ? sink : null;
   }
 
-  /**
-   * PR-4 — install / clear the per-turn current-featureId accessor.
-   *
-   * Called by `runVpTurn` in web-bridge.js: right after `arc =
-   * createFeatureArc(...)` it passes `() => arc.getFeatureId() || null`,
-   * and clears it (passes null) in the `finally` so a stale arc
-   * reference can't leak into the next turn. The engine reads it
-   * lazily via `parentEngineDeps.getCurrentFeatureId` so sub-agents
-   * inherit whatever featureId is live at the moment they emit.
-   *
-   * Concurrency note: callers are expected to serialize per-VP turns
-   * (web-bridge does — `runVpTurn` runs one turn at a time per VP and
-   * its `finally` clears the accessor before the next turn lands).
-   * If two installs collide (which today would be a bug, not by
-   * design), we warn so it's visible in logs.
-   *
-   * @param {(() => (string|null)) | null} fn
-   */
-  setCurrentFeatureIdAccessor(fn) {
-    const next = typeof fn === 'function' ? fn : null;
-    if (next && this.#currentFeatureIdAccessor) {
-      // Canary: a prior accessor is still installed when we're about
-      // to overwrite it. Today's lifecycle (per-turn install + finally
-      // clear) means this should never fire; if it does, two turns
-      // are racing on the same engine.
-      console.warn('[Engine] setCurrentFeatureIdAccessor: overwriting non-null accessor — concurrent turns on the same VP engine?');
-    }
-    this.#currentFeatureIdAccessor = next;
-  }
-
   /**
    * Perform memory recall for a given prompt.
    *
@@ -839,7 +798,7 @@ export class Engine {
    * without injection.
    *
    * @param {string} prompt
-   * @param {{ groupId?: string, vpId?: string, featureId?: string }} [ctx]
+   * @param {{ groupId?: string, vpId?: string }} [ctx]
    * @returns {Promise<{ profile: string, entries: object[], formatted: string }|null>}
    */
   async #recallMemory(prompt, ctx = {}) {
@@ -850,7 +809,6 @@ export class Engine {
         userMsg: prompt,
         groupId: ctx.groupId,
         vpId: ctx.vpId,
-        featureId: ctx.featureId,
       });
       memory.profile = result.profile || '';
       memory.entries = result.entries || [];
@@ -1063,7 +1021,7 @@ export class Engine {
    *   string-prompt shape (no regression for existing callers).
    * @yields {EngineEvent}
    */
-  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted = false } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -1122,7 +1080,7 @@ export class Engine {
     const runSignal = abortCtrl.signal;
 
     try {
-      yield* this.#runQuery({ prompt: effectivePrompt, promptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted });
+      yield* this.#runQuery({ prompt: effectivePrompt, promptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted, getCurrentTodos, setCurrentTodos });
     } finally {
       if (signal) {
         try { signal.removeEventListener('abort', onExternalAbort); } catch { /* ignore */ }
@@ -1140,7 +1098,7 @@ export class Engine {
    * in a try/finally without indenting the whole loop.
    * @private
    */
-  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted = false }) {
+  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, groupId, vpPlan, groupAnnouncement, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null }) {
 
     // ─── Pre-query: FTS5 Memory Recall + AMS snapshot ─────
     // Memory has a SINGLE render outlet now (DESIGN-PROMPT §3 ③):
@@ -1159,9 +1117,6 @@ export class Engine {
       vpId: vpPersona && typeof vpPersona === 'object' && typeof vpPersona.vpId === 'string'
         ? vpPersona.vpId
         : (typeof senderVpId === 'string' ? senderVpId : undefined),
-      featureId: typeof inboundEnvelope === 'object' && inboundEnvelope
-        ? inboundEnvelope.featureId
-        : undefined,
     });
     recallEntryCount = recallResult && Array.isArray(recallResult.entries)
       ? recallResult.entries.length
@@ -1191,13 +1146,9 @@ export class Engine {
       && typeof vpPersona.vpId === 'string'
       ? vpPersona.vpId
       : (typeof senderVpId === 'string' ? senderVpId : null);
-    const featureIdForAms = typeof inboundEnvelope === 'object' && inboundEnvelope
-      ? inboundEnvelope.featureId
-      : undefined;
     const amsContext = this.#prepareAms({
       groupId,
       ownVpId: ownVpIdForAms,
-      featureId: featureIdForAms,
       summaries,
       recallEntries: recallResult ? (recallResult.entries || []) : [],
     });
@@ -1206,17 +1157,10 @@ export class Engine {
     }
 
     // ─── Active Scope (DESIGN-PROMPT §3 ④) ──────────────────────
-    // Structured per-turn scope summary: feature + group + vp + envelope
-    // routing info. Long-form scope content lives in AMS — this block
-    // carries only IDs + tiny labels. featureId is allowed to be null
-    // (T4 Scope Tagging is a placeholder; not every turn lives in a
-    // feature — DESIGN-PROMPT §5.1).
+    // Structured per-turn scope summary: group + vp + envelope routing
+    // info. Long-form scope content lives in AMS — this block carries
+    // only IDs + tiny labels. (Feature scope retired 2026-05-13.)
     const activeScope = {
-      featureId: featureIdForAms || null,
-      featureTitle: typeof inboundEnvelope === 'object' && inboundEnvelope
-        && typeof inboundEnvelope.featureTitle === 'string'
-        ? inboundEnvelope.featureTitle
-        : '',
       groupId: groupId || '',
       vpId: ownVpIdForAms || '',
       envelope: inboundEnvelope || null,
@@ -1228,12 +1172,6 @@ export class Engine {
       vpPersona,
       activeScope,
       groupAnnouncement,
-      // taskCtx is not currently wired by the query loop. The legacy
-      // task-context sub-block (renderTaskCtx, task-334e/334n contract) is
-      // retained behind a feature flag for callers that still build it
-      // upstream — it'll be folded into Active Scope or retired in a
-      // dedicated PR alongside the task-334n cleanup.
-      taskCtx: undefined,
     });
 
     // ─── Compact summary as messages-array head (DESIGN-PROMPT §4.3) ─
@@ -1901,6 +1839,8 @@ export class Engine {
         taskMembers,
         vpPersona,
         contextWindow: currentContextWindow,
+        getCurrentTodos,
+        setCurrentTodos,
         requestEndTurn: (reason) => {
           // First call wins — preserve the kind/reason of the first tool
           // that asked to end the turn. Late callers (a second
@@ -2012,6 +1952,20 @@ export class Engine {
           isError,
         };
 
+        // 2026-05-13: feed the per-tool counters. Stays best-effort — a
+        // stats sink that throws shouldn't crash the engine. `record`
+        // already swallows internal write errors.
+        if (this.#toolStats && typeof this.#toolStats.record === 'function') {
+          try {
+            this.#toolStats.record({
+              name: tc.name,
+              durationMs: toolDurationMs,
+              isError,
+              errorMessage: isError && typeof output === 'string' ? output.slice(0, 500) : null,
+            });
+          } catch { /* swallow */ }
+        }
+
         // Log tool to debug trace
         this.#trace.logTool(turnId, {
           toolName: tc.name,

package/unify/groups/pre-flow.js

@@ -225,19 +225,20 @@ export function formatPickedForInjection(picked) {
  */
 
 /**
- * Build the canonical scope list for a given (groupId, vpId, featureId).
+ * Build the canonical scope list for a given (groupId, vpId).
  * Always includes 'user'. The order is significant — preflow.js's scope
  * filter accepts/rejects by membership, and the formatter renders in
  * order.
  *
- * @param {{groupId?: string, vpId?: string, featureId?: string, extra?: string[]}} ctx
+ * (2026-05-13: `featureId` scope dropped along with the Feature system.)
+ *
+ * @param {{groupId?: string, vpId?: string, extra?: string[]}} ctx
  * @returns {string[]}
  */
-export function buildRelevantScopes({ groupId, vpId, featureId, extra } = {}) {
+export function buildRelevantScopes({ groupId, vpId, extra } = {}) {
   const scopes = ['user'];
   if (groupId) scopes.push(`group/${groupId}`);
   if (vpId) scopes.push(`vp/${vpId}`);
-  if (featureId) scopes.push(`feature/${featureId}`);
   if (Array.isArray(extra)) {
     for (const s of extra) {
       if (s && !scopes.includes(s)) scopes.push(s);
@@ -273,7 +274,6 @@ export function runMemoryPreflow(index, opts) {
   const relevantScopes = buildRelevantScopes({
     groupId: opts.groupId,
     vpId: opts.vpId,
-    featureId: opts.featureId,
     extra: opts.extraScopes,
   });