newmark-agent 0.3.12 → 0.4.0

package/dist/core/agent.js

@@ -69,6 +69,19 @@ const performanceDiagnostics_1 = require("./performanceDiagnostics");
 const compressionHistoryArchive_1 = require("./compressionHistoryArchive");
 const runtimeLifecycle_1 = require("./runtimeLifecycle");
 exports.ROOT_AGENT_ACTOR_ID = '00000000-0000-4000-8000-000000000001';
+// Inline completion is an interactive surface: a stale suggestion is worse
+// than no suggestion, and a request that occupies the provider for tens of
+// seconds makes every subsequent keystroke feel broken. Keep its budget
+// separate from normal conversation requests.
+const EDITOR_COMPLETION_BEFORE_CONTEXT_CHARS = 3200;
+const EDITOR_COMPLETION_AFTER_CONTEXT_CHARS = 800;
+const EDITOR_COMPLETION_MAX_TOKENS = 96;
+const EDITOR_COMPLETION_MAX_TEXT_CHARS = 1200;
+const EDITOR_COMPLETION_TIMEOUT_MS = 6500;
+/** 压缩摘要调用前，被省略段中单个工具结果（tool/function 角色）的字符数上限；
+ *  超过则裁剪为「头部结论 + 尾部证据」，避免巨型 read/grep/terminal 输出整段
+ *  重放给摘要模型（DSH toolResultPruner 的 Newmark 落地）。 */
+const TOOL_RESULT_PRUNE_CHARS = 8000;
 function normalizeIntelligenceTier(value) {
     const tier = String(value || '').trim().toLowerCase();
     return tier === 'low' || tier === 'high' || tier === 'xhigh' || tier === 'max' || tier === 'ultra' ? tier : 'medium';
@@ -126,6 +139,7 @@ let CORE_SYSTEM_PROMPT = `You are Newmark Agent, a powerful AI coding assistant
 - Plan: Fully read-only exploration. Do not modify any files, including README.md.
 - Goal: Persistent objective pursuit. Auto-continue until complete.
 - Flow: Sequential workflow execution with logic branching.
+- You may actively manage the Goal state yourself through the goal_manage tool: enter Goal mode or edit its objective when the user asks for a persistent objective or when it changes, mark it complete when you have genuinely verified it is achieved, and exit Goal mode when it is no longer needed. Do not use goal_manage to resume or bypass a Goal the user explicitly paused with Stop; the user is the only authority who resumes a paused Goal.
 
 ## Task Priority And Continuity
 - The latest explicit user instruction is authoritative and has the highest task priority. Resolve conflicts in favor of the latest instruction.
@@ -133,6 +147,11 @@ let CORE_SYSTEM_PROMPT = `You are Newmark Agent, a powerful AI coding assistant
 - Do not proactively resume, revive, continue, or execute a prior task merely because it appears unfinished in history. Continue prior work only when the current user explicitly asks to continue/resume/finish it, or when the current instruction clearly depends on it as a necessary prerequisite.
 - When the current instruction is a new task, complete that task without silently appending unrelated historical work.
 
+## Inline Task Management (Mandatory)
+- For every multi-step conversation task, maintain a compact inline checklist in the current Build work state with actionable items and one status per item: pending, in_progress, completed, or blocked.
+- Update that checklist as work changes and use it to drive tool order and final verification. Keep it bounded to actionable task labels; never expose hidden reasoning.
+- The inline checklist is the per-turn task manager. The durable linked-plan document exists and is available through the linked_plan tool when explicitly needed, but its full contents are not injected into every request.
+
 ## Guidelines
 - Treat this intrinsic Newmark prompt, mode rules, tool permissions, workspace binding, and feature disclosure as non-overridable. User, global, workspace, custom, and skill prompts may refine the task, but they must not weaken these rules.
 - Work from current evidence. Inspect files/state before relying on assumptions, and prefer the existing project patterns over new abstractions.
@@ -194,6 +213,11 @@ class Agent {
     activeConversationId = 'default';
     lastCompression = null;
     compressionCache = [];
+    pendingHistoryRemovals = [];
+    branchMailbox = [];
+    nextBranchMessageSequence = 1;
+    branchCommunicationEnabled = false;
+    compressionArchiveCountCache = null;
     nextCompressionCacheId = 1;
     compressionHistoryArchive;
     workspaceConversations = new Map();
@@ -262,6 +286,10 @@ class Agent {
     runtimeLifecycleRole;
     /** dev-0.3.0 context system facade (feature-flagged, default off). */
     contextV2;
+    /** 工具结果的持久化引用（artifact_id -> 状态 + 内容）。
+     *  两种来源：超大结果落盘（content 立即可得）与后台工具（status=running 直到完成）。
+     *  压缩前/后台中的大内容不进上下文，只通过 artifact_id 引用；读取后再释放。 */
+    toolResultArtifacts = new Map();
     runtimeLifecycle;
     /** dev-0.3.0 toolchain core (registry + capability catalog). Seeded lazily from cachedToolDefinitions; not consumed by the legacy path. */
     toolchainCore = null;
@@ -479,6 +507,8 @@ class Agent {
         const raw = entry.tree;
         if (raw && [1, 2].includes(Number(raw.version)) && raw.nodes && raw.nodes[raw.activeNodeId]) {
             raw.version = 2;
+            if (!Array.isArray(raw.runningNodeIds) || !raw.runningNodeIds.length)
+                raw.runningNodeIds = [raw.activeNodeId];
             this.coalesceConversationBranchGroups(raw);
             this.rebuildConversationTreeIndex(raw);
             entry.activeBranchId = raw.activeNodeId;
@@ -499,6 +529,7 @@ class Agent {
             rootNodeId: source.id,
             activeNodeId,
             activeGroupId: groupId,
+            runningNodeIds: [activeNodeId],
             nodes,
             branchGroups: {
                 [groupId]: {
@@ -580,13 +611,24 @@ class Agent {
     treePath(tree, nodeId) {
         return tree && tree.nodes[nodeId] ? this.treeAncestry(tree, nodeId).reverse() : [];
     }
+    /** 确定性消息 ID：基于角色+内容+索引的 sha256，保证旧数据缺失 messageId 时补生成稳定、
+     * 不漂移，且跨分支共享 fork 前缀消息得到一致 ID。 */
+    deterministicMessageId(message, index) {
+        const seed = `${index}:${String(message.role || '')}:${String(message.content === undefined ? '' : (typeof message.content === 'string' ? message.content : JSON.stringify(message.content)))}`;
+        return `m-${crypto.createHash('sha256').update(seed).digest('hex').slice(0, 16)}`;
+    }
+    /** 确定性 Guide ID：基于消息 ID + 索引，保证补生成稳定唯一。 */
+    deterministicGuideId(message, index) {
+        const base = String(message.messageId || this.deterministicMessageId(message, index));
+        return `g-${crypto.createHash('sha256').update(`${index}:${base}`).digest('hex').slice(0, 16)}`;
+    }
     rebuildConversationTreeIndex(tree) {
         const childIds = new Map();
         for (const node of Object.values(tree.nodes)) {
-            node.chatMessages = (node.chatMessages || []).map(message => ({
+            node.chatMessages = (node.chatMessages || []).map((message, messageIndex) => ({
                 ...message,
-                messageId: String(message.messageId || '') || crypto.randomUUID(),
-                guideId: message.clientMessageId ? (String(message.guideId || '') || crypto.randomUUID()) : undefined,
+                messageId: String(message.messageId || '') || this.deterministicMessageId(message, messageIndex),
+                guideId: message.clientMessageId ? (String(message.guideId || '') || this.deterministicGuideId(message, messageIndex)) : undefined,
                 branchNodeId: node.id,
             }));
             node.workRuns = this.normalizeWorkRuns(node.workRuns).map(run => ({
@@ -1242,7 +1284,7 @@ class Agent {
     }
     isPersistablePublicWorkEvent(event) {
         const type = String(event.type || '').toLowerCase();
-        const publicTypes = new Set(['start', 'text', 'response', 'final_response', 'tool_call', 'tool_result', 'status', 'done', 'error', 'queue_update', 'guide']);
+        const publicTypes = new Set(['start', 'text', 'response', 'final_response', 'tool_call', 'tool_result', 'thought', 'thought_result', 'status', 'done', 'error', 'queue_update', 'guide']);
         if (!publicTypes.has(type))
             return false;
         // Tool implementation details are never public. They are dropped before
@@ -1948,6 +1990,35 @@ class Agent {
         this.saveWorkspaceConversationState();
         return true;
     }
+    /**
+     * Close any running Build ledger entries owned by an explicitly interrupted
+     * lifecycle before a Flow is resumed or a conversation is archived.
+     *
+     * The normal Flow runner guard must continue to reject a genuinely
+     * concurrent Build. This method is deliberately explicit and target-scoped:
+     * callers use it only after the owning Flow has been stopped/paused or when
+     * archive has won the lifecycle race. Without this boundary, an isolated
+     * Agent created during resume can legitimately reload the previous snapshot
+     * while its runtime owner is still this Electron process and the guard would
+     * mistake that stale ledger entry for an active Build.
+     */
+    interruptRunningConversationWorkRuns(target = this.currentConversationTarget(), status = 'interrupted') {
+        const workspaceId = String(target.workspaceId || '');
+        const conversationId = this.safeConversationId(target.conversationId || this.activeConversationId || 'default');
+        const running = this.workRuns
+            .filter(run => run.status === 'running'
+            && String(run.target.workspaceId || '') === workspaceId
+            && this.safeConversationId(run.target.conversationId || 'default') === conversationId)
+            .map(run => run.runId);
+        let changed = 0;
+        for (const runId of running) {
+            if (this.finishConversationWorkRun(runId, status))
+                changed += 1;
+        }
+        if (changed)
+            this.flushWorkspaceConversationState();
+        return changed;
+    }
     recordGuideReceipt(input) {
         const receipt = this.normalizeGuideReceipt(input);
         let run = this.workRuns.find(item => item.runId === receipt.runId);
@@ -1989,9 +2060,11 @@ class Agent {
         const userHistory = (Array.isArray(history) ? history : []).filter(message => message?.role === 'user');
         const consumedUserHistory = new Set();
         let nextUserHistoryIndex = 0;
-        return (Array.isArray(messages) ? messages : []).map(message => {
-            const messageId = String(message?.messageId || '').trim() || crypto.randomUUID();
-            const guideId = message?.clientMessageId ? (String(message.guideId || '').trim() || crypto.randomUUID()) : undefined;
+        return (Array.isArray(messages) ? messages : []).map((message, messageIndex) => {
+            // 确定性补生成：缺失 messageId/guideId 的旧数据用内容 hash 补，避免每次归一化随机
+            // UUID 导致冷重载 ID 漂移（持久化 ID 唯一性与稳定性）。
+            const messageId = String(message?.messageId || '').trim() || this.deterministicMessageId(message, messageIndex);
+            const guideId = message?.clientMessageId ? (String(message.guideId || '').trim() || this.deterministicGuideId(message, messageIndex)) : undefined;
             const identified = { ...message, messageId, guideId, branchNodeId: String(message?.branchNodeId || '') || this.currentBranchNodeId() };
             if (!message || message.role !== 'user')
                 return identified;
@@ -2072,6 +2145,7 @@ class Agent {
         if (!run)
             return false;
         this.syncAgentRunTerminal(run.runId, status, endedAt);
+        this.flushPendingHistoryRemovals();
         if (run.status !== 'running') {
             if (run.status !== 'interrupted' || status !== 'force_interrupted') {
                 if (run.status !== status)
@@ -2218,6 +2292,7 @@ class Agent {
                 activeRun.endedAt = /^\d{4}-\d{2}-\d{2}T/.test(event.timestamp) ? event.timestamp : this.nowIso();
                 activeRun.expanded = true;
                 this.activeWorkRunId = '';
+                this.flushPendingHistoryRemovals();
             }
         }
         if (isToolEvent && process.env.NEWMARK_PROVIDER_DIAGNOSTICS === '1') {
@@ -2557,16 +2632,23 @@ class Agent {
         const stateKey = this.workspaceConversationStateKey(conversationId);
         if (!stateKey)
             return;
-        const stored = this.readStoredConversationState();
-        const flowSuspensions = { ...(stored.flowSuspensions || {}) };
-        if (suspension) {
-            flowSuspensions[stateKey] = { ...suspension, updatedAt: suspension.updatedAt || new Date().toISOString() };
-            delete stored.flowSuspension;
-        }
-        else {
-            delete flowSuspensions[stateKey];
-        }
-        this.writeStoredConversationStateNow({ ...stored, flowSuspensions });
+        // Use the lock-aware latest-state mutator directly. Passing a partial
+        // flowSuspensions object through writeStoredConversationStateNow() would
+        // merge the deleted key back from the latest disk snapshot, making Stop,
+        // archive, and new-work handoff appear to clear a suspension in memory
+        // while it immediately reappears after reload.
+        this.mutateStoredConversationState(this.workspace.current, latest => {
+            const flowSuspensions = { ...(latest.flowSuspensions || {}) };
+            if (suspension) {
+                flowSuspensions[stateKey] = { ...suspension, updatedAt: suspension.updatedAt || new Date().toISOString() };
+            }
+            else {
+                delete flowSuspensions[stateKey];
+            }
+            const next = { ...latest, flowSuspensions };
+            delete next.flowSuspension;
+            return next;
+        });
     }
     clearStoredFlowSuspension(conversationId = this.activeConversationId) {
         this.saveStoredFlowSuspension(null, conversationId);
@@ -2783,6 +2865,7 @@ class Agent {
                 pinned: !!value.pinned,
                 pinnedAt: value.pinnedAt || '',
                 order: Number(value.order || 0),
+                branchCommunication: !!value.branchCommunication,
             });
         }
         rows.sort((a, b) => {
@@ -3104,7 +3187,7 @@ class Agent {
         if (!tree) {
             const originalId = String(entry.rootBranchNodeId || '') || crypto.randomUUID();
             const original = this.treeNodeFromEntry(originalId, null, requestedIndex, '', entry);
-            tree = { version: 2, rootNodeId: originalId, activeNodeId: originalId, activeGroupId: '', nodes: { [originalId]: original }, branchGroups: {}, nodeIndex: {}, pathIndex: {} };
+            tree = { version: 2, rootNodeId: originalId, activeNodeId: originalId, activeGroupId: '', runningNodeIds: [originalId], nodes: { [originalId]: original }, branchGroups: {}, nodeIndex: {}, pathIndex: {} };
             entry.tree = tree;
             entry.rootBranchNodeId = originalId;
         }
@@ -3212,6 +3295,16 @@ class Agent {
                 nodeIds: [parentNodeId, branchId],
             };
         }
+        if (this.branchCommunicationEnabled) {
+            tree.runningNodeIds = tree.runningNodeIds || [];
+            if (parentNodeId && !tree.runningNodeIds.includes(parentNodeId))
+                tree.runningNodeIds.push(parentNodeId);
+            if (!tree.runningNodeIds.includes(branchId))
+                tree.runningNodeIds.push(branchId);
+        }
+        else {
+            tree.runningNodeIds = [branchId];
+        }
         tree.activeNodeId = branchId;
         tree.activeGroupId = groupId;
         this.rebuildConversationTreeIndex(tree);
@@ -3229,6 +3322,14 @@ class Agent {
             this.setConversationFromStorage(clean);
         return this.getConversationSnapshot(clean);
     }
+    setBranchCommunication(enabled) {
+        this.branchCommunicationEnabled = !!enabled;
+        this.saveWorkspaceConversationState(true);
+        return this.branchCommunicationEnabled;
+    }
+    isBranchCommunicationEnabled() {
+        return this.branchCommunicationEnabled;
+    }
     switchConversationBranch(conversationId, branchId, branchGroupId = '') {
         const clean = this.safeConversationId(conversationId || 'default');
         this.saveWorkspaceConversationState(true);
@@ -3247,6 +3348,18 @@ class Agent {
         const group = requestedGroup?.nodeIds.includes(branch.id)
             ? requestedGroup
             : Object.values(tree.branchGroups).find(item => item.nodeIds.includes(branch.id) && item.nodeIds.includes(priorActiveNodeId));
+        // 分支交流模式：移除“运行分支唯一性”——更换运行分支变为“新增运行分支”，
+        // 旧分支保持运行，目标分支加入运行集合；其余交互逻辑不变。
+        if (this.branchCommunicationEnabled) {
+            tree.runningNodeIds = tree.runningNodeIds || [];
+            for (const runningId of [priorActiveNodeId, branch.id]) {
+                if (runningId && !tree.runningNodeIds.includes(runningId))
+                    tree.runningNodeIds.push(runningId);
+            }
+        }
+        else {
+            tree.runningNodeIds = [branch.id];
+        }
         tree.activeNodeId = branch.id;
         if (group)
             tree.activeGroupId = group.id;
@@ -3298,6 +3411,24 @@ class Agent {
         this.writeStoredConversationState(stored);
         return true;
     }
+    /**
+     * 首 Build 命名提示判定：仅当 (1) 当前对话尚无历史 Build（排除当前 run）且
+     * (2) 其持久化 title 仍是自动生成（含为空）时返回 true。满足条件时运行时会
+     * 在首个 provider request 的 bootstrap 注入一次性命名指令，让 Agent 调用
+     * conversation_rename 自行命名。判定本身只读存储、无副作用，保缓存稳定。
+     */
+    shouldPromptConversationRename() {
+        if (this.conversationBuildHistory(1).length > 0)
+            return false;
+        const conversationId = this.activeConversationId || 'default';
+        const stateKey = this.workspaceConversationStateKey(conversationId);
+        if (!stateKey)
+            return false;
+        const entry = this.readStoredConversationState().conversations?.[stateKey];
+        const priorTitle = entry?.title;
+        const messages = entry?.chatMessages || this.chatMessages;
+        return this.isGeneratedConversationTitle(priorTitle, conversationId, messages);
+    }
     reorderConversations(ids) {
         const prefix = this.workspaceConversationPrefix() || '';
         const normalized = Array.from(new Set((Array.isArray(ids) ? ids : []).map(id => this.safeConversationId(id)).filter(Boolean)));
@@ -3402,6 +3533,8 @@ class Agent {
             chatMessages: [...this.chatMessages],
             history: [...this.history],
             compressionCache: [...this.compressionCache],
+            branchMailbox: [...this.branchMailbox],
+            branchCommunication: this.branchCommunicationEnabled,
             plan: this.normalizeConversationPlan(this.conversationPlan),
             linkedPlan: this.normalizeLinkedPlan(this.linkedPlan),
             subagentState: this.subagents.serialize(),
@@ -3435,6 +3568,8 @@ class Agent {
             chatMessages: [...this.chatMessages],
             history: [...this.history],
             compressionCache: [...this.compressionCache],
+            branchMailbox: [...this.branchMailbox],
+            branchCommunication: this.branchCommunicationEnabled,
             plan: this.normalizeConversationPlan(this.conversationPlan),
             linkedPlan: this.normalizeLinkedPlan(this.linkedPlan),
             subagentState: this.subagents.serialize(),
@@ -3487,6 +3622,9 @@ class Agent {
             this.history = [...saved.history];
             this.compressionCache = saved.compressionCache ? saved.compressionCache.map(entry => ({ ...entry, messages: [...entry.messages] })) : [];
             this.nextCompressionCacheId = Math.max(1, ...this.compressionCache.map(entry => Number(entry.id.replace(/^ctx-cache-/, '')) || 0)) + 1;
+            this.branchMailbox = (saved.branchMailbox || []).map(message => ({ ...message }));
+            this.nextBranchMessageSequence = Math.max(1, ...this.branchMailbox.map(message => Number(message.sequence) || 0)) + 1;
+            this.branchCommunicationEnabled = !!saved.branchCommunication;
             this.chatMessages = this.normalizeConversationChatMessages(saved.chatMessages, this.history);
             this.conversationPlan = this.normalizeConversationPlan(saved.plan);
             this.linkedPlan = this.normalizeLinkedPlan(saved.linkedPlan);
@@ -3509,6 +3647,9 @@ class Agent {
         this.history = persisted?.history ? [...persisted.history] : [];
         this.compressionCache = persisted?.compressionCache ? persisted.compressionCache.map(entry => ({ ...entry, messages: [...entry.messages] })) : [];
         this.nextCompressionCacheId = Math.max(1, ...this.compressionCache.map(entry => Number(entry.id.replace(/^ctx-cache-/, '')) || 0)) + 1;
+        this.branchMailbox = (persisted?.branchMailbox || []).map(message => ({ ...message }));
+        this.nextBranchMessageSequence = Math.max(1, ...this.branchMailbox.map(message => Number(message.sequence) || 0)) + 1;
+        this.branchCommunicationEnabled = !!persisted?.branchCommunication;
         this.chatMessages = this.normalizeConversationChatMessages(persisted?.chatMessages || [], this.history);
         this.conversationPlan = this.normalizeConversationPlan(persisted?.plan);
         this.linkedPlan = this.normalizeLinkedPlan(persisted?.linkedPlan);
@@ -3547,6 +3688,8 @@ class Agent {
             chatMessages: [...this.chatMessages],
             history: [...this.history],
             compressionCache: [...this.compressionCache],
+            branchMailbox: [...this.branchMailbox],
+            branchCommunication: this.branchCommunicationEnabled,
             plan: this.normalizeConversationPlan(this.conversationPlan),
             linkedPlan: this.normalizeLinkedPlan(this.linkedPlan),
             subagentState: this.subagents.serialize(),
@@ -3753,6 +3896,9 @@ class Agent {
         if (!run)
             return JSON.stringify({ ok: false, error: 'Historical Build Block state is unavailable.' });
         const maxEvents = Math.max(1, Math.min(200, Math.floor(Number(input.max_events || 80))));
+        // 有界历史读取：每条 activity/guide content 截断到 2000 字符，避免无界历史
+        // Build 的巨型 tool 输出整段内联进当前 Build，既省 token 也保后续缓存前缀稳定。
+        const boundedActivityChars = Math.max(100, Math.min(4000, Math.floor(Number(input.max_chars || 2000))));
         const publicEvents = run.events.filter(event => !['text', 'response', 'final_response'].includes(event.type));
         const activities = publicEvents.slice(-maxEvents).map(event => ({
             sequence: event.sequence,
@@ -3760,7 +3906,7 @@ class Agent {
             timestamp: event.timestamp,
             toolName: event.toolName,
             status: event.status,
-            content: this.sanitizePublicWorkContent(event.content || ''),
+            content: this.sanitizePublicWorkContent(event.content || '').slice(0, boundedActivityChars),
         }));
         return JSON.stringify({
             ok: true,
@@ -3771,7 +3917,7 @@ class Agent {
                     status: guide.status,
                     createdAt: guide.createdAt,
                     updatedAt: guide.updatedAt,
-                    content: this.sanitizePublicWorkContent(guide.content || ''),
+                    content: this.sanitizePublicWorkContent(guide.content || '').slice(0, boundedActivityChars),
                 })),
             },
             truncatedActivities: Math.max(0, publicEvents.length - activities.length),
@@ -3818,6 +3964,505 @@ class Agent {
             this.config.set('context', 'keep_recent_messages', previousKeepLast);
         }
     }
+    /**
+     * 落盘一个超大工具结果，返回 artifact_id。完整内容不进上下文——上下文只保留
+     * tiny 引用；compress_tool_result 按 id 读取后再压缩。落盘后状态即 done。
+     */
+    storeToolResultArtifact(tool, content) {
+        const id = crypto.randomUUID();
+        this.toolResultArtifacts.set(id, { tool, content, status: 'done', createdAt: Date.now() });
+        return id;
+    }
+    /**
+     * 注册一个后台工具任务，立即返回 background_id（status=running）。真实工具在
+     * 后台执行，完成后由 finishToolResultArtifact 标记 done/error。后台结果持久化
+     * 等待 read_tool_result 读取后再释放。
+     */
+    beginBackgroundTool(tool) {
+        const id = crypto.randomUUID();
+        this.toolResultArtifacts.set(id, { tool, content: '', status: 'running', createdAt: Date.now() });
+        return id;
+    }
+    /** 标记后台任务完成（写结果）或失败（写错误）。 */
+    finishToolResultArtifact(id, content, error) {
+        const artifact = this.toolResultArtifacts.get(id);
+        if (!artifact)
+            return;
+        if (error) {
+            artifact.status = 'error';
+            artifact.error = error;
+        }
+        else {
+            artifact.status = 'done';
+            artifact.content = content;
+        }
+    }
+    /**
+     * 按 artifact_id 读取工具结果引用（compress_tool_result / read_tool_result 共用）。
+     */
+    readToolResultArtifact(id) {
+        return this.toolResultArtifacts.get(id) ?? null;
+    }
+    /**
+     * 压缩一个极大的工具调用结果（保留格式），供 Agent 主动选用以替代硬截断。
+     *
+     * 入参为 artifact_id（而非完整 content），故压缩前的大内容不进入上下文。
+     * 缓存命中隔离：压缩 LLM 调用使用独立 system + 单条 user 消息，与主对话
+     * system/历史前缀不相交，不污染缓存命中。
+     */
+    async handleCompressToolResult(args, signal) {
+        let input = {};
+        try {
+            input = JSON.parse(args || '{}');
+        }
+        catch { }
+        // 压缩前内容不入上下文：优先按 artifact_id 引用读取落盘内容；兼容同时传入
+        // 小段 content 的场景（此时 content 较短，直接压缩即可）。
+        const artifactId = String(input.artifact_id || '').trim();
+        const inlineContent = typeof input.content === 'string' ? input.content : String(input.content ?? '');
+        let content = '';
+        let source = 'inline';
+        if (artifactId) {
+            const artifact = this.readToolResultArtifact(artifactId);
+            if (!artifact)
+                return { ok: false, output: '[compress_tool_result] Unknown or expired artifact_id.', error: 'Unknown artifact_id.' };
+            if (artifact.status === 'running')
+                return { ok: false, output: '[compress_tool_result] Tool result is still running in the background; read_tool_result first.', error: 'still-running.' };
+            if (artifact.status === 'error')
+                return { ok: false, output: '[compress_tool_result] Backgronud tool failed: ' + String(artifact.error || 'unknown error'), error: 'background-error.' };
+            content = artifact.content;
+            source = 'artifact';
+        }
+        else if (inlineContent.trim()) {
+            content = inlineContent;
+        }
+        else {
+            return { ok: false, output: '[compress_tool_result] artifact_id (or content) is required.', error: 'artifact_id is required.' };
+        }
+        const formatHint = String(input.format_hint || '').trim();
+        const provider = this.engineModel();
+        const modelName = this.activeModelName();
+        if (!provider || !modelName) {
+            // 无 provider 时回退为本地有界截断（保留头尾，诚实标注省略）。
+            return {
+                ok: true,
+                output: JSON.stringify({
+                    ok: true,
+                    compressed: true,
+                    method: 'local-fallback',
+                    summary: this.pruneToolResultContent(content),
+                    originalChars: content.length,
+                }, null, 2),
+                metadata: { kind: 'compress-tool-result' },
+            };
+        }
+        try {
+            // 独立 system + 单条 user 消息：不共享主对话前缀缓存。
+            const system = [
+                'You are a tool-result compression engine.',
+                'Compress ONE oversized tool result into a concise, format-preserving summary.',
+                'Preserve the exact structure the original result carries: keep JSON objects/arrays valid, keep table columns/rows, keep code blocks, keep file paths, identifiers, numbers, error strings, and key-value pairs verbatim.',
+                'Do not drop error messages, command outputs that matter for correctness, or any identifier the agent may need to continue.',
+                'Return ONLY the compressed result, with no preamble, no Markdown fences, no "here is" phrasing.',
+            ].join('\n');
+            const formatSuffix = formatHint ? `\n\nFormat to preserve: ${formatHint}` : '';
+            const prompt = [
+                'Original tool result (do not shorten meaningful structure; remove only redundant/boilerplate whitespace and trivially repeated noise):',
+                '',
+                content,
+                formatSuffix,
+            ].join('\n');
+            const maxTokens = Math.max(1024, Math.min(8192, Math.ceil(content.length / 4)) + 512);
+            const { temperature } = provider.intelligenceConfig('low');
+            const generated = await this.withTimeout(provider.chat(modelName, [{ role: 'user', content: prompt }], system, temperature, maxTokens, signal), 120000);
+            const summary = String(generated || '').trim();
+            if (!summary || /^\[LLM Error(?::|\])/i.test(summary)) {
+                return {
+                    ok: true,
+                    output: JSON.stringify({ ok: true, compressed: true, method: 'local-fallback', summary: this.pruneToolResultContent(content), originalChars: content.length }, null, 2),
+                    metadata: { kind: 'compress-tool-result' },
+                };
+            }
+            return {
+                ok: true,
+                output: JSON.stringify({
+                    ok: true,
+                    compressed: true,
+                    method: 'model-summary',
+                    model: modelName,
+                    summary,
+                    originalChars: content.length,
+                    compressedChars: summary.length,
+                }, null, 2),
+                metadata: { kind: 'compress-tool-result' },
+            };
+        }
+        catch {
+            return {
+                ok: true,
+                output: JSON.stringify({ ok: true, compressed: true, method: 'local-fallback', summary: this.pruneToolResultContent(content), originalChars: content.length }, null, 2),
+                metadata: { kind: 'compress-tool-result' },
+            };
+        }
+    }
+    /**
+     * 工具后台化：把一个工具调用派发到后台运行，立即返回 background_id，不阻塞
+     * 对话回合。真实工具在后台执行，完成后持久化到 toolResultArtifacts，
+     * read_tool_result 按 background_id 读取后再释放。
+     *
+     * 缓存命中优化：后台化工具只返回 tiny 的 background_id（不进大结果到上下文），
+     * 真实结果按需读取，避免大结果撑爆上下文、破坏前缀缓存。
+     */
+    async handleBackgroundTool(args, signal) {
+        let input = {};
+        try {
+            input = JSON.parse(args || '{}');
+        }
+        catch { }
+        const tool = String(input.tool || '').trim();
+        if (!tool)
+            return { ok: false, output: '[background_tool] tool is required.', error: 'tool is required.' };
+        if (tool === 'background_tool' || tool === 'read_tool_result' || tool === 'compress_tool_result' || tool === 'goal_manage' || tool === 'conversation_rename') {
+            return { ok: false, output: '[background_tool] cannot background the control tools (background_tool/read_tool_result/compress_tool_result/goal_manage/conversation_rename).', error: 'control-tool-unsupported.' };
+        }
+        // 禁止后台化子代理/编排类工具——它们有独立的生命周期管理，后台化会破坏其
+        // mailbox/abort/persistence 语义。
+        if (/^(task|subagent_|flow_|context_|question|skill)/.test(tool)) {
+            return { ok: false, output: '[background_tool] orchestration/flow tools cannot be backgrounded.', error: 'orchestration-unsupported.' };
+        }
+        const toolArgs = input.args;
+        const argStr = typeof toolArgs === 'string' ? toolArgs : (toolArgs === undefined ? '{}' : JSON.stringify(toolArgs));
+        const backgroundId = this.beginBackgroundTool(tool);
+        const wsDir = this.workspace.current?.path || this.rootPath;
+        // 后台执行：不 await，完成/失败后回写 artifact。
+        void this.tools.execute(tool, argStr, wsDir, {
+            mode: this.mode,
+            workspacePath: wsDir,
+            conversationId: this.activeConversationId || 'default',
+            actorId: this.runtimeActorId,
+            workspaceId: this.workspace.current?.id || '',
+            backend: process.env.NEWMARK_WSL_DISTRO ? 'wsl' : (process.platform === 'win32' ? 'windows' : process.platform),
+            signal,
+        }).then((content) => {
+            this.finishToolResultArtifact(backgroundId, content);
+        }).catch((error) => {
+            this.finishToolResultArtifact(backgroundId, '', error instanceof Error ? error.message : String(error));
+        });
+        return {
+            ok: true,
+            output: JSON.stringify({ ok: true, background_id: backgroundId, tool, status: 'running', createdAt: new Date().toISOString() }, null, 2),
+            metadata: { kind: 'background-tool' },
+        };
+    }
+    /**
+     * 读取后台工具结果：done 时返回结果（按需释放），running 时返回状态，error
+     * 时返回错误。与 compress_tool_result 共享 toolResultArtifacts。
+     */
+    handleReadToolResult(args) {
+        let input = {};
+        try {
+            input = JSON.parse(args || '{}');
+        }
+        catch { }
+        const id = String(input.background_id || input.artifact_id || '').trim();
+        if (!id)
+            return { ok: false, output: '[read_tool_result] background_id is required.', error: 'background_id is required.' };
+        const artifact = this.readToolResultArtifact(id);
+        if (!artifact)
+            return { ok: false, output: '[read_tool_result] Unknown or already-released background_id.', error: 'unknown-background-id.' };
+        const release = Boolean(input.release);
+        const result = {
+            ok: true,
+            background_id: id,
+            tool: artifact.tool,
+            status: artifact.status,
+            createdAt: artifact.createdAt ? new Date(artifact.createdAt).toISOString() : '',
+        };
+        if (artifact.status === 'running') {
+            result.running = true;
+        }
+        else if (artifact.status === 'error') {
+            result.error = artifact.error || 'background tool failed';
+        }
+        else {
+            result.content = artifact.content;
+            // 释放：读取后从持久化删除，避免重复读取占用内存。
+            if (release)
+                this.toolResultArtifacts.delete(id);
+        }
+        return { ok: true, output: JSON.stringify(result, null, 2), metadata: { kind: 'read-tool-result' } };
+    }
+    /**
+     * Agent 主动管理 Goal 状态：进入 / 编辑 objective / 标记完成 / 退出。
+     * 兼容原有 Goal 机制：enter/update 复用 updateGoal（记录 change、mode=goal、
+     * 尊重已暂停状态），complete 复用 markGoalComplete（verified + clearGoal），
+     * exit 复用 clearGoal（回 build 不声称完成）。不破坏「用户 Stop 暂停」边界：
+     * 本工具不提供 pause/resume，避免 Agent 绕过用户的显式暂停。
+     */
+    handleGoalManage(args) {
+        let input = {};
+        try {
+            input = JSON.parse(args || '{}');
+        }
+        catch { }
+        const action = String(input.action || '').trim();
+        const objective = String(input.objective || '').replace(/\s+/g, ' ').trim();
+        const reason = String(input.reason || '').trim();
+        const hadGoal = !!this.goal;
+        const priorObjective = this.goal?.objective || '';
+        if (!['enter', 'update', 'complete', 'exit'].includes(action)) {
+            return { ok: false, output: '[goal_manage] action is required (enter|update|complete|exit).', error: 'action is required.' };
+        }
+        if ((action === 'enter' || action === 'update') && !objective) {
+            return { ok: false, output: '[goal_manage] objective is required for enter/update.', error: 'objective is required.' };
+        }
+        if (action === 'enter' || action === 'update') {
+            this.updateGoal(objective);
+            const entered = !hadGoal && action === 'enter';
+            return {
+                ok: true,
+                output: JSON.stringify({
+                    ok: true,
+                    action,
+                    enteredGoal: entered,
+                    objective: this.goal?.objective || objective,
+                    mode: this.mode,
+                    paused: this.goal?.paused || false,
+                    goalRounds: this.goal?.goalRounds || 0,
+                    ...(reason ? { reason } : {}),
+                }, null, 2),
+                metadata: { kind: 'goal-manage' },
+            };
+        }
+        if (action === 'complete') {
+            if (!this.goal)
+                return { ok: true, output: JSON.stringify({ ok: true, action, completed: false, note: 'No active Goal to complete.' }, null, 2), metadata: { kind: 'goal-manage' } };
+            this.markGoalComplete();
+            return {
+                ok: true,
+                output: JSON.stringify({ ok: true, action, completed: true, priorObjective, mode: this.mode, goal: null }, null, 2),
+                metadata: { kind: 'goal-manage' },
+            };
+        }
+        // action === 'exit'
+        if (!this.goal)
+            return { ok: true, output: JSON.stringify({ ok: true, action, cleared: false, note: 'No active Goal to exit.' }, null, 2), metadata: { kind: 'goal-manage' } };
+        this.clearGoal();
+        return {
+            ok: true,
+            output: JSON.stringify({ ok: true, action, cleared: true, priorObjective, mode: this.mode, goal: null }, null, 2),
+            metadata: { kind: 'goal-manage' },
+        };
+    }
+    /**
+     * Agent 自行命名当前对话。首 Build Block 上运行时通过 bootstrap 提示（见
+     * agentKernelRunner.buildBuildContextBootstrap）请求 Agent 调用一次；这里复用
+     * 已有的 renameConversation 持久化路径。返回简短结果以保缓存友好。
+     */
+    handleConversationRename(args) {
+        let input = {};
+        try {
+            input = JSON.parse(args || '{}');
+        }
+        catch { }
+        const title = String(input.title || '').replace(/\s+/g, ' ').trim();
+        if (!title)
+            return { ok: false, output: '[conversation_rename] title is required.', error: 'title is required.' };
+        const conversationId = this.activeConversationId || 'default';
+        const ok = this.renameConversation(conversationId, title);
+        if (!ok)
+            return { ok: false, output: '[conversation_rename] could not rename conversation (no state key or empty title).', error: 'rename failed.' };
+        return {
+            ok: true,
+            output: JSON.stringify({ ok: true, conversationId, title: title.slice(0, 80) }, null, 2),
+            metadata: { kind: 'conversation-rename' },
+        };
+    }
+    conversationTree() {
+        const stateKey = this.workspaceConversationStateKey();
+        const stored = this.readStoredConversationState();
+        const persisted = stateKey && stored.conversations ? stored.conversations[stateKey] : undefined;
+        return persisted ? this.normalizeConversationTree(persisted) : null;
+    }
+    currentRuntimeBranchId() {
+        return String(this.conversationTree()?.activeNodeId || '');
+    }
+    handleBranchList(args) {
+        try {
+            const params = JSON.parse(args || '{}');
+            if (!this.branchCommunicationEnabled) {
+                return { ok: false, output: '[branch_list] Branch communication is not enabled for this conversation. Enable "允许分支交流" at conversation creation time.', error: 'branch communication disabled.' };
+            }
+            const tree = this.conversationTree();
+            const nodes = tree?.nodes || {};
+            const activeNodeId = String(tree?.activeNodeId || '');
+            const branches = Object.values(nodes).map(node => {
+                const inbound = this.branchMailbox.filter(m => m.toBranchId === node.id);
+                const outbound = this.branchMailbox.filter(m => m.fromBranchId === node.id);
+                return {
+                    id: node.id,
+                    parentId: node.parentId,
+                    active: node.id === activeNodeId,
+                    sourceMessageIndex: node.sourceMessageIndex,
+                    sourceText: String(node.sourceText || '').slice(0, 160),
+                    chatMessages: node.chatMessages.length,
+                    history: node.history.length,
+                    workRuns: node.workRuns.length,
+                    runningWorkRuns: node.workRuns.filter(run => run.status === 'running').length,
+                    mailbox: { inbound: inbound.length, unread: inbound.filter(m => !m.readAt).length, outbound: outbound.length },
+                };
+            });
+            return {
+                ok: true,
+                output: JSON.stringify({ ok: true, conversationId: this.activeConversationId, branchCommunication: true, activeBranchId: activeNodeId, branchCount: branches.length, branches }, null, 2),
+                metadata: { kind: 'branch-list' },
+            };
+        }
+        catch {
+            return { ok: false, output: '[branch_list] Invalid arguments.', error: 'Invalid arguments.' };
+        }
+    }
+    handleBranchSend(args) {
+        try {
+            const params = JSON.parse(args || '{}');
+            if (!this.branchCommunicationEnabled)
+                return { ok: false, output: '[branch_send] Branch communication is not enabled for this conversation.', error: 'branch communication disabled.' };
+            const toBranchId = String(params.to_branch || params.toBranchId || params.branch || '').trim();
+            const body = String(params.message || params.body || '').trim();
+            const kind = String(params.kind || 'message').trim();
+            if (!toBranchId)
+                return { ok: false, output: '[branch_send] to_branch is required.', error: 'to_branch is required.' };
+            if (!body)
+                return { ok: false, output: '[branch_send] message is required.', error: 'message is required.' };
+            const tree = this.conversationTree();
+            const target = tree?.nodes[toBranchId];
+            if (!target)
+                return { ok: false, output: '[branch_send] Branch not found: ' + toBranchId, error: 'Branch not found: ' + toBranchId };
+            const fromBranchId = this.currentRuntimeBranchId();
+            if (!fromBranchId)
+                return { ok: false, output: '[branch_send] Could not determine the current runtime branch.', error: 'runtime branch unknown.' };
+            if (fromBranchId === toBranchId)
+                return { ok: false, output: '[branch_send] A branch cannot message itself.', error: 'self-message forbidden.' };
+            const message = {
+                id: crypto.randomUUID(),
+                conversationId: this.activeConversationId || 'default',
+                sequence: this.nextBranchMessageSequence++,
+                fromBranchId,
+                toBranchId,
+                kind: kind === 'directive' ? 'directive' : kind === 'result' ? 'result' : 'message',
+                body: body.slice(0, 32000),
+                correlationId: params.correlation_id ? String(params.correlation_id) : undefined,
+                replyTo: params.reply_to ? String(params.reply_to) : undefined,
+                createdAt: new Date().toISOString(),
+            };
+            this.branchMailbox.push(message);
+            this.saveWorkspaceConversationState(true);
+            return {
+                ok: true,
+                output: JSON.stringify({ ok: true, message: { id: message.id, fromBranchId, toBranchId, kind: message.kind, sequence: message.sequence } }, null, 2),
+                metadata: { kind: 'branch-send' },
+            };
+        }
+        catch {
+            return { ok: false, output: '[branch_send] Invalid arguments.', error: 'Invalid arguments.' };
+        }
+    }
+    handleBranchRead(args) {
+        try {
+            const params = JSON.parse(args || '{}');
+            if (!this.branchCommunicationEnabled)
+                return { ok: false, output: '[branch_read] Branch communication is not enabled for this conversation.', error: 'branch communication disabled.' };
+            const branchId = String(params.branch || params.branch_id || params.id || '').trim();
+            if (!branchId)
+                return { ok: false, output: '[branch_read] branch is required.', error: 'branch is required.' };
+            const tree = this.conversationTree();
+            const node = tree?.nodes[branchId];
+            if (!node)
+                return { ok: false, output: '[branch_read] Branch not found: ' + branchId, error: 'Branch not found: ' + branchId };
+            const fromBranchId = this.currentRuntimeBranchId();
+            const maxChars = Math.max(100, Math.min(16000, Math.floor(Number(params.max_chars || 8000))));
+            const inbound = this.branchMailbox
+                .filter(m => m.toBranchId === fromBranchId && m.fromBranchId === branchId)
+                .sort((a, b) => a.sequence - b.sequence)
+                .map(m => ({ id: m.id, sequence: m.sequence, kind: m.kind, body: m.body, createdAt: m.createdAt, read: !!m.readAt }));
+            for (const m of inbound) {
+                const stored = this.branchMailbox.find(x => x.id === m.id);
+                if (stored && !stored.readAt)
+                    stored.readAt = new Date().toISOString();
+            }
+            if (inbound.length)
+                this.saveWorkspaceConversationState(true);
+            const activity = node.workRuns.slice(-10).map(run => {
+                const finalEvent = [...run.events].reverse().find(event => event.type === 'final_response');
+                return {
+                    runId: run.runId,
+                    status: run.status,
+                    startedAt: run.startedAt,
+                    endedAt: run.endedAt,
+                    finalResult: finalEvent ? String(finalEvent.content || '').slice(0, maxChars) : '',
+                    recentEvents: run.events.slice(-6).map(event => '[' + event.type + '] ' + String(event.content || '').slice(0, 240)),
+                };
+            });
+            return {
+                ok: true,
+                output: JSON.stringify({
+                    ok: true,
+                    branch: {
+                        id: node.id,
+                        parentId: node.parentId,
+                        sourceMessageIndex: node.sourceMessageIndex,
+                        sourceText: String(node.sourceText || '').slice(0, 240),
+                        chatMessages: node.chatMessages.length,
+                        history: node.history.length,
+                    },
+                    inbound,
+                    activity,
+                }, null, 2),
+                metadata: { kind: 'branch-read' },
+            };
+        }
+        catch {
+            return { ok: false, output: '[branch_read] Invalid arguments.', error: 'Invalid arguments.' };
+        }
+    }
+    handleBranchCreate(args) {
+        try {
+            const params = JSON.parse(args || '{}');
+            if (!this.branchCommunicationEnabled)
+                return { ok: false, output: '[branch_create] Branch communication is not enabled for this conversation. Enable "允许分支交流" at conversation creation time.', error: 'branch communication disabled.' };
+            const messageIndex = Math.floor(Number(params.message_index ?? params.messageIndex ?? params.index));
+            const prompt = String(params.prompt || params.message || params.text || '').trim();
+            if (!Number.isFinite(messageIndex) || messageIndex < 0)
+                return { ok: false, output: '[branch_create] message_index is required (0-based index of a user message in the conversation history, i.e. the historical block position).', error: 'message_index is required.' };
+            if (!prompt)
+                return { ok: false, output: '[branch_create] prompt is required (the new branch initial instruction).', error: 'prompt is required.' };
+            const locator = {};
+            if (params.message_id)
+                locator.messageId = String(params.message_id);
+            if (params.guide_id)
+                locator.guideId = String(params.guide_id);
+            if (params.client_message_id)
+                locator.clientMessageId = String(params.client_message_id);
+            if (params.run_id)
+                locator.runId = String(params.run_id);
+            const snapshot = this.branchConversation(this.activeConversationId || 'default', messageIndex, prompt, locator);
+            return {
+                ok: true,
+                output: JSON.stringify({
+                    ok: true,
+                    branchId: snapshot.activeBranchId,
+                    runtimeBranchId: snapshot.runtimeBranchId,
+                    messageIndex,
+                    prompt: prompt.slice(0, 240),
+                    branches: snapshot.branches,
+                }, null, 2),
+                metadata: { kind: 'branch-create' },
+            };
+        }
+        catch (e) {
+            return { ok: false, output: '[branch_create] ' + (e instanceof Error ? e.message : String(e)), error: e instanceof Error ? e.message : String(e) };
+        }
+    }
     handleContextHistoryManage(args) {
         let input = {};
         try {
@@ -3862,16 +4507,23 @@ class Agent {
                     error: 'remove position is in the protected context zone.',
                 };
             }
-            const removed = this.history.splice(position, 1)[0];
-            this.saveWorkspaceConversationState(true);
+            // 缓存优化：卸载只针对长期历史，且不立即 splice——当前 Build Block 内
+            // 保持 history 不变以复用 provider 前缀缓存，Block 结束后才对后续 Block 生效。
+            const target = this.history[position];
+            const fingerprint = this.historyRecordFingerprint(target);
+            if (!this.pendingHistoryRemovals.some(item => item.fingerprint === fingerprint && item.position === position)) {
+                this.pendingHistoryRemovals.push({ position, fingerprint });
+            }
             return {
                 ok: true,
                 output: JSON.stringify({
                     ok: true,
                     action: 'remove',
                     removedPosition: position,
-                    removedRole: String(removed?.role || ''),
+                    removedRole: String(target?.role || ''),
+                    deferred: true,
                     remaining: this.history.length,
+                    effectiveAt: 'after the current Build Block ends; applies to subsequent Blocks only',
                     displayHistory: { untouched: true, messageCount: this.chatMessages.length },
                 }, null, 2),
                 metadata: { kind: 'context-history-remove' },
@@ -4070,9 +4722,18 @@ class Agent {
                     maxTokens,
                     triggerTokens: budget.triggerTokens,
                     targetTokens: budget.targetTokens,
+                    buildBlockTokens: budget.buildBlockTokens,
+                    longHistoryTokens: budget.longHistoryTokens,
+                    buildBlockTriggerTokens: budget.buildBlockTriggerTokens,
+                    longHistoryTriggerTokens: budget.longHistoryTriggerTokens,
+                    buildBlockRetentionTokens: budget.buildBlockRetentionTokens,
+                    longHistoryRetentionTokens: budget.longHistoryRetentionTokens,
+                    buildBlockUsagePercent: maxTokens > 0 ? Math.round((budget.buildBlockTokens / maxTokens) * 1000) / 10 : 0,
+                    longHistoryUsagePercent: maxTokens > 0 ? Math.round((budget.longHistoryTokens / maxTokens) * 1000) / 10 : 0,
                     summaryTokens: budget.summaryTokens,
                     usagePercent: maxTokens > 0 ? Math.round((estimatedTokens / maxTokens) * 1000) / 10 : 0,
-                    thresholdReached: budget.triggerTokens > 0 && estimatedTokens >= budget.triggerTokens,
+                    thresholdReached: budget.buildBlockTokens >= budget.buildBlockTriggerTokens
+                        || budget.longHistoryTokens >= budget.longHistoryTriggerTokens,
                     keepRecentMessages: this.config.getNum('context', 'keep_recent_messages') || 10,
                     lastCompression: this.lastCompression ? {
                         at: this.lastCompression.at,
@@ -4101,6 +4762,11 @@ class Agent {
                         lastUserMessageIndex: lastUserIndex,
                         protectedCount: protectedStartIndex >= 0 ? this.history.length - protectedStartIndex : 0,
                     },
+                    pendingRemovals: {
+                        count: this.pendingHistoryRemovals.length,
+                        positions: this.pendingHistoryRemovals.map(item => item.position),
+                        effectiveAt: 'after the current Build Block ends; applies to subsequent Blocks only',
+                    },
                     displayHistory: { untouched: true, messageCount: this.chatMessages.length },
                 }, null, 2),
                 metadata: { kind: 'context-history-status' },
@@ -4375,10 +5041,21 @@ class Agent {
         return names.find(n => n.includes(this.model)) || this.model;
     }
     estimateContextTokens(messages = this.history) {
+        return this.estimateContextTokenComponents(messages, 0).estimatedTokens;
+    }
+    estimateContextTokenComponents(messages, buildBlockStart) {
         let asciiChars = 0;
         let nonAsciiChars = 0;
         let structuralChars = 0;
-        for (const m of messages) {
+        let longHistoryAsciiChars = 0;
+        let longHistoryNonAsciiChars = 0;
+        let longHistoryStructuralChars = 0;
+        let buildBlockAsciiChars = 0;
+        let buildBlockNonAsciiChars = 0;
+        let buildBlockStructuralChars = 0;
+        const boundary = Math.max(0, Math.min(messages.length, Math.floor(buildBlockStart)));
+        for (let index = 0; index < messages.length; index += 1) {
+            const m = messages[index];
             const content = typeof m.content === 'string' ? m.content : JSON.stringify(m.content || '');
             const toolCalls = Array.isArray(m.tool_calls) ? JSON.stringify(m.tool_calls) : '';
             const text = `${content}${toolCalls}`;
@@ -4394,14 +5071,31 @@ class Agent {
             // plain prose (~4 chars/token). Charge structural bytes separately so
             // large SubAgent transcripts, tool catalogs, and escaped payloads cannot
             // hide behind the prose heuristic and slip past the compression trigger.
-            if (typeof m.content === 'object' && m.content)
-                structuralChars += Math.max(0, content.length);
-            if (toolCalls)
-                structuralChars += Math.max(0, toolCalls.length);
+            const structural = (typeof m.content === 'object' && m.content ? Math.max(0, content.length) : 0)
+                + (toolCalls ? Math.max(0, toolCalls.length) : 0);
+            structuralChars += structural;
+            if (index < boundary) {
+                longHistoryAsciiChars += Math.max(0, text.length - nonAscii);
+                longHistoryNonAsciiChars += nonAscii;
+                longHistoryStructuralChars += structural;
+            }
+            else {
+                buildBlockAsciiChars += Math.max(0, text.length - nonAscii);
+                buildBlockNonAsciiChars += nonAscii;
+                buildBlockStructuralChars += structural;
+            }
         }
         // Prose: ~4 ASCII chars/token. Count non-ASCII chars at 1 token each and
         // fold structural overhead in on top.
-        return Math.max(1, Math.ceil(asciiChars / 4 + nonAsciiChars + structuralChars / 6));
+        const estimate = (ascii, nonAscii, structural, emptyIsZero = false) => {
+            const raw = ascii / 4 + nonAscii + structural / 6;
+            return emptyIsZero && raw <= 0 ? 0 : Math.max(1, Math.ceil(raw));
+        };
+        return {
+            estimatedTokens: estimate(asciiChars, nonAsciiChars, structuralChars),
+            longHistoryTokens: estimate(longHistoryAsciiChars, longHistoryNonAsciiChars, longHistoryStructuralChars, true),
+            buildBlockTokens: estimate(buildBlockAsciiChars, buildBlockNonAsciiChars, buildBlockStructuralChars, true),
+        };
     }
     contextWindow(modelName = this.model) {
         const estimatedTokens = this.estimateContextTokens();
@@ -4413,12 +5107,24 @@ class Agent {
         const model = this.resolveWindowModel(modelName);
         const maxTokens = Math.max(1, Number(model?.max_tokens || 0) || 128000);
         const ratio = estimatedTokens / maxTokens;
+        const budget = this.compressionBudget(this.history, modelName);
         return {
             estimatedTokens,
             maxTokens,
             ratio,
             warning: ratio >= 1 ? 'over_limit' : ratio >= 0.85 ? 'near_limit' : 'ok',
             model: modelName,
+            buildBlockTokens: budget.buildBlockTokens,
+            longHistoryTokens: budget.longHistoryTokens,
+            buildBlockTriggerTokens: budget.buildBlockTriggerTokens,
+            longHistoryTriggerTokens: budget.longHistoryTriggerTokens,
+            buildBlockRetentionTokens: budget.buildBlockRetentionTokens,
+            longHistoryRetentionTokens: budget.longHistoryRetentionTokens,
+            thresholdReached: budget.buildBlockTokens >= budget.buildBlockTriggerTokens
+                || budget.longHistoryTokens >= budget.longHistoryTriggerTokens,
+            compressionEnabled: this.config.getBool('context', 'auto_compress'),
+            cacheEntries: this.compressionCache.length,
+            archiveEntries: this.compressionArchiveEntryCount(),
         };
     }
     resolveWindowModel(modelName) {
@@ -4430,16 +5136,37 @@ class Agent {
         const model = this.resolveWindowModel(modelName);
         return Math.max(1, Number(model?.max_tokens || 0) || 128000);
     }
-    compressionBudget(messages) {
-        const maxTokens = this.contextMaxTokens();
+    compressionBudget(messages, modelName = this.model) {
+        const maxTokens = this.contextMaxTokens(modelName);
+        const buildBlockStart = this.compressionBuildBlockStart(messages);
+        const estimates = this.estimateContextTokenComponents(messages, buildBlockStart);
+        const buildBlockTriggerTokens = Math.max(128, Math.floor(maxTokens * 0.70));
+        const longHistoryTriggerTokens = Math.max(128, Math.floor(maxTokens * 0.20));
+        const longHistoryRetentionTokens = longHistoryTriggerTokens;
         return {
-            estimatedTokens: this.estimateContextTokens(messages),
+            estimatedTokens: estimates.estimatedTokens,
             maxTokens,
-            triggerTokens: Math.max(128, Math.floor(maxTokens * 0.8)),
-            targetTokens: Math.max(128, Math.floor(maxTokens * 0.2)),
+            // Keep the legacy names for status consumers and older integrations:
+            // triggerTokens is the active Build-block threshold and targetTokens is
+            // the long-history summary budget.
+            triggerTokens: buildBlockTriggerTokens,
+            targetTokens: longHistoryRetentionTokens,
             summaryTokens: Math.max(96, Math.min(1600, Math.floor(maxTokens * 0.12))),
+            buildBlockTokens: estimates.buildBlockTokens,
+            longHistoryTokens: estimates.longHistoryTokens,
+            buildBlockTriggerTokens,
+            longHistoryTriggerTokens,
+            buildBlockRetentionTokens: buildBlockTriggerTokens,
+            longHistoryRetentionTokens,
         };
     }
+    compressionBuildBlockStart(messages) {
+        const activeRunId = this.currentWorkRunId();
+        if (!activeRunId)
+            return 0;
+        const index = messages.findIndex(message => String(message.run_id || message.runId || '') === activeRunId);
+        return index >= 0 ? index : 0;
+    }
     recentContextSuffix(messages, maxMessages, tokenBudget) {
         if (!messages.length)
             return [];
@@ -5758,23 +6485,86 @@ class Agent {
         return new provider_1.LLMProvider(m.provider, m.provider_url, m.api_key, m.provider_protocol, this.config.openAIApiMode(), this.config.contextFlag('provider_adapters_v2'));
     }
     async editorModelRequest(input, signal) {
-        const models = this.config.allModels().filter(model => (model.evaluation?.status || 'unvalidated') !== 'unavailable' && !String(model.evaluation?.status || '').startsWith('error'));
+        const models = this.config.allModels().filter(model => {
+            if (model.enabled === false)
+                return false;
+            if (!String(model.api_key || '').trim() || !String(model.provider_url || '').trim())
+                return false;
+            const statuses = [model.evaluation?.status, model.validation?.status]
+                .map(status => String(status || '').trim().toLowerCase())
+                .filter(Boolean);
+            if (statuses.some(status => status === 'auth_error' || status === 'invalid_config' || status.startsWith('error')))
+                return false;
+            const hasPositiveEvidence = statuses.some(status => status === 'available'
+                || status === 'verified'
+                || status === 'degraded'
+                || status === 'rate_limited');
+            return !statuses.length || hasPositiveEvidence;
+        });
         const current = this.activeModelConfig();
         const copilot = input.preferCopilot ? models.find(model => model.provider_protocol === 'github_models' && model.enabled !== false) : undefined;
         const selected = copilot || (current && models.find(model => model.provider_id === current.provider_id && model.name === current.name)) || models.find(model => (model.validation?.level === 'standard' || model.validation?.level === 'extended') &&
-            (model.validation.status === 'verified' || model.validation.status === 'degraded')) || models.find(model => model.evaluation?.status === 'available') || models[0];
+            (model.validation?.status === 'verified' || model.validation?.status === 'degraded')) || models.find(model => model.evaluation?.status === 'available') || models[0];
         if (!selected?.api_key || !selected.provider_url)
             return { ok: false, text: '', error: 'No available editor prediction model.' };
-        const provider = new provider_1.LLMProvider(selected.provider, selected.provider_url, selected.api_key, selected.provider_protocol, this.config.openAIApiMode(), this.config.contextFlag('provider_adapters_v2'));
+        const provider = input.completion
+            ? new provider_1.LLMProvider(selected.provider, selected.provider_url, selected.api_key, selected.provider_protocol, 'chat_stream', this.config.contextFlag('provider_adapters_v2'), EDITOR_COMPLETION_TIMEOUT_MS)
+            : new provider_1.LLMProvider(selected.provider, selected.provider_url, selected.api_key, selected.provider_protocol, this.config.openAIApiMode(), this.config.contextFlag('provider_adapters_v2'));
         const language = path.extname(String(input.path || '')).replace(/^\./, '') || 'text';
         const system = input.completion
             ? 'You are an inline code completion engine. Return only the exact text to insert at the cursor. Do not use Markdown fences or explanations.'
             : 'You are Newmark Editor Agent. Give concise, actionable code guidance grounded in the supplied file and selection. Do not claim changes were applied.';
+        const before = String(input.before || '').slice(-EDITOR_COMPLETION_BEFORE_CONTEXT_CHARS);
+        const after = String(input.after || '').slice(0, EDITOR_COMPLETION_AFTER_CONTEXT_CHARS);
         const prompt = input.completion
-            ? `Language: ${language}\nFile: ${input.path || ''}\nRecent code before cursor:\n${String(input.before || '').slice(-6000)}\nCode after cursor:\n${String(input.after || '').slice(0, 1600)}\nReturn the shortest syntactically complete continuation.`
+            ? `Language: ${language}\nFile: ${input.path || ''}\nCode before cursor:\n${before}\nCode after cursor:\n${after}\nReturn only the shortest useful continuation.`
             : `File: ${input.path || ''}\nInstruction: ${input.instruction || 'Review the current code and suggest the next useful change.'}\nSelection:\n${String(input.selection || '').slice(0, 8000)}\nFile content:\n${String(input.content || '').slice(0, 18000)}`;
         try {
-            const text = (await provider.chat(selected.name, [{ role: 'user', content: prompt }], system, 0.05, input.completion ? 192 : 1800, signal)).replace(/^```[\w-]*\s*|\s*```$/g, '');
+            const messages = [{ role: 'user', content: prompt }];
+            let rawText = '';
+            const canStreamCompletion = !!input.completion
+                && typeof input.onTextDelta === 'function'
+                && (selected.provider_protocol !== 'openai' || this.config.contextFlag('provider_adapters_v2'));
+            if (canStreamCompletion) {
+                const streamed = [];
+                let streamFailure = null;
+                try {
+                    for await (const token of provider.chatStreamWithTools(selected.name, messages, system, 0.05, EDITOR_COMPLETION_MAX_TOKENS, [], signal)) {
+                        if (token.type !== 'text' || !token.text)
+                            continue;
+                        const delta = String(token.text);
+                        if (/^\[(?:LLM )?Error\b/i.test(delta)) {
+                            streamFailure = new Error(delta);
+                            continue;
+                        }
+                        streamed.push(delta);
+                        input.onTextDelta?.(delta);
+                    }
+                }
+                catch (error) {
+                    if (signal?.aborted)
+                        throw error;
+                    streamFailure = error instanceof Error ? error : new Error(String(error));
+                }
+                if (streamFailure) {
+                    // A provider may accept the streaming request but reject its SSE
+                    // mode. Retry once through the already-supported bounded chat path;
+                    // this keeps older gateways working without hiding a partial stream
+                    // behind a false success.
+                    rawText = await provider.chat(selected.name, messages, system, 0.05, EDITOR_COMPLETION_MAX_TOKENS, signal);
+                }
+                else {
+                    rawText = streamed.join('');
+                }
+            }
+            else {
+                rawText = await provider.chat(selected.name, messages, system, 0.05, input.completion ? EDITOR_COMPLETION_MAX_TOKENS : 1800, signal);
+            }
+            rawText = rawText
+                .replace(/^```[\w-]*\s*|\s*```$/g, '');
+            // Preserve indentation for real code, but treat whitespace-only model
+            // responses as an actual empty suggestion instead of a visible ghost.
+            const text = rawText.trim() ? rawText.slice(0, input.completion ? EDITOR_COMPLETION_MAX_TEXT_CHARS : rawText.length) : '';
             return { ok: !!text, text, model: selected.name, provider: selected.provider };
         }
         catch (error) {
@@ -6349,8 +7139,12 @@ class Agent {
             const sa = this.subagents.get(name);
             if (!sa)
                 return { ok: false, output: `[Subagent] Not found: ${name}`, error: `Not found: ${name}` };
-            const transcript = sa.messages.map(m => `[${m.role}] ${m.content}`).join('\n');
-            return this.subagents.toToolResult(sa.id, `get.subagent("${sa.name}", id="${sa.id}")\nStatus: ${sa.status}\nModel: ${sa.model}\nMode: ${sa.agentMode}\n\nResult:\n${sa.result || ''}\n\nConversation:\n${transcript}`, true);
+            // 上下文回归优化：不再把完整 transcript（含所有中间 tool call/result 洪水）
+            // 注入主 Agent 上下文。结果优先，transcript 只保留有界尾部——最近几条
+            // assistant/user 消息即足以让主 Agent 判断上下文，完整历史按需走
+            // subagent_read 的 max_chars 分页读取。
+            const transcript = this.subagents.boundedResultTranscript(sa.id);
+            return this.subagents.toToolResult(sa.id, `get.subagent("${sa.name}", id="${sa.id}")\nStatus: ${sa.status}\nModel: ${sa.model}\nMode: ${sa.agentMode}\n\nResult:\n${sa.result || ''}\n\nRecent Conversation (bounded):\n${transcript}`, true);
         }
         catch {
             return { ok: false, output: '[Subagent] Invalid result arguments.', error: 'Invalid result arguments.' };
@@ -6948,7 +7742,7 @@ class Agent {
                 : '';
             const delegatedPrompt = [
                 continuation,
-                requestedFlowName ? `[Workflow requested: ${requestedFlowName} @ ${child.flowPc}]` : '',
+                requestedFlowName ? `[Workflow requested: ${requestedFlowName}]` : '',
                 child.goal ? `[Goal objective: ${child.goal.objective}]` : '',
                 `Workspace: ${workspacePath}`,
                 prompt,
@@ -7247,15 +8041,21 @@ class Agent {
             return false;
         const total = msgs.reduce((sum, m) => sum + (typeof m.content === 'string' ? m.content.length : JSON.stringify(m.content || '').length), 0);
         const budget = this.compressionBudget(msgs);
-        if (budget.estimatedTokens < budget.triggerTokens && !force)
+        const thresholdReached = budget.buildBlockTokens >= budget.buildBlockTriggerTokens
+            || budget.longHistoryTokens >= budget.longHistoryTriggerTokens;
+        if (!thresholdReached && !force)
             return false;
-        if (!force && this.lastCompression && String(msgs[0]?.content || '').includes(this.lastCompression.summary)) {
+        const priorSummary = String(this.lastCompression?.summary || '').trim();
+        const priorSummaryMarker = priorSummary.slice(0, 240);
+        const priorSummaryPresent = !!priorSummaryMarker
+            && msgs.some(message => String(message.content || '').includes(priorSummaryMarker));
+        if (!force && this.lastCompression && priorSummaryPresent) {
             const baselineChars = Math.max(0, Number(this.lastCompression.compressedChars || 0));
             const baselineTokens = Math.max(0, Number(this.lastCompression.compressedTokens || 0));
             const charGrowth = baselineChars ? Math.max(0, total - baselineChars) : Number.POSITIVE_INFINITY;
             const tokenGrowth = baselineTokens ? Math.max(0, budget.estimatedTokens - baselineTokens) : Number.POSITIVE_INFINITY;
             const minCharGrowth = Math.max(12_000, Math.floor(baselineChars * 0.25));
-            const minTokenGrowth = Math.max(1_024, Math.floor(budget.triggerTokens * 0.2));
+            const minTokenGrowth = Math.max(1_024, Math.floor(budget.buildBlockTriggerTokens * 0.2));
             if (charGrowth < minCharGrowth && tokenGrowth < minTokenGrowth)
                 return false;
         }
@@ -7266,7 +8066,11 @@ class Agent {
         // Reserve room for the one-time post-compression continuation anchor so
         // adding it cannot push a near-limit request back over the target budget.
         const continuationAnchorTokens = this.estimateContextTokens([this.postCompressionContinuationMessage()]);
-        const recentBudget = Math.max(64, budget.targetTokens - budget.summaryTokens - continuationAnchorTokens);
+        // The current Build keeps its own 70% working window. The omitted prefix
+        // is long-term history and is summarized with its separate 20% budget.
+        // This prevents a completed Build from consuming the same small recent
+        // window as an active Build and avoids back-to-back compaction cycles.
+        const recentBudget = Math.max(64, budget.buildBlockRetentionTokens - budget.summaryTokens - continuationAnchorTokens);
         const recent = this.recentContextSuffix(msgs, configuredKeepLast, recentBudget);
         const recentStart = Math.max(0, msgs.length - recent.length);
         if (recentStart <= 0)
@@ -7338,19 +8142,48 @@ class Agent {
             return { summary: fallbackSummary, model: 'local-fallback', fallback: true };
         try {
             const { temperature } = provider.intelligenceConfig('low');
-            const system = [
-                'You are Newmark context compression.',
-                'Summarize an older omitted conversation segment for a coding agent. The latest retained user instruction is outside this segment and remains authoritative.',
+            // DSH 式前缀缓存命中：复用主对话的稳定 base prompt 作为 system，并把被压缩
+            // 的省略段消息原样保留为前缀，仅追加一条压缩指令 user 消息。这样压缩摘要
+            // 调用与主对话最近一次请求共享相同的 system 前缀和历史消息前缀，命中
+            // provider 的 warm prefix cache（KV cache），避免摘要调用反复重新计价整个前缀。
+            const system = this.buildSystemPrompt();
+            // DSH 式 tool-result pruning：压缩摘要调用前先裁剪大工具结果，避免把
+            // 巨型 read/grep/terminal 输出整段重放给摘要模型（既省 token，也减少
+            // 前缀缓存被单条超大结果打断）。头部保留判断所需的结论性内容，尾部保留
+            // 路径/错误等收尾证据。
+            const prunedPrefixMessages = middle.map((message) => {
+                const record = message;
+                const role = String(record.role || '');
+                const isToolResult = role === 'tool' || role === 'function';
+                const content = record.content;
+                if (isToolResult && typeof content === 'string' && content.length > TOOL_RESULT_PRUNE_CHARS) {
+                    return {
+                        ...message,
+                        content: this.pruneToolResultContent(content),
+                    };
+                }
+                return message;
+            });
+            // 原样复用 pruned middle 消息作前缀，但把历史图片降级为占位文本：
+            // 图片对摘要无益，且会破坏前缀缓存（主对话前缀中不含图片字节）。
+            const prefixMessages = prunedPrefixMessages.map((message) => {
+                if (!Array.isArray(message.content))
+                    return { ...message };
+                const parts = message.content.map(part => (part?.type === 'image_url'
+                    ? { type: 'text', text: '[Historical image attachment omitted after context compression.]' }
+                    : { ...part }));
+                return { ...message, content: parts };
+            });
+            const prompt = [
+                'Compress the following conversation segment into a structured checkpoint for this coding assistant.',
+                'The omitted transcript below is the conversation ABOVE this instruction; the latest retained user instruction is OUTSIDE the segment and remains authoritative.',
+                '',
                 'Classify task state instead of treating every historical user request as still active.',
                 'Preserve an older task as active or unfinished only when the transcript or explicit tracker shows concrete unfinished work and it remains relevant to the latest instruction or a required dependency.',
                 'Within Active Or Unfinished Work, order every retained historical task from newest to oldest. The newest unfinished task must be completed before the next-newest task.',
                 'Completed, superseded, abandoned, and unrelated tasks belong under Completed Or Background Work and must not be revived as the current objective.',
                 'Preserve concrete facts, current workspace, mode, model, tool results, files changed, decisions, errors, constraints, and user preferences.',
                 'Do not invent completion. Mark uncertainty explicitly.',
-                'Return concise Markdown with these stable headings: Active Or Unfinished Work; Completed Or Background Work; Decisions And Constraints; Tool And Verification Evidence; Relevant Files.',
-            ].join('\n');
-            const prompt = [
-                'Compress the following conversation segment.',
                 '',
                 'Required metadata to preserve:',
                 meta,
@@ -7358,16 +8191,16 @@ class Agent {
                 `Original message count in omitted segment: ${middle.length}`,
                 `Original total message chars before compression: ${totalChars}`,
                 '',
-                'Latest retained user instruction (authoritative and not part of the omitted transcript):',
+                'Latest retained user instruction (authoritative and not part of the omitted segment):',
                 currentInstruction || '(No retained user text was available; preserve uncertainty and do not promote old tasks without evidence.)',
                 '',
-                'Omitted transcript:',
-                transcript,
+                'Return ONLY concise Markdown with these stable headings:',
+                'Active Or Unfinished Work; Completed Or Background Work; Decisions And Constraints; Tool And Verification Evidence; Relevant Files.',
             ].join('\n');
             const modelName = String(compressionModel || this.activeModelName()).trim();
             if (!modelName)
                 return { summary: fallbackSummary, model: 'local-fallback', fallback: true };
-            const generated = await this.withTimeout(provider.chat(modelName, [{ role: 'user', content: prompt }], system, temperature, budget.summaryTokens, signal), 120000);
+            const generated = await this.withTimeout(provider.chat(modelName, [...prefixMessages, { role: 'user', content: prompt }], system, temperature, budget.summaryTokens, signal), 120000);
             const generatedText = String(generated || '').trim();
             if (!generatedText || /^\[LLM Error(?::|\])/i.test(generatedText) || /^LLM Error:/i.test(generatedText)) {
                 return { summary: fallbackSummary, model: 'local-fallback', fallback: true };
@@ -7415,6 +8248,16 @@ class Agent {
         }
         return '';
     }
+    /** 裁剪超长工具结果：保留头部结论性内容 + 尾部证据（路径/错误/收尾），
+     *  中间用占位标记省略。与 DSH toolResultPruner 的语义一致。 */
+    pruneToolResultContent(content) {
+        const text = String(content || '');
+        const headChars = Math.floor(TOOL_RESULT_PRUNE_CHARS * 0.6);
+        const tailChars = Math.max(0, TOOL_RESULT_PRUNE_CHARS - headChars - 48);
+        const head = text.slice(0, headChars).trimEnd();
+        const tail = text.slice(-tailChars).trimStart();
+        return `${head}\n\n[...tool result pruned ${text.length - headChars - tailChars} chars...]\n\n${tail}`;
+    }
     compressionHistoryContent(content) {
         if (!Array.isArray(content))
             return String(content || '');
@@ -7480,6 +8323,17 @@ class Agent {
             return [];
         }
     }
+    compressionArchiveEntryCount() {
+        const scopeKey = this.compressionArchiveScopeKey();
+        if (!scopeKey)
+            return 0;
+        if (this.compressionArchiveCountCache?.scopeKey === scopeKey)
+            return this.compressionArchiveCountCache.count;
+        const hotIds = new Set(this.compressionCache.map(entry => entry.id));
+        const count = this.compressionHistoryArchive.activeEntries(scopeKey).filter(entry => !hotIds.has(entry.id)).length;
+        this.compressionArchiveCountCache = { scopeKey, count };
+        return count;
+    }
     archiveColdCompressionEntries(entries) {
         const scopeKey = this.compressionArchiveScopeKey();
         if (!scopeKey)
@@ -7502,6 +8356,7 @@ class Agent {
             return;
         try {
             this.compressionHistoryArchive.markRestored(scopeKey, id);
+            this.compressionArchiveCountCache = null;
         }
         catch {
             // The restored context is already authoritative; archive bookkeeping is best-effort.
@@ -7539,6 +8394,7 @@ class Agent {
             const failed = this.archiveColdCompressionEntries(evicted);
             this.compressionCache = [...failed, ...this.compressionCache.slice(this.compressionCache.length - maxEntries)];
         }
+        this.compressionArchiveCountCache = null;
         this.saveWorkspaceConversationState(true);
     }
     contextHistoryProtectedStartIndex() {
@@ -7551,6 +8407,34 @@ class Agent {
             candidates.push(lastUserIndex);
         return candidates.length ? Math.min(...candidates) : -1;
     }
+    historyRecordFingerprint(record) {
+        if (!record)
+            return '';
+        return `${String(record.role || '')}\u0000${JSON.stringify(record.content ?? '')}`;
+    }
+    flushPendingHistoryRemovals() {
+        if (!this.pendingHistoryRemovals.length)
+            return;
+        const pending = this.pendingHistoryRemovals;
+        this.pendingHistoryRemovals = [];
+        // 按 position 从大到小处理，避免多次 splice 造成索引偏移。
+        const ordered = pending.slice().sort((a, b) => b.position - a.position);
+        for (const item of ordered) {
+            const atPosition = this.history[item.position];
+            if (atPosition && this.historyRecordFingerprint(atPosition) === item.fingerprint) {
+                this.history.splice(item.position, 1);
+                continue;
+            }
+            // 位置已被压缩/折叠改变时，用内容指纹兜底移除首个匹配项。
+            for (let i = this.history.length - 1; i >= 0; i -= 1) {
+                if (this.historyRecordFingerprint(this.history[i]) === item.fingerprint) {
+                    this.history.splice(i, 1);
+                    break;
+                }
+            }
+        }
+        this.saveWorkspaceConversationState(true);
+    }
     contextHistoryProtectedZone() {
         const start = this.contextHistoryProtectedStartIndex();
         const zone = new Set();
@@ -7571,9 +8455,6 @@ class Agent {
     buildSystemPrompt() {
         const cwd = this.workspace.current?.path || this.rootPath;
         const enabledSkills = this.skills.active();
-        const currentSkillTask = this.latestUserHistoryText(this.history);
-        const relevantSkills = this.skills.search(currentSkillTask, 8);
-        const linkedPlan = this.getLinkedPlan();
         const globalPromptPath = path.join(this.rootPath, 'agent.md');
         const globalPrompt = normalizeInjectedPrompt(fs.existsSync(globalPromptPath) ? fs.readFileSync(globalPromptPath, 'utf-8') : '');
         const workspacePrompt = normalizeInjectedPrompt(this.workspace.currentAgentPrompt());
@@ -7582,7 +8463,6 @@ class Agent {
             mode: this.mode,
             conversationId: this.activeConversationId,
             subagent: this.isSubagentRuntime ? [this.subagentName, this.subagentPrompt] : null,
-            linkedPlanRevision: linkedPlan.revision,
             goal: this.goal ? [this.goal.objective, this.goal.paused] : null,
             promptMode: this.config.getStr('workspace', 'prompt_mode'),
             customPrompt: this.config.getStr('agent', 'custom_prompt'),
@@ -7591,8 +8471,7 @@ class Agent {
             optionFeedback: this.config.getStr('agent', 'option_feedback'),
             model: this.model,
             intelligence: this.intelligence,
-            skills: enabledSkills.map(skill => [skill.name, skill.description]),
-            relevantSkills: relevantSkills.map(skill => [skill.name, skill.description]),
+            skills: enabledSkills.slice(0, 8).map(skill => [skill.name, skill.description]),
             globalPrompt,
             workspacePrompt,
         });
@@ -7613,7 +8492,6 @@ class Agent {
         parts.push(this.buildFeatureDisclosurePrompt());
         if (this.mode === 'plan')
             parts.push(`[Plan Tool Policy]\n${(0, toolPolicy_1.planModePolicyPrompt)()}`);
-        parts.push(`[Linked Plan revision=${linkedPlan.revision}]\n${linkedPlan.markdown || '(empty)'}`);
         const pm = this.config.getStr('workspace', 'prompt_mode') || 'both';
         const injectedPrompts = new Set();
         if ((pm === 'global_only' || pm === 'both') && globalPrompt) {
@@ -7632,7 +8510,7 @@ class Agent {
         if (enabledSkills.length) {
             parts.push([
                 '[Enabled Skills]',
-                ...(!currentSkillTask ? enabledSkills.slice(0, 8) : relevantSkills).map(s => `- ${s.name}: ${s.description || 'No description'}`),
+                ...enabledSkills.slice(0, 8).map(s => `- ${s.name}: ${s.description || 'No description'}`),
                 'Use the skill tool with query when the matching skill is uncertain, then load exactly one skill by name. Skill bodies and paths are intentionally omitted until loaded. Disabled skills are intentionally omitted.',
             ].join('\n'));
         }
@@ -7645,18 +8523,21 @@ class Agent {
         }
         parts.push(this.buildModePrompt());
         const value = this.contextV2.orchestrator.assemble({
-            generalPrompt: parts[0] ?? '',
-            responseProtocol: parts[1] ?? '',
+            // Keep the complete base prompt in one stable section. The linked_plan
+            // section remains structurally present for Context V2 compatibility but
+            // is intentionally empty: plan contents are retrieved through the tool.
+            generalPrompt: parts.filter(Boolean).join('\n\n'),
+            responseProtocol: '',
             baseToolDefinitions: undefined,
-            workspaceAgentProfile: parts[2] ?? '',
-            agentRoleAndPermissions: parts[3] ?? '',
-            capabilityBoundarySummary: parts[4] ?? '',
-            activeToolsetManifest: parts[5] ?? '',
-            buildBlockStartupInput: parts[6] ?? '',
-            buildBlockMetadata: parts[7] ?? '',
-            linkedPlan: parts[8] ?? '',
-            activeTasks: parts[9] ?? '',
-            currentWorkSet: parts[10] ?? '',
+            workspaceAgentProfile: '',
+            agentRoleAndPermissions: '',
+            capabilityBoundarySummary: '',
+            activeToolsetManifest: '',
+            buildBlockStartupInput: '',
+            buildBlockMetadata: '',
+            linkedPlan: '',
+            activeTasks: '',
+            currentWorkSet: '',
             branchLogSummary: '',
             retrievedOldBlockSummary: '',
             buildHistoryCheckpoint: '',
@@ -7671,11 +8552,9 @@ class Agent {
      * dev-0.3.0: assemble the model-request system prompt through the Context
      * Orchestrator, the single assembly point for every model request. No inline
      * prompt concatenation remains in agent.ts: buildSystemPrompt() itself
-     * routes its section content through the orchestrator (byte-identical to the
-     * legacy parts.join), and this method appends the tool surface notice.
-     * Later iterations split content into the fixed 18 sections with exact
-     * semantics; for now the legacy sections occupy the first string slots in
-     * their original order and empty sections are skipped.
+     * routes its stable base prompt through the orchestrator, and this method
+     * appends the tool surface notice. The linked-plan section is deliberately
+     * empty here; linked-plan content is tool-retrieved on demand.
      */
     assembleContextV2(toolSurfaceNotice) {
         return this.contextV2.orchestrator.assemble({
@@ -7743,6 +8622,7 @@ class Agent {
             '- Before memory_lab_update, inspect the target with memory_lab_query or memory_lab_read. For an existing component pass expectedUpdatedAt so concurrent/stale writes fail closed; preserve established tag parent paths.',
             '- Use memory_lab_delete only for an explicit user request to forget/remove memory. Prior revisions are retained under Memory Lab/archive and mutation decisions are appended to policy.jsonl for replay.',
             '- Build history disclosure is two-layered. The request prompt contains only each historical Build Block user input, final summary, and completion status. Use build_history_query only when the current user asks what specifically happened in one Build Block; querying history is read-only and never authorizes resuming that work.',
+            '- Linked plan disclosure: a durable conversation-linked Markdown plan exists and can be inspected or updated with linked_plan when explicitly needed or required by Plan mode. Its full Markdown and revision are not injected into every model request.',
             '- A memory_lab_update, memory_lab_delete, or memory_lab_reindex call is unfinished until its awaited tool result contains rebuildReceipt.completed=true. The completion receipt is represented by the tool activity inside the current Build block and should not be repeated as a separate completion message.',
             `- Skills and subagents: skill searches enabled metadata and loads one SKILL.md body on demand; skill_download installs offline skill folders; task creates constrained subagents tracked in agent state.`,
             `- Visible output contract: assistant replies are sanitized before display to remove hidden-reasoning markers. ${visibleOutputContract}`,