@yeaft/webchat-agent 0.1.825 → 0.1.827

package/package.json

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

package/unify/sub-agent/runner.js

@@ -31,8 +31,10 @@ import { ToolRegistry } from '../tools/registry.js';
 import { buildSpawnedPreamble } from './spawned-prompt.js';
 
 const RESTRICTED_TOOLS = new Set([
-  'Agent',
-  'SendMessage',
+  'SpawnAgent',
+  'Agent',          // legacy alias
+  'PromptAgent',
+  'SendMessage',    // legacy alias
   'WaitAgent',
   'CloseAgent',
   'ListAgents',

package/unify/sub-agent/spawned-prompt.js

@@ -38,7 +38,7 @@ export function buildSpawnedPreamble({ parentName, parentVpId, agentName, missio
       m || '(无具体任务说明)',
       '',
       '## 行为约束',
-      '- 不要再 spawn sub-agent（你已经没有 Agent / SendMessage / WaitAgent / CloseAgent 工具）。',
+      '- 不要再 spawn sub-agent（你已经没有 SpawnAgent / PromptAgent / WaitAgent / CloseAgent 工具）。',
       '- 不要 route_forward 给别的 VP，不要 ask_user。',
       '- 完成时直接以 markdown 自由文本回复（end_turn）。建议结构："## 结果" / "## 关键发现" / "## 遗留问题"。',
       '- 失败/不可行也要明确说出来，不要假装完成。父 VP 会读你的最终消息。',
@@ -55,7 +55,7 @@ export function buildSpawnedPreamble({ parentName, parentVpId, agentName, missio
     m || '(no mission body provided)',
     '',
     '## Constraints',
-    '- Do NOT spawn further sub-agents (Agent / SendMessage / WaitAgent / CloseAgent are not in your toolset).',
+    '- Do NOT spawn further sub-agents (SpawnAgent / PromptAgent / WaitAgent / CloseAgent are not in your toolset).',
     '- Do NOT use route_forward to other VPs. Do NOT ask_user.',
     '- When done, reply in free markdown (end_turn). Suggested structure: "## Result" / "## Key findings" / "## Open questions".',
     '- If the mission is infeasible or you fail, say so plainly. The parent will read your final message.',

package/unify/tools/agent.js

@@ -174,7 +174,8 @@ export function tickAgent(agentId, delta = {}, now = Date.now()) {
 }
 
 export default defineTool({
-  name: 'Agent',
+  name: 'SpawnAgent',
+  aliases: ['Agent'],
   description: `Create a sub-agent to work on an independent task in parallel.
 
 Sub-agents run in their own context and can be given a concrete mission
@@ -189,7 +190,7 @@ Guidelines:
 - Give a clear, focused mission — what "done" looks like
 - Use expected_output to pin the structure you want back
 - Always set a budget for unbounded missions
-- Use SendMessage to communicate, WaitAgent to collect results, CloseAgent to finalize`,
+- Use PromptAgent to communicate, WaitAgent to collect results, CloseAgent to finalize`,
   parameters: {
     type: 'object',
     properties: {
@@ -302,7 +303,7 @@ Guidelines:
       persona: spec.persona || null,
       budget: spec.budget || null,
       status: agent.status,
-      message: `Sub-agent "${name}" spawned (${agentId}). Use WaitAgent to collect its first turn output, SendMessage to give it more work, CloseAgent to finish.`,
+      message: `Sub-agent "${name}" spawned (${agentId}). Use WaitAgent to collect its first turn output, PromptAgent to give it more work, CloseAgent to finish.`,
     });
   },
 });

package/unify/tools/index.js

@@ -18,7 +18,6 @@ import exitWorktree from './exit-worktree.js';
 
 // --- P0 Core tools ---
 import askUser from './ask-user.js';
-import openSourceMessage from './open-source-message.js';
 import webSearch from './web-search.js';
 import webFetch from './web-fetch.js';
 import historySearch from './history-search.js';
@@ -66,7 +65,6 @@ import { jsRepl, jsReplReset } from './js-repl.js';
 import notebookEdit from './notebook-edit.js';
 import imageGeneration from './image-generation.js';
 import viewImage from './view-image.js';
-import requestPermissions from './request-permissions.js';
 
 /**
  * All built-in tools, flattened into a single array.
@@ -82,7 +80,6 @@ export const allTools = [
 
   // P0 Core
   askUser,
-  openSourceMessage,
   webSearch,
   webFetch,
   historySearch,
@@ -117,7 +114,6 @@ export const allTools = [
   notebookEdit,
   imageGeneration,
   viewImage,
-  requestPermissions,
 ];
 
 /**

package/unify/tools/registry.js

@@ -226,6 +226,17 @@ export class ToolRegistry {
   register(tool) {
     if (!tool || !tool.name) throw new Error('Tool must have a name');
     this.#tools.set(tool.name, tool);
+    // Legacy-name aliases: keep historical jsonl tool_calls resolvable
+    // after a rename. The alias entry shares the same tool object so
+    // execute/has lookups succeed, but `getToolDefs()` dedupes by tool
+    // identity so the LLM only sees the canonical name.
+    if (Array.isArray(tool.aliases)) {
+      for (const alias of tool.aliases) {
+        if (typeof alias === 'string' && alias && alias !== tool.name) {
+          this.#tools.set(alias, tool);
+        }
+      }
+    }
     return this;
   }
 
@@ -269,10 +280,21 @@ export class ToolRegistry {
 
   /**
    * Get all registered tools (unfiltered).
+   *
+   * Dedupes alias entries — when a tool is registered with `aliases`,
+   * the same ToolDef object lives at multiple Map keys. We return each
+   * tool object at most once (under its canonical `tool.name`).
    * @returns {import('./types.js').ToolDef[]}
    */
   getAllTools() {
-    return Array.from(this.#tools.values());
+    const seen = new Set();
+    const out = [];
+    for (const tool of this.#tools.values()) {
+      if (seen.has(tool)) continue;
+      seen.add(tool);
+      out.push(tool);
+    }
+    return out;
   }
 
   /**
@@ -291,11 +313,12 @@ export class ToolRegistry {
   }
 
   /**
-   * Get all registered tool names.
+   * Get all registered tool names (canonical only — aliases are excluded
+   * so debug surfaces like the tool-stats panel show one row per tool).
    * @returns {string[]}
    */
   getToolNames() {
-    return Array.from(this.#tools.keys());
+    return this.getAllTools().map(t => t.name);
   }
 
   /**
@@ -337,12 +360,12 @@ export class ToolRegistry {
 
   /** Number of registered tools. */
   get size() {
-    return this.#tools.size;
+    return this.getAllTools().length;
   }
 
-  /** All registered tool names. */
+  /** All registered tool names (canonical only; aliases excluded). */
   get names() {
-    return Array.from(this.#tools.keys());
+    return this.getAllTools().map(t => t.name);
   }
 }
 

package/unify/tools/send-message.js

@@ -1,16 +1,20 @@
 /**
- * send-message.js — Send a message to a sub-agent.
+ * send-message.js — Send a follow-up prompt to a sub-agent.
+ *
+ * Tool name: PromptAgent (canonical) / SendMessage (legacy alias for
+ * historical jsonl replay — see registry alias map).
  */
 
 import { defineTool } from './types.js';
 import { getAgentRegistry } from './agent.js';
 
 export default defineTool({
-  name: 'SendMessage',
-  description: `Send a message to a sub-agent.
+  name: 'PromptAgent',
+  aliases: ['SendMessage'],
+  description: `Send a follow-up prompt to a sub-agent you previously spawned.
 
-Use this to give tasks, provide instructions, or relay information to a sub-agent.
-The message is queued for the agent to process.`,
+Use this to give the sub-agent more work, additional instructions, or relay
+information. The prompt is queued for the agent to process on its next turn.`,
   parameters: {
     type: 'object',
     properties: {

package/unify/tools/types.js

@@ -74,6 +74,7 @@
  */
 export function defineTool({
   name,
+  aliases,
   description,
   parameters,
   execute,
@@ -94,6 +95,12 @@ export function defineTool({
     isReadOnly,
     isDestructive,
   };
+  // Legacy tool-name aliases. Registered as extra lookup keys so old
+  // jsonl tool_calls (e.g. `SendMessage` → `PromptAgent`) keep resolving,
+  // but excluded from the LLM-visible catalogue.
+  if (Array.isArray(aliases) && aliases.length > 0) {
+    def.aliases = aliases.slice();
+  }
   // Only attach `timeoutMs` when the tool author opts in. Leaving it
   // unset means ToolRegistry.execute uses DEFAULT_TOOL_TIMEOUT_MS — set
   // to <= 0 to disable the per-tool timeout entirely.

package/unify/tools/wait-agent.js

@@ -10,7 +10,7 @@ export default defineTool({
   description: `Wait for a sub-agent to complete its task and retrieve the result.
 
 Returns the agent's final result or current status if still running.
-Use after sending a task to an agent via SendMessage.`,
+Use after sending a task to an agent via PromptAgent.`,
   parameters: {
     type: 'object',
     properties: {

package/unify/web-bridge.js

@@ -562,6 +562,8 @@ function projectPersistedToHistoryEntry(m) {
   if (isPersistedInternalMessage(m)) return null;
   const entry = { role: m.role, content: m.role === 'tool' ? m.content : __testNormalizePersistedVisibleContent(m.content) };
   if (m.id) entry.id = m.id;
+  entry.threadId = m.threadId || m.turnId || 'main';
+  entry.turnId = m.turnId || entry.threadId;
   if (m.groupId) entry.groupId = m.groupId;
   if (m.speakerVpId) entry.speakerVpId = m.speakerVpId;
   if (m.toolCallId) entry.toolCallId = m.toolCallId;
@@ -2268,6 +2270,7 @@ export async function handleUnifyGroupChat(msg) {
   let report;
   try {
     report = coord.ingest({
+      id: typeof msg.id === 'string' && msg.id ? msg.id : undefined,
       from: 'user',
       role: 'user',
       text,
@@ -3585,7 +3588,7 @@ export async function handleUnifyLoadHistory(msg) {
           ...(Array.isArray(entry.attachments) && entry.attachments.length > 0 ? { attachments: hydrateHistoryAttachmentPreviews(entry.attachments) } : {}),
         },
         ts: entry.ts || null,
-      }, { groupId: entry.groupId || null });
+      }, { groupId: entry.groupId || null, threadId: entry.threadId || 'main', turnId: entry.turnId || entry.threadId || 'main' });
     } else if (entry.role === 'assistant') {
       // speakerVpId rides on the envelope so the frontend can route this
       // replayed assistant text to the correct VP track. Without it, the
@@ -3593,6 +3596,8 @@ export async function handleUnifyLoadHistory(msg) {
       // anonymous assistant turn.
       const envelopeOpts = {
         groupId: entry.groupId || null,
+        threadId: entry.threadId || 'main',
+        turnId: entry.turnId || entry.threadId || 'main',
       };
       if (entry.speakerVpId) envelopeOpts.vpId = entry.speakerVpId;
       sendUnifyOutput({
@@ -3676,6 +3681,8 @@ export async function handleUnifyLoadMoreHistory(msg) {
       role: m.role,
       content: m.content,
       groupId: m.groupId || null,
+      threadId: m.threadId || m.turnId || 'main',
+      turnId: m.turnId || m.threadId || 'main',
       ...(Array.isArray(m.attachments) && m.attachments.length > 0 ? { attachments: hydrateHistoryAttachmentPreviews(m.attachments) } : {}),
       ...(m.speakerVpId ? { speakerVpId: m.speakerVpId } : {}),
     }));

package/unify/tools/open-source-message.js

@@ -1,49 +0,0 @@
-/**
- * open-source-message.js — task-334f R6 §Δ24.4.
- *
- * Low-level random access: given a (groupId, msgId), fetch the raw message
- * from the group's jsonl log. Used when a VP has an exact pointer but does
- * not want to run the memory_trace wrapper (5% case: audit / debug).
- */
-
-import { defineTool } from './types.js';
-
-export default defineTool({
-  name: 'open_source_message',
-  description: `Open a single source message by (groupId, msgId).
-
-This is the low-level random-access primitive. Prefer memory_trace if you are
-starting from a memory entry. Returns JSON: { message } or { error }.`,
-  parameters: {
-    type: 'object',
-    properties: {
-      groupId: { type: 'string', description: 'Group id' },
-      msgId:   { type: 'string', description: 'Message id' },
-    },
-    required: ['groupId', 'msgId'],
-  },
-  isConcurrencySafe: () => true,
-  isReadOnly: () => true,
-  async execute(input, ctx) {
-    const { groupId, msgId } = input || {};
-    if (!groupId || !msgId) {
-      return JSON.stringify({ error: 'groupId and msgId required' });
-    }
-    const coordinator = ctx?.coordinator;
-    if (!coordinator || typeof coordinator.openGroup !== 'function') {
-      return JSON.stringify({ error: 'group coordinator not available' });
-    }
-    const group = coordinator.openGroup(groupId);
-    if (!group) return JSON.stringify({ error: `group not found: ${groupId}` });
-
-    const iter = typeof group.readMessageRange === 'function'
-      ? group.readMessageRange(msgId, msgId)
-      : group.streamMessages();
-    for (const msg of iter) {
-      if (msg.id === msgId) {
-        return JSON.stringify({ message: msg });
-      }
-    }
-    return JSON.stringify({ error: `message not found: ${msgId} in ${groupId}` });
-  },
-});

package/unify/tools/request-permissions.js

@@ -1,59 +0,0 @@
-/**
- * request-permissions.js — Request permission for dangerous operations.
- *
- * When an operation is flagged as destructive, this tool requests
- * explicit user permission before proceeding.
- */
-
-import { defineTool } from './types.js';
-
-export default defineTool({
-  name: 'RequestPermissions',
-  description: `Request permission from the user for a potentially dangerous operation.
-
-Use this before executing destructive operations like:
-- Deleting files or directories
-- Running commands that modify system state
-- Force-pushing to git
-- Resetting databases
-
-The user must explicitly approve before you proceed.`,
-  parameters: {
-    type: 'object',
-    properties: {
-      operation: {
-        type: 'string',
-        description: 'Description of the operation that needs permission',
-      },
-      reason: {
-        type: 'string',
-        description: 'Why this operation is necessary',
-      },
-      risk_level: {
-        type: 'string',
-        enum: ['low', 'medium', 'high', 'critical'],
-        description: 'Risk level of the operation',
-      },
-    },
-    required: ['operation'],
-  },
-  isConcurrencySafe: () => false,
-  isReadOnly: () => true,
-  async execute(input, ctx) {
-    const { operation, reason, risk_level = 'medium' } = input;
-    if (!operation) return JSON.stringify({ error: 'operation is required' });
-
-    // In a full integration, this would use the ask_user mechanism
-    // to get explicit permission. For now, return a structured request.
-    return JSON.stringify({
-      type: 'permission_request',
-      operation,
-      reason: reason || 'Operation requires explicit permission',
-      riskLevel: risk_level,
-      message: `⚠️ Permission required for: ${operation}` +
-               (reason ? `\nReason: ${reason}` : '') +
-               `\nRisk level: ${risk_level}`,
-      hint: 'User must explicitly approve this operation before proceeding.',
-    });
-  },
-});