config/sub_agent.py

@@ -14,11 +14,6 @@ SUB_AGENT_SERVICE_BASE_URL = os.environ.get("SUB_AGENT_SERVICE_URL", "http://127
 SUB_AGENT_DEFAULT_TIMEOUT = int(os.environ.get("SUB_AGENT_DEFAULT_TIMEOUT", "180"))  # 秒
 SUB_AGENT_STATUS_POLL_INTERVAL = float(os.environ.get("SUB_AGENT_STATUS_POLL_INTERVAL", "2.0"))
 
-# 子智能体进程自身的网络权限（与工具级 HOST_SANDBOX_NETWORK_PERMISSION 独立）。
-# 子智能体需要调用模型 API，因此默认给予完整网络；工具级网络限制仍由
-# HOST_SANDBOX_NETWORK_PERMISSION 控制，并由主进程对命令单独加沙箱。
-SUB_AGENT_HOST_NETWORK_PERMISSION = os.environ.get("SUB_AGENT_HOST_NETWORK_PERMISSION", "full")
-
 # 存储与并发限制
 # 子智能体任务目录与状态文件属于运行态数据，跟随 DATA_DIR（默认 ~/.agents/<mode>/data）。
 SUB_AGENT_TASKS_BASE_DIR = _resolve_repo_path(os.environ.get("SUB_AGENT_TASKS_BASE_DIR", ""), f"{DATA_DIR}/sub_agent_tasks")
@@ -39,5 +34,4 @@ __all__ = [
     "SUB_AGENT_STATE_FILE",
     "SUB_AGENT_MAX_ACTIVE",
     "SUB_AGENT_MODELS_CONFIG_FILE",
-    "SUB_AGENT_HOST_NETWORK_PERMISSION",
 ]

core/main_terminal.py

@@ -654,7 +654,8 @@ class MainTerminal(MainTerminalCommandMixin, MainTerminalContextMixin, MainTermi
                     "execution_mode": self.get_execution_mode(),
                     "pending_permission_mode": None,
                     "pending_execution_mode": None,
-                    # frozen_*_prompt 不在创建时预设，由第一次 build_messages 根据当时的实际模式懒加载并冻结
+                    "frozen_permission_prompt": self._build_permission_mode_message() or "",
+                    "frozen_execution_prompt": self._build_execution_mode_message() or "",
                 },
             )
             print(f"{OUTPUT_FORMATS['info']} 新建对话: {conversation_id}")

core/main_terminal_parts/context.py

@@ -211,7 +211,7 @@ class MainTerminalContextMixin:
             cm = getattr(self, "context_manager", None)
             meta = getattr(cm, "conversation_metadata", {}) if cm else {}
             cached = meta.get(key) if isinstance(meta, dict) else None
-            if isinstance(cached, str) and cached:
+            if isinstance(cached, str):
                 return cached
 
             built = builder() or ""

core/web_terminal.py

@@ -174,7 +174,8 @@ class WebTerminal(MainTerminal):
                     "execution_mode": self.get_execution_mode() if hasattr(self, "get_execution_mode") else "sandbox",
                     "pending_permission_mode": None,
                     "pending_execution_mode": None,
-                    # frozen_*_prompt 不在创建时预设，由第一次 build_messages 根据当时的实际模式懒加载并冻结
+                    "frozen_permission_prompt": self._build_permission_mode_message() or "",
+                    "frozen_execution_prompt": self._build_execution_mode_message() or "",
                 },
             )
 

easyagent/src/batch/index.js

@@ -17,12 +17,7 @@ const { applyUsage, normalizeUsagePayload } = require('../utils/token_usage');
 // ── stdout 输出 ──
 function emit(type, data) {
   const line = JSON.stringify({ type, ...data });
-  try {
+  process.stdout.write(line + '\n');
-    // 使用同步写并刷新，避免管道缓冲导致主进程不能实时读到进度
-    fs.writeSync(1, line + '\n');
-  } catch (err) {
-    process.stdout.write(line + '\n');
-  }
 }
 
 // ── 解析命令行参数 ──

modules/sub_agent_manager.py

@@ -16,7 +16,6 @@ from typing import Dict, List, Optional, Any, Tuple, TYPE_CHECKING
 from config import (
     OUTPUT_FORMATS,
     SUB_AGENT_DEFAULT_TIMEOUT,
-    SUB_AGENT_HOST_NETWORK_PERMISSION,
     SUB_AGENT_MAX_ACTIVE,
     SUB_AGENT_MODELS_CONFIG_FILE,
     SUB_AGENT_STATE_FILE,
@@ -189,10 +188,7 @@ class SubAgentManager:
                     return {"success": False, "error": "宿主机子智能体执行被拒绝：HOST_SANDBOX_ENABLED=0"}
                 try:
                     command_str = self._join_shell_words(cmd)
-                    # 子智能体进程需要调用模型 API，使用独立的网络权限（默认 full）。
+                    network_permission = os.environ.get("HOST_SANDBOX_NETWORK_PERMISSION", "restricted")
-                    # 其内部执行的 run_command 等命令仍通过 HOST_SANDBOX_NETWORK_PERMISSION
-                    # 保持工具级网络限制。
-                    network_permission = SUB_AGENT_HOST_NETWORK_PERMISSION
                     plan = build_host_sandbox_plan(
                         command_str, self.project_path, env, network_permission=network_permission
                     )
@@ -817,32 +813,15 @@ class SubAgentManager:
         if self.state_file.exists():
             try:
                 data = json.loads(self.state_file.read_text(encoding="utf-8"))
-                loaded_tasks = data.get("tasks", {})
+                self.tasks = data.get("tasks", {})
-                loaded_agents = data.get("conversation_agents", {})
+                self.conversation_agents = data.get("conversation_agents", {})
             except json.JSONDecodeError:
                 logger.warning("子智能体状态文件损坏，已忽略。")
                 self.tasks = {}
                 self.conversation_agents = {}
-                return
         else:
             self.tasks = {}
             self.conversation_agents = {}
-            return
-
-        # 与已加载的运行态任务合并，避免覆盖仅存在于内存中的状态
-        # （例如 _stdout_lines、notified 等运行时标记）。
-        runtime_only_keys = {"_stdout_lines"}
-        merged_tasks: Dict[str, Dict] = {}
-        for task_id, task in loaded_tasks.items():
-            existing = self.tasks.get(task_id)
-            if existing:
-                for key in runtime_only_keys:
-                    if key in existing:
-                        task[key] = existing[key]
-            merged_tasks[task_id] = task
-        self.tasks = merged_tasks
-        self.conversation_agents = loaded_agents
-
         if self.tasks:
             migrated = False
             for task in self.tasks.values():

server/conversation.py

@@ -1457,12 +1457,11 @@ def get_sub_agent_activity(task_id: str, terminal: WebTerminal, workspace: UserW
                 progress_file = str(Path(task_root) / "progress.jsonl")
 
         entries: List[Dict[str, Any]] = []
-        # 默认返回足够多的记录，确保历史工具调用完整展示；同时保留上限防止异常大文件拖垮响应。
+        limit = request.args.get("limit", "200")
-        limit = request.args.get("limit", "100000")
         try:
-            limit_num = max(1, min(int(limit), 100000))
+            limit_num = max(1, min(int(limit), 1000))
         except Exception:
-            limit_num = 100000
+            limit_num = 200
 
         if progress_file and Path(progress_file).exists():
             try:

static/src/components/overlay/SubAgentActivityDialog.vue

@@ -111,6 +111,11 @@ const buildText = (entry: ActivityEntry) => {
   return `${tool || '工具'}`;
 };
 
+const isTerminalStatus = (status?: string) => {
+  const normalized = (status || '').toString().toLowerCase();
+  return ['completed', 'failed', 'timeout', 'terminated', 'cancelled'].includes(normalized);
+};
+
 const canStop = computed(() => {
   if (!activeAgent.value?.task_id) return false;
   return !isTerminalStatus(activeAgent.value.status);
@@ -132,49 +137,26 @@ const handleStop = async () => {
   }
 };
 
-const isTerminalStatus = (status?: string) => {
-  const normalized = (status || '').toString().toLowerCase();
-  return ['completed', 'failed', 'timeout', 'terminated', 'cancelled'].includes(normalized);
-};
-
 const displayItems = computed(() => {
-  const entries = activityEntries.value || [];
+  const order: string[] = [];
-  const groups: { key: string; entry: ActivityEntry }[] = [];
+  const map = new Map<string, ActivityEntry>();
-
+  for (const entry of activityEntries.value || []) {
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
     if (!entry) continue;
-
+    const key = entry.id || `${entry.tool || 'tool'}-${entry.ts || order.length}`;
-    const baseKey = entry.id || `${entry.tool || 'tool'}-${entry.ts || i}`;
+    if (!map.has(key)) {
-    const lastGroup = groups[groups.length - 1];
+      map.set(key, { ...entry });
-
+      order.push(key);
-    // 同一个 id 的相邻进度更新（running -> completed）合并为一次工具调用。
+    } else {
-    // 如果上一个同 id 的组已经进入终态，则后续同 id 的记录视为新的工具调用。
+      map.set(key, { ...map.get(key), ...entry });
-    if (
-      lastGroup &&
-      (lastGroup.entry.id === entry.id || lastGroup.key === baseKey) &&
-      !isTerminalStatus(lastGroup.entry.status)
-    ) {
-      lastGroup.entry = { ...lastGroup.entry, ...entry };
-      continue;
     }
-
-    // 生成唯一 key：id 重复时加上序号
-    let key = baseKey;
-    let suffix = 0;
-    while (groups.some((g) => g.key === key)) {
-      suffix++;
-      key = `${baseKey}--${suffix}`;
-    }
-    groups.push({ key, entry: { ...entry } });
   }
 
-  return groups.map((group) => {
+  return order.map((key) => {
-    const item = group.entry;
+    const item = map.get(key) || {};
     const state = normalizeStatus(item.status);
     const stateLabel = state === 'completed' ? '完成' : state === 'failed' ? '失败' : '进行中';
     return {
-      key: group.key,
+      key,
       state,
       stateLabel,
       text: buildText(item)

static/src/components/panels/TerminalPanel.vue

@@ -199,9 +199,7 @@ function renderSessionLog() {
   console.log('[TerminalPanel] renderSessionLog:', activeSession.value, 'len:', log.length, 'ready:', _historyReady.value[activeSession.value], 'hydrated:', sessionHydrated.value[activeSession.value]);
   term.clear();
   if (log) {
-    term.write(log, () => {
+    term.write(log);
-      term?.scrollToBottom();
-    });
   }
 }
 

static/src/composables/usePanelResize.ts

@@ -4,7 +4,6 @@ interface ResizeContext {
   isResizing?: boolean;
   resizingPanel?: PanelKey | null;
   rightCollapsed?: boolean;
-  terminalPanelOpen?: boolean;
   gitChangesPanelOpen?: boolean;
   rightWidth?: number;
   minPanelWidth?: number;
@@ -20,8 +19,8 @@ function clamp(value: number, min: number, max: number) {
 }
 
 export function startResize(ctx: ResizeContext, panel: PanelKey, event: MouseEvent) {
-  // 右侧面板（终端 / Git）只有在至少一个打开时才允许拖拽调整宽度
+  // 如果右侧面板（审批面板）已折叠，禁用拖拽边缘展开
-  if (panel === 'right' && !ctx.terminalPanelOpen && !ctx.gitChangesPanelOpen) {
+  if (panel === 'right' && ctx.rightCollapsed && !ctx.gitChangesPanelOpen) {
     return;
   }
 

static/src/stores/subAgent.ts

@@ -121,7 +121,7 @@ export const useSubAgentStore = defineStore('subAgent', {
       if (!taskId) return;
       this.activityLoading = true;
       try {
-        const resp = await fetch(`/api/sub_agents/${taskId}/activity?limit=100000`);
+        const resp = await fetch(`/api/sub_agents/${taskId}/activity?limit=200`);
         if (!resp.ok) {
           throw new Error(await resp.text());
         }

utils/conversation_manager.py

@@ -512,8 +512,8 @@ class ConversationManager:
             "execution_mode": "sandbox",
             "pending_permission_mode": None,
             "pending_execution_mode": None,
-            "frozen_permission_prompt": None,
+            "frozen_permission_prompt": "",
-            "frozen_execution_prompt": None,
+            "frozen_execution_prompt": "",
             "has_images": has_images,
             "has_videos": has_videos,
             # 首次对话尚未生成文件树快照，待首次用户消息时填充