@yeaft/webchat-agent 1.0.325 → 1.0.328

package/yeaft/tools/bash.js

@@ -29,23 +29,18 @@ const DEFAULT_TIMEOUT_MS = 120_000;
 
 /** Max timeout in ms (10 minutes). */
 const MAX_TIMEOUT_MS = 600_000;
-/**
- * ToolRegistry must not preempt Bash's own process timeout. Bash terminates
- * the process tree and waits for close before returning exit 124; the grace
- * covers TERM/KILL escalation and the bounded close-confirmation window.
- */
-const REGISTRY_TIMEOUT_MS = MAX_TIMEOUT_MS + 15_000;
 const LINUX_NAMESPACE_HELPER = resolve(
   dirname(fileURLToPath(import.meta.url)),
   '..',
   'linux-process-namespace.js',
 );
+const RUN_PROCESS_OVERRIDE = Symbol('runProcessOverride');
 
 /**
  * Run a command in a child process.
- * @returns {Promise<{ stdout: string, stderr: string, exitCode: number, timedOut: boolean }>}
+ * @returns {Promise<{ stdout: string, stderr: string, exitCode: number, timedOut: boolean, terminationError: string | null }>}
  */
-function runCommand(command, { cwd, timeout, signal, runtimePlatform }) {
+function runCommand(command, { cwd, timeout, signal, runtimePlatform, runProcessImpl = runProcess }) {
   const platform = runtimePlatform || getRuntimePlatformInfo();
   const env = { ...process.env, TERM: 'dumb', FORCE_COLOR: '0' };
   const baseInvocation = buildShellInvocation(command, { runtimePlatform: platform });
@@ -76,7 +71,7 @@ function runCommand(command, { cwd, timeout, signal, runtimePlatform }) {
       systemdControl: null,
     };
   }
-  return runProcess(invocation.command, invocation.args, {
+  return runProcessImpl(invocation.command, invocation.args, {
     cwd,
     env,
     signal,
@@ -91,10 +86,11 @@ function runCommand(command, { cwd, timeout, signal, runtimePlatform }) {
     stderr: result.stderr,
     exitCode: result.code,
     timedOut: result.timedOut,
+    terminationError: result.terminationError || null,
   }));
 }
 
-export default defineTool({
+const bashTool = defineTool({
   name: 'Bash',
   description: {
     en: `Execute a shell command and return its output.
@@ -111,6 +107,7 @@ Guidelines:
 - Use absolute paths when possible
 - Avoid interactive commands (no stdin support)
 - Use background=true for long-running or persistent tasks that should survive across turns
+- Foreground timeout and cleanup status is returned to you; decide whether to inspect, retry, stop, or use a background task
 - stderr is captured separately and included in the result`,
     zh: `执行 Shell 命令并返回输出。
 
@@ -123,6 +120,7 @@ Guidelines:
 - 尽量使用绝对路径
 - 避免交互式命令（不支持 stdin）
 - 长时间或需要跨 turn 持续存在的任务使用 background=true
+- 前台命令的超时和清理状态会返回给你；由你决定检查、重试、停止或改用后台任务
 - stderr 单独捕获并包含在结果中`
   },
   parameters: {
@@ -167,7 +165,10 @@ Guidelines:
     required: ['command'],
   },
   errorOutput: null,
-  timeoutMs: REGISTRY_TIMEOUT_MS,
+  // Foreground Bash owns a bounded timeout and process-tree cleanup state
+  // machine. A second ToolRegistry timer can preempt that cleanup and turn an
+  // owned exit 124 into a fatal orphan, so it must stay disabled for this tool.
+  timeoutMs: 0,
   isConcurrencySafe: () => false,
   isReadOnly: () => false,
   isDestructive: (input) => {
@@ -224,6 +225,7 @@ Guidelines:
         timeout,
         signal: ctx?.signal,
         runtimePlatform,
+        runProcessImpl: ctx?.[RUN_PROCESS_OVERRIDE] || runProcess,
       });
 
       // Format output similar to Claude Code
@@ -231,6 +233,24 @@ Guidelines:
       if (result.stdout) parts.push(result.stdout);
       if (result.stderr) parts.push(`STDERR:\n${result.stderr}`);
       if (result.timedOut) parts.push(`\n(Command timed out after ${timeout}ms)`);
+      if (result.terminationError) {
+        parts.push([
+          `WARNING: ${result.terminationError}`,
+          'The command timed out, but process-tree termination could not be confirmed. The command may still be running.',
+          'Decide whether to inspect or stop it, retry, or use background=true.',
+        ].join('\n'));
+      }
+      if (result.timedOut) {
+        ctx?.requestToolBatchBarrier?.({
+          kind: 'owned_timeout',
+          message: [
+            result.terminationError
+              ? 'The foreground Bash command timed out and process-tree termination could not be confirmed.'
+              : 'The foreground Bash command timed out.',
+            'Return this result to the model before executing another tool call from the same batch.',
+          ].join(' '),
+        });
+      }
 
       const output = parts.join('\n');
       if (result.exitCode !== 0) {
@@ -243,3 +263,14 @@ Guidelines:
     }
   },
 });
+
+export function createBashTool({ runProcessImpl = runProcess } = {}) {
+  return {
+    ...bashTool,
+    execute(input, ctx) {
+      return bashTool.execute(input, { ...ctx, [RUN_PROCESS_OVERRIDE]: runProcessImpl });
+    },
+  };
+}
+
+export default bashTool;

package/yeaft/tools/process-runner.js

@@ -102,6 +102,7 @@ function killProcessTree(proc, signalName, platform, spawnProcessSync, systemdSc
  * @param {string} command
  * @param {string[]} args
  * @param {{ cwd?: string, signal?: AbortSignal, timeoutMs?: number, maxBytes?: number, env?: NodeJS.ProcessEnv, preserveCarriageReturns?: boolean, killGraceMs?: number, forceSettleMs?: number, requireExitConfirmation?: boolean, systemdScope?: { unit: string, systemctlPath: string, env?: NodeJS.ProcessEnv } | null, onSettled?: (() => void) | null, platform?: NodeJS.Platform, spawnProcess?: typeof spawn, spawnProcessSync?: typeof spawnSync }} [options]
+ * @returns {Promise<{ code: number, stdout: string, stderr: string, truncated: boolean, timedOut: boolean, terminationError?: string }>}
  */
 export function runProcess(command, args, options = {}) {
   if (options.signal?.aborted) {
@@ -188,21 +189,30 @@ export function runProcess(command, args, options = {}) {
       if (settled) return;
       settled = true;
       cleanup();
-      if (error) {
-        reject(error);
-        return;
-      }
-      if (aborted) {
-        reject(abortError(options.signal));
-        return;
-      }
-      resolve({
+      const result = {
         code: timedOut ? 124 : (code ?? 1),
         stdout: decode(stdout, stdoutTruncated, options.preserveCarriageReturns),
         stderr: decode(stderr, stderrTruncated),
         truncated,
         timedOut,
-      });
+      };
+      if (aborted) {
+        reject(abortError(options.signal));
+        return;
+      }
+      if (error) {
+        // A command timeout is an owned, bounded outcome. Failure to observe
+        // the final child close is important context for the caller, but it
+        // must not turn the timeout into an infrastructure exception that
+        // prevents the model from deciding what to do next.
+        if (timedOut && error instanceof ProcessTerminationError) {
+          resolve({ ...result, terminationError: error.message });
+          return;
+        }
+        reject(error);
+        return;
+      }
+      resolve(result);
     };
     const terminationConfirmed = () => {
       if (!options.requireExitConfirmation) return directClosed;
@@ -334,6 +344,10 @@ export function runProcess(command, args, options = {}) {
 
     if (Number.isFinite(options.timeoutMs) && options.timeoutMs > 0) {
       timer = setTimeout(() => {
+        // Preserve the first stop reason. Output overflow and Abort may have
+        // already started termination; a later deadline must not relabel that
+        // cleanup failure as a recoverable command timeout.
+        if (settled || stopRequested) return;
         timedOut = true;
         stop();
       }, options.timeoutMs);

package/yeaft/tools/types.js

@@ -45,6 +45,11 @@
  *   the supplied reason as `detail`. `reason` may be a structured object
  *   `{kind, ...}` so downstream observers (web-bridge) can render UI hints
  *   (e.g. "↪ 已转交给 @vp-b") without re-parsing strings.
+ * @property {(reason?: string|object) => void} [requestToolBatchBarrier]
+ *   — stop executing the remaining calls in the current assistant tool batch
+ *   while still pairing each call with an explicit skipped tool result. The
+ *   engine then returns those results to the provider before accepting another
+ *   plan. Used when a completed tool result invalidates the rest of the batch.
  * @property {string} [senderVpId] — id of the VP whose turn is currently
  *   running. Used by `route_forward` to stamp the forwarded message and
  *   by the loop guard to key per-sender throttling.

package/yeaft/web-bridge.js

@@ -5277,12 +5277,11 @@ async function runVpTurn({ prompt, promptParts = null, sessionId, vpId, threadId
         const projectSessionIds = projectContext?.sessionIds || [];
         queryOpts.projectSessionIds = projectSessionIds;
         queryOpts.projectInstruction = projectContext?.projectInstruction || '';
-        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)),
-        });
-        const sharedBlock = buildProjectSharedBlock(projectContext, projectSummaries);
+        // Related Session summaries now enter through Engine's single AMS
+        // memory outlet. Keep this announcement limited to Project identity and
+        // sharing boundaries so parent VP prompts do not duplicate the same prose
+        // that sub-agents receive through memory.
+        const sharedBlock = buildProjectSharedBlock(projectContext);
         if (sharedBlock) {
           queryOpts.sessionAnnouncement = queryOpts.sessionAnnouncement
             ? `${queryOpts.sessionAnnouncement}\n\n${sharedBlock}`