@yeaft/webchat-agent 0.1.936 → 0.1.937

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.936",
+  "version": "0.1.937",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",

package/yeaft/engine.js

@@ -42,7 +42,7 @@ import { countTurns } from './turn-utils.js';
 import { attachRouterPlan, extractPriorPlan, stripMetaForWire } from './router/continuity.js';
 import { resolveThinking } from './router/thinking.js';
 import { approxTokens } from './memory/budget.js';
-import { truncateToolResultIfNeeded } from './tools/registry.js';
+import { COLLAB_TOOL_POLICY, truncateToolResultIfNeeded } from './tools/registry.js';
 import {
   TOOL_BATCH_SIZE,
   TURN_SUMMARY_THRESHOLD,
@@ -551,9 +551,9 @@ export class Engine {
    *
    * @returns {import('./llm/adapter.js').UnifiedToolDef[]}
    */
-  #getToolDefs() {
+  #getToolDefs(collabToolPolicy = null) {
     if (this.#toolRegistry) {
-      return this.#toolRegistry.getToolDefs(this.#config?.language || 'en');
+      return this.#toolRegistry.getToolDefs(this.#config?.language || 'en', { collabToolPolicy });
     }
     // Legacy path: no mode filtering
     const defs = [];
@@ -1339,7 +1339,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, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, drainPendingUserMessages = null } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, drainPendingUserMessages = null, collabToolPolicy = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -1365,6 +1365,9 @@ export class Engine {
     const parsed = parseEffortPrefix(prompt);
     const effectivePrompt = parsed.cleanedPrompt;
     const effectiveUserEffort = normalizeEffort(userEffort) || parsed.effort || null;
+    const effectiveCollabToolPolicy = collabToolPolicy === COLLAB_TOOL_POLICY.SINGLE_VP || collabToolPolicy === COLLAB_TOOL_POLICY.MULTI_VP
+      ? collabToolPolicy
+      : null;
 
     // ─── task-325a: engine-owned AbortController ─────────────
     // We create our own controller for this query run so `engine.abort()`
@@ -1399,7 +1402,7 @@ export class Engine {
 
     try {
       this.#currentThreadId = threadId || MAIN_THREAD_ID;
-      yield* this.#runQuery({ prompt: effectivePrompt, promptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, threadId: this.#currentThreadId, drainPendingUserMessages });
+      yield* this.#runQuery({ prompt: effectivePrompt, promptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, threadId: this.#currentThreadId, drainPendingUserMessages, collabToolPolicy: effectiveCollabToolPolicy });
     } finally {
       if (signal) {
         try { signal.removeEventListener('abort', onExternalAbort); } catch { /* ignore */ }
@@ -1419,7 +1422,11 @@ 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, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, drainPendingUserMessages = null }) {
+  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, vpPlan, sessionAnnouncement, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, threadId = MAIN_THREAD_ID, drainPendingUserMessages = null, collabToolPolicy = null }) {
+
+    const effectiveCollabToolPolicy = collabToolPolicy === COLLAB_TOOL_POLICY.SINGLE_VP || collabToolPolicy === COLLAB_TOOL_POLICY.MULTI_VP
+      ? collabToolPolicy
+      : null;
 
     // ─── Pre-query: FTS5 Memory Recall + AMS snapshot ─────
     // Memory has a SINGLE render outlet now (DESIGN-PROMPT §3 ③):
@@ -1685,7 +1692,7 @@ export class Engine {
       };
     }
 
-    const toolDefs = this.#getToolDefs();
+    const toolDefs = this.#getToolDefs(effectiveCollabToolPolicy);
     let turnNumber = 0;
     let continueTurns = 0; // auto-continue counter
     let toolLoopTurns = 0; // task-327b: tool-use turns for long-loop auto-bump
@@ -2408,7 +2415,7 @@ export class Engine {
 
         // Resolve tool: prefer ToolRegistry, fallback to legacy #tools Map
         const hasTool = this.#toolRegistry
-          ? this.#toolRegistry.has(tc.name)
+          ? this.#toolRegistry.isAllowed(tc.name, { collabToolPolicy: effectiveCollabToolPolicy })
           : this.#tools.has(tc.name);
 
         if (!hasTool) {

package/yeaft/tools/registry.js

@@ -11,6 +11,27 @@
 
 import { formatSize } from '../archive/tool-results.js';
 
+/**
+ * Collaboration tools are mutually exclusive per Yeaft group shape:
+ * single-VP groups use sub-agents; multi-VP groups use VP-to-VP forwarding.
+ * Keep the policy names close to the tool registry so LLM exposure and
+ * execution gating use the same source of truth.
+ */
+export const COLLAB_TOOL_POLICY = Object.freeze({
+  SINGLE_VP: 'single-vp',
+  MULTI_VP: 'multi-vp',
+});
+
+export const SUB_AGENT_TOOL_NAMES = Object.freeze([
+  'SpawnAgent',
+  'PromptAgent',
+  'WaitAgent',
+  'CloseAgent',
+  'ListAgents',
+]);
+
+export const FORWARD_TOOL_NAMES = Object.freeze(['RouteForward']);
+
 /**
  * Per-tool-result hard cap.
  *
@@ -208,6 +229,20 @@ function runWithTimeout(promise, timeoutMs, toolName) {
   });
 }
 
+export function normalizeCollabToolPolicy(policy) {
+  if (policy === COLLAB_TOOL_POLICY.SINGLE_VP || policy === COLLAB_TOOL_POLICY.MULTI_VP) {
+    return policy;
+  }
+  return null;
+}
+
+export function isToolHiddenByCollabPolicy(toolName, policy) {
+  const normalized = normalizeCollabToolPolicy(policy);
+  if (!normalized) return false;
+  if (normalized === COLLAB_TOOL_POLICY.SINGLE_VP) return FORWARD_TOOL_NAMES.includes(toolName);
+  return SUB_AGENT_TOOL_NAMES.includes(toolName);
+}
+
 export class ToolRegistry {
   /** @type {Map<string, import('./types.js').ToolDef>} */
   #tools = new Map();
@@ -293,17 +328,36 @@ export class ToolRegistry {
 
   /**
    * Get tool definitions for the LLM adapter.
-   * Returns all registered tools — mode filtering was removed in task-297.
+   * Returns all registered tools unless a collaboration policy hides one of
+   * the mutually-exclusive orchestration tool families.
    * @param {string} [language='en']
+   * @param {{ collabToolPolicy?: string }} [opts]
    * @returns {{ name: string, description: string, parameters: object }[]}
    */
-  getToolDefs(language = 'en') {
+  getToolDefs(language = 'en', opts = {}) {
     const lang = normalizeLanguage(language);
-    return this.getAllTools().map(t => ({
-      name: t.name,
-      description: localizeVisibleText(t.description, lang, t.name),
-      parameters: localizeParameters(t.parameters, lang, t.name),
-    }));
+    const collabToolPolicy = normalizeCollabToolPolicy(opts?.collabToolPolicy);
+    return this.getAllTools()
+      .filter(t => !isToolHiddenByCollabPolicy(t.name, collabToolPolicy))
+      .map(t => ({
+        name: t.name,
+        description: localizeVisibleText(t.description, lang, t.name),
+        parameters: localizeParameters(t.parameters, lang, t.name),
+      }));
+  }
+
+  /**
+   * Check whether a tool may be called under the current collaboration policy.
+   * Unknown / absent policy keeps the historical behavior: all registered
+   * tools remain callable.
+   * @param {string} name
+   * @param {{ collabToolPolicy?: string }} [opts]
+   * @returns {boolean}
+   */
+  isAllowed(name, opts = {}) {
+    const tool = this.#tools.get(name);
+    if (!tool) return false;
+    return !isToolHiddenByCollabPolicy(tool.name, opts?.collabToolPolicy);
   }
 
   /**

package/yeaft/web-bridge.js

@@ -19,6 +19,7 @@
  */
 
 import { join } from 'node:path';
+import { COLLAB_TOOL_POLICY } from './tools/registry.js';
 import { existsSync } from 'node:fs';
 import { randomUUID } from 'node:crypto';
 import { buildDreamOutputSnapshot } from './dream/output-snapshot.js';
@@ -2616,6 +2617,14 @@ async function waitForVpDrivers(_groupId, driverKeys = []) {
  *   `route_forward` can extend `causedBy` chains correctly. Optional only
  *   for pre-707 callers that no longer exist in production.
  */
+function resolveCollabToolPolicy(sessionMeta) {
+  if (!sessionMeta || typeof sessionMeta !== 'object' || !Array.isArray(sessionMeta.roster)) {
+    return null;
+  }
+  const vpCount = new Set(sessionMeta.roster.filter(v => typeof v === 'string' && v.trim())).size;
+  return vpCount > 1 ? COLLAB_TOOL_POLICY.MULTI_VP : COLLAB_TOOL_POLICY.SINGLE_VP;
+}
+
 export function buildVpQueryOpts({ vpId, sessionCoordinator, sessionId, envelope, threadId = 'main' }) {
   // Read the group meta once and reuse for both defaultVpId fallback and
   // announcement injection. Each .getMeta() reload reads + parses the
@@ -2656,6 +2665,8 @@ export function buildVpQueryOpts({ vpId, sessionCoordinator, sessionId, envelope
   if (typeof sessionId === 'string' && sessionId.trim()) {
     out.sessionId = sessionId.trim();
   }
+  const collabToolPolicy = resolveCollabToolPolicy(sessionMeta);
+  if (collabToolPolicy) out.collabToolPolicy = collabToolPolicy;
   // task-334-group-editor: surface the group announcement to the engine so
   // buildWorkerPrompt can inject it as a CLAUDE.md-style shared prefix.
   // Empty/missing reads as '' and prompts.js skips the section.