@yeaft/webchat-agent 1.0.299 → 1.0.300

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "1.0.299",
+  "version": "1.0.300",
   "description": "Remote worker agent for Yeaft Web Code Agent — connects the native Yeaft engine, CLI providers, and workbench tools",
   "main": "index.js",
   "type": "module",

package/yeaft/conversation/search.js

@@ -152,7 +152,7 @@ function sessionConversationDirs(dir) {
  * @param {string} dir — Yeaft root directory (e.g. ~/.yeaft)
  * @param {string} keyword — search terms
  * @param {number} [limit=10] — max results
- * @param {{telemetry?: {scannedFiles?: number, scannedBytes?: number, scannedMessages?: number}}} [options]
+ * @param {{telemetry?: {scannedFiles?: number, scannedBytes?: number, scannedMessages?: number}, sessionIds?: string[]}} [options]
  * @returns {object[]} — matching messages, newest first
  */
 export function searchMessages(dir, keyword, limit = 10, options = {}) {
@@ -167,18 +167,24 @@ export function searchMessages(dir, keyword, limit = 10, options = {}) {
     telemetry.scannedMessages = 0;
   }
 
-  const conversationDirs = [
-    { dir: join(dir, 'chat'), sessionId: null, kind: 'chat' },
-    ...sessionConversationDirs(dir),
-  ];
+  const requestedSessionIds = Array.isArray(options.sessionIds)
+    ? new Set(options.sessionIds.filter(id => typeof id === 'string' && id.trim()).map(id => id.trim()))
+    : null;
+  const scopedSessionDirs = sessionConversationDirs(dir)
+    .filter(source => !requestedSessionIds || requestedSessionIds.has(source.sessionId));
+  const conversationDirs = requestedSessionIds
+    ? scopedSessionDirs
+    : [{ dir: join(dir, 'chat'), sessionId: null, kind: 'chat' }, ...scopedSessionDirs];
 
   const markdownDirs = [
     ...conversationDirs.flatMap(source => [
       { ...source, dir: join(source.dir, 'messages') },
       { ...source, dir: join(source.dir, 'cold') },
     ]),
-    { dir: join(dir, 'conversation', 'messages'), sessionId: null, kind: 'legacy-conversation' },
-    { dir: join(dir, 'conversation', 'cold'), sessionId: null, kind: 'legacy-conversation' },
+    ...(!requestedSessionIds ? [
+      { dir: join(dir, 'conversation', 'messages'), sessionId: null, kind: 'legacy-conversation' },
+      { dir: join(dir, 'conversation', 'cold'), sessionId: null, kind: 'legacy-conversation' },
+    ] : []),
   ];
   const segmentDirs = conversationDirs.map(source => ({ ...source, dir: join(source.dir, 'segments') }));
 

package/yeaft/engine.js

@@ -1279,6 +1279,9 @@ export class Engine {
       config: this.#config,
       taskManager: this.#taskManager,
       sessionId: vpCtx?.sessionId || this.#sessionId || null,
+      projectSessionIds: Array.isArray(vpCtx?.projectSessionIds)
+        ? vpCtx.projectSessionIds.slice()
+        : [],
       threadId: vpCtx?.threadId || this.#currentThreadId || MAIN_THREAD_ID,
       currentVpId: vpCtx?.senderVpId || this.#vpId || null,
       // task-704b: per-tool-result hard cap derives from this. Threaded
@@ -1342,6 +1345,9 @@ export class Engine {
         parentVpId: vpCtx?.senderVpId || null,
         parentVpPersona: vpCtx?.vpPersona || null,
         parentSessionId: vpCtx?.sessionId || null,
+        projectSessionIds: Array.isArray(vpCtx?.projectSessionIds)
+          ? vpCtx.projectSessionIds.slice()
+          : [],
         parentThreadId: vpCtx?.threadId || this.#currentThreadId || MAIN_THREAD_ID,
         onEvent: this.#subAgentEventSink || null,
         language: this.#config?.language || 'en',
@@ -1838,7 +1844,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, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, prepareProviderRequest = null, startProviderRequest = null, finishProviderRequest = null, failProviderRequest = null, closePendingUserInput = null, collabToolPolicy = null } = {}) {
+  async *query({ prompt, promptParts = null, messages = [], signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, projectSessionIds = null, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, prepareProviderRequest = null, startProviderRequest = null, finishProviderRequest = null, failProviderRequest = null, closePendingUserInput = null, collabToolPolicy = null } = {}) {
     if (!prompt || typeof prompt !== 'string' || !prompt.trim()) {
       yield {
         type: 'error',
@@ -1915,7 +1921,7 @@ export class Engine {
     };
     try {
       this.#currentThreadId = threadId || MAIN_THREAD_ID;
-      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, sessionTopics, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, askUser, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, prepareProviderRequest, startProviderRequest, finishProviderRequest, failProviderRequest, closePendingUserInput, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName, retryLifecycle });
+      yield* this.#runQuery({ prompt: effectivePrompt, promptParts: effectivePromptParts, messages, signal: runSignal, userEffort: effectiveUserEffort, scenario, vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, projectSessionIds, sessionTopics, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted, getCurrentTodos, setCurrentTodos, askUser, threadId: this.#currentThreadId, vpTurnId, drainPendingUserMessages, prepareProviderRequest, startProviderRequest, finishProviderRequest, failProviderRequest, closePendingUserInput, collabToolPolicy: effectiveCollabToolPolicy, explicitSkillName: parsedSkill.skillName, retryLifecycle });
     } finally {
       // Closing the async generator at a visible retry boundary means the
       // continuation never reached a provider. Keep it out of history and
@@ -1963,7 +1969,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, sessionId, sessionMembers, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, prepareProviderRequest = null, startProviderRequest = null, finishProviderRequest = null, failProviderRequest = null, closePendingUserInput = null, collabToolPolicy = null, explicitSkillName = null, retryLifecycle }) {
+  async *#runQuery({ prompt, promptParts = null, messages, signal, userEffort = null, scenario = 'chat', vpPersona, router, senderVpId, inboundEnvelope, taskId, taskMembers, sessionId, sessionMembers, projectSessionIds = null, sessionTopics = null, vpPlan, sessionAnnouncement, workCenterInstructions, workDir, userAlreadyPersisted = false, getCurrentTodos = null, setCurrentTodos = null, askUser = null, threadId = MAIN_THREAD_ID, vpTurnId = null, drainPendingUserMessages = null, prepareProviderRequest = null, startProviderRequest = null, finishProviderRequest = null, failProviderRequest = null, closePendingUserInput = null, collabToolPolicy = null, explicitSkillName = null, retryLifecycle }) {
 
     const effectiveCollabToolPolicy = collabToolPolicy === COLLAB_TOOL_POLICY.SINGLE_VP || collabToolPolicy === COLLAB_TOOL_POLICY.MULTI_VP
       ? collabToolPolicy
@@ -2022,12 +2028,22 @@ export class Engine {
     let recallEntryCount = 0;
 
     const topicScopesForMemory = await this.#loadSessionTopicScopes(sessionId);
+    const projectScopesForMemory = Array.isArray(projectSessionIds)
+      ? projectSessionIds.flatMap(id => [
+          `sessions/${id}`,
+          `sessions/${id}/user`,
+          `session/${id}`,
+          `session/${id}/user`,
+          `group/${id}`,
+          `group/${id}/user`,
+        ])
+      : [];
     const recallResult = await this.#recallMemory(prompt, {
       sessionId,
       vpId: vpPersona && typeof vpPersona === 'object' && typeof vpPersona.vpId === 'string'
         ? vpPersona.vpId
         : (typeof senderVpId === 'string' ? senderVpId : undefined),
-      extraScopes: topicScopesForMemory,
+      extraScopes: [...topicScopesForMemory, ...projectScopesForMemory],
     });
     recallEntryCount = recallResult && Array.isArray(recallResult.entries)
       ? recallResult.entries.length
@@ -3521,6 +3537,7 @@ export class Engine {
         router,
         senderVpId,
         sessionId: runtimeSessionId,
+        projectSessionIds,
         threadId: runtimeThreadId,
         inboundEnvelope,
         taskId,

package/yeaft/sub-agent/runner.js

@@ -123,6 +123,7 @@ export function isRestrictedToolName(name) {
  *   parentName?: string,
  *   parentVpId?: string,
  *   parentSessionId?: string|null,
+ *   projectSessionIds?: string[],
  *   parentThreadId?: string|null,
  *   parentVpPersona?: object,
  *   toolStats?: object,
@@ -378,6 +379,10 @@ async function driveSubAgent(agent, subEngine, vpPersona, deps) {
           signal: agent.abortController?.signal,
           scenario: 'chat',
           vpPersona,
+          sessionId: agent.parentSessionId || deps.parentSessionId || null,
+          projectSessionIds: Array.isArray(deps.projectSessionIds)
+            ? deps.projectSessionIds
+            : null,
         });
         for await (const evt of stream) {
           // Liveness — update first so even listener throws don't lose

package/yeaft/tools/history-search.js

@@ -138,12 +138,12 @@ export default defineTool({
     en: `Search through past conversation history.
 
 Searches message content for all whitespace-separated terms (case-insensitive).
-Tool-result messages are excluded. Useful for finding previous discussions, decisions, or code snippets.
+Inside a Session, search is limited to that Session plus sibling Sessions in the same Project on this Agent. Tool-result messages are excluded. Useful for finding previous discussions, decisions, or code snippets.
 
 Results are returned newest-first with a bounded matching snippet and source metadata.`,
     zh: `搜索历史对话记录。
 
-在已持久化消息的正文中搜索全部空格分隔的关键词（不区分大小写），并排除工具结果消息。用于查找之前的讨论、决策或代码片段。
+在已持久化消息的正文中搜索全部空格分隔的关键词（不区分大小写）。在 Session 内仅搜索当前 Session，以及同一 Agent 上同 Project 的兄弟 Session；排除工具结果消息。用于查找之前的讨论、决策或代码片段。
 
 结果按最新优先返回，包含有界的命中片段和来源信息。`
   },
@@ -180,7 +180,16 @@ Results are returned newest-first with a bounded matching snippet and source met
 
     try {
       const telemetry = {};
-      const results = searchMessages(yeaftDir, keyword, limit, { telemetry });
+      const projectSessionIds = Array.isArray(ctx?.projectSessionIds)
+        ? ctx.projectSessionIds.filter(id => typeof id === 'string' && id.trim()).map(id => id.trim())
+        : [];
+      const scopedSessionIds = ctx?.sessionId
+        ? Array.from(new Set([ctx.sessionId, ...projectSessionIds]))
+        : null;
+      const results = searchMessages(yeaftDir, keyword, limit, {
+        telemetry,
+        ...(scopedSessionIds ? { sessionIds: scopedSessionIds } : {}),
+      });
       const searchTelemetry = {
         resultCount: results.length,
         scannedFiles: telemetry.scannedFiles || 0,

package/yeaft/tools/types.js

@@ -23,6 +23,7 @@
  * @property {object} [config] — engine config
  * @property {import('../tasks/manager.js').TaskManager} [taskManager] — Session task manager
  * @property {string} [sessionId] — current Session id
+ * @property {string[]} [projectSessionIds] — same-Agent sibling Session ids in the current Project
  * @property {string} [threadId] — current Session thread id
  * @property {string} [currentVpId] — R6: VP id of the caller (set in multi-VP groups)
  * @property {string} [currentGroupId] — R6: group id of the caller's RoleInstance

package/yeaft/web-bridge.js

@@ -589,6 +589,54 @@ const vpCurrentTodos = new Map();
  *                     sessionHandle: object }>}
  */
 const sessionContexts = new Map();
+/** Latest server-authoritative Project identity and same-Agent siblings per Session. */
+const projectContextBySession = new Map();
+
+function normalizeProjectContext(value, sessionId) {
+  if (!value || typeof value !== 'object' || !Array.isArray(value.sessionIds)) return null;
+  const currentSessionId = typeof sessionId === 'string' ? sessionId.trim() : '';
+  return {
+    projectId: typeof value.projectId === 'string' && value.projectId.trim()
+      ? value.projectId.trim()
+      : null,
+    projectName: typeof value.projectName === 'string' && value.projectName.trim()
+      ? value.projectName.trim()
+      : null,
+    sessionIds: Array.from(new Set(value.sessionIds
+      .filter(id => typeof id === 'string' && id.trim())
+      .map(id => id.trim())
+      .filter(id => id !== currentSessionId))),
+  };
+}
+
+function legacyProjectContext(yeaftDir, sessionId) {
+  const project = loadProjects(yeaftDir).find(row => row.sessionIds.includes(sessionId));
+  if (!project) return null;
+  return normalizeProjectContext({
+    projectId: project.id,
+    projectName: project.name,
+    sessionIds: project.sessionIds,
+  }, sessionId);
+}
+
+function buildProjectSharedBlock(projectContext, summaries = '') {
+  const context = normalizeProjectContext(projectContext, null);
+  const body = typeof summaries === 'string' ? summaries.trim() : '';
+  if (!context?.projectId && !body) return '';
+  const lines = ['[Project Shared Context]'];
+  if (context?.projectId) {
+    const label = context.projectName
+      ? `${context.projectName} (${context.projectId})`
+      : context.projectId;
+    lines.push(`Project: ${label}`);
+    lines.push('Sharing boundary: sibling Sessions in this Project on this Agent only.');
+  } else {
+    lines.push('Sharing boundary: sibling Sessions in the same Project on this Agent only.');
+  }
+  lines.push('Read-only memory summaries preserve each source Session identity.');
+  if (body) lines.push('', body);
+  return lines.join('\n');
+}
 
 function vpKey(sessionId, vpId) {
   return `${sessionId}::${vpId}`;
@@ -2297,6 +2345,7 @@ export async function __testResetVpState() {
   asyncTaskOwners.clear();
   vpAborts.clear();
   sessionContexts.clear();
+  projectContextBySession.clear();
   vpCurrentTodos.clear();
   threadClassifier = defaultClassifyThread;
   if (_vpUnsubscribe) {
@@ -3028,8 +3077,14 @@ const PROJECT_CONTEXT_MAX_TOKENS = 4096;
 const PROJECT_CONTEXT_TRUNCATION_NOTICE = '\n[Summary truncated to Project context budget]';
 
 async function sharedProjectContext(yeaftDir, sessionId, options = {}) {
-  const project = loadProjects(yeaftDir).find(row => row.sessionIds.includes(sessionId));
-  if (!project) return '';
+  const requestedSiblingIds = Array.isArray(options.sessionIds)
+    ? options.sessionIds.filter(id => typeof id === 'string' && id.trim()).map(id => id.trim())
+    : null;
+  const project = requestedSiblingIds === null
+    ? loadProjects(yeaftDir).find(row => row.sessionIds.includes(sessionId))
+    : null;
+  const sourceSessionIds = requestedSiblingIds || project?.sessionIds || [];
+  if (sourceSessionIds.length === 0) return '';
   const memoryRoot = join(yeaftDir, 'memory');
   const language = options.language || 'en';
   const configuredBudget = Number.isFinite(options.tokenBudget) && options.tokenBudget > 0
@@ -3037,7 +3092,7 @@ async function sharedProjectContext(yeaftDir, sessionId, options = {}) {
     : PROJECT_CONTEXT_MAX_TOKENS;
   const tokenBudget = Math.min(configuredBudget, PROJECT_CONTEXT_MAX_TOKENS);
   let context = '';
-  const siblingIds = project.sessionIds
+  const siblingIds = sourceSessionIds
     .filter(id => id !== sessionId)
     .slice(0, PROJECT_CONTEXT_MAX_SIBLINGS);
   for (const siblingId of siblingIds) {
@@ -3341,6 +3396,7 @@ export function handleYeaftArchiveSession(msg) {
   try {
     const yeaftDir = ctx.CONFIG?.yeaftDir;
     const result = archiveSession(yeaftDir, sessionId);
+    projectContextBySession.delete(sessionId);
     invalidateGroupContext(sessionId);
     sendSessionCrudResult({
       op: 'archive',
@@ -3362,6 +3418,7 @@ export function handleYeaftDeleteSession(msg) {
   try {
     const yeaftDir = ctx.CONFIG?.yeaftDir;
     const result = deleteSession(yeaftDir, sessionId);
+    projectContextBySession.delete(sessionId);
     removeSessionFromProjects(yeaftDir, sessionId);
     ctx.assetOutbox?.removeSession(sessionId);
     // Cascade: remove every persisted message stamped with this group id.
@@ -4495,6 +4552,20 @@ async function runYeaftSessionSend(msg) {
     },
   });
 
+  const hasInboundProjectContext = Object.prototype.hasOwnProperty.call(msg, 'projectContext');
+  const inboundProjectContext = normalizeProjectContext(msg.projectContext, sessionId);
+  if (hasInboundProjectContext) {
+    projectContextBySession.set(sessionId, inboundProjectContext || {
+      projectId: null,
+      projectName: null,
+      sessionIds: [],
+    });
+  } else {
+    // An old Server does not know this field. Drop any context cached from a
+    // newer Server before falling back to this Agent's legacy projects.json.
+    projectContextBySession.delete(sessionId);
+  }
+
   // Ingest user text. The coordinator persists, applies mention/fanout
   // rules, and calls deliver() (== enqueueForVp) for each chosen VP —
   // which both (a) emits vp_typing_start and (b) ensures a driver runs.
@@ -4519,6 +4590,9 @@ async function runYeaftSessionSend(msg) {
       _promptParts: attachmentBundle.promptParts,
       _promptSuffix: attachmentBundle.promptSuffix,
       _perfTraceId: perfTraceId,
+      _projectContext: msg.projectContext && typeof msg.projectContext === 'object'
+        ? msg.projectContext
+        : null,
     });
   } catch (err) {
     console.warn('[Yeaft] yeaft_session_chat: coord.ingest failed', err?.message || err);
@@ -5159,12 +5233,19 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         threadId,
       });
       if (queryOpts) {
-        const projectContext = await sharedProjectContext(ctx.CONFIG?.yeaftDir, sessionId, {
+        const envelopeProjectContext = normalizeProjectContext(inboundEnvelope?._projectContext, sessionId);
+        const projectContext = envelopeProjectContext
+          || projectContextBySession.get(sessionId)
+          || legacyProjectContext(ctx.CONFIG?.yeaftDir, sessionId);
+        const projectSessionIds = projectContext?.sessionIds || [];
+        queryOpts.projectSessionIds = projectSessionIds;
+        const projectSummaries = await sharedProjectContext(ctx.CONFIG?.yeaftDir, sessionId, {
+          sessionIds: projectSessionIds,
           language: session?.config?.language,
           tokenBudget: Math.max(512, Math.floor((session?.config?.messageTokenBudget || 32768) / 8)),
         });
-        if (projectContext) {
-          const sharedBlock = `[Project Shared Context]\nRead-only memory summaries from sibling Sessions in the same Project. Preserve each source Session identity.\n\n${projectContext}`;
+        const sharedBlock = buildProjectSharedBlock(projectContext, projectSummaries);
+        if (sharedBlock) {
           queryOpts.sessionAnnouncement = queryOpts.sessionAnnouncement
             ? `${queryOpts.sessionAnnouncement}\n\n${sharedBlock}`
             : sharedBlock;
@@ -7007,6 +7088,7 @@ export async function resetYeaftSession() {
   vpEngineConfigKeys.clear();
   asyncTaskOwners.clear();
   sessionContexts.clear();
+  projectContextBySession.clear();
   vpCurrentTodos.clear();
   threadClassifier = defaultClassifyThread;
   // History-dedup cache is keyed by per-session coordinator msg ids;
@@ -7289,6 +7371,8 @@ export async function handleYeaftMcpReload(msg = {}) {
 export const __testHooks = {
   loadProjects,
   sharedProjectContext,
+  buildProjectSharedBlock,
+  normalizeProjectContext,
   loadVisibleGroupHistoryPage,
   projectVisibleHistoryChunkMessages,
   persistInboundMessageOnceByMsgId,