@qlingzzy/qling 1.0.0 → 1.1.1

package/dist/agent-loop.js

@@ -1,42 +1,49 @@
 // ============================================================
-// 轻灵 - Agent Loop v2（整合 Pipeline Hook + Section Prompt + Token Budget）
+// 轻灵 - Agent Loop v2（整合 Pipeline Hook + Section Prompt）
+// Token 计数仅采用 provider 官方 usage 字段。
 // ============================================================
-import axios from "axios";
 import * as os from "os";
 import * as path from "path";
 import * as fs from "fs/promises";
-import { exec } from "child_process";
-import { existsSync } from "fs";
-import { dispatch, ALL_TOOLS, setMCPRegistry } from "./tools/index.js";
+import { ALL_TOOLS, setMCPRegistry } from "./tools/index.js";
 import { HookManager, ToolPipeline } from "./pipeline/hooks.js";
-import { buildDefaultRegistry, buildSystemPrompt, SECTION_IDS, buildRepoMapSection } from "./pipeline/sections.js";
-import { MemoryStore, TokenBudgetManager, extractDreamMemories } from "./memory.js";
+import { buildDefaultRegistry } from "./pipeline/sections.js";
+import { MemoryStore } from "./memory.js";
 import { WriteAheadLog } from "./memory/wal.js";
-import { extractDreamMemoriesLLM } from "./memory/memory-llm-dream.js";
+import { runAutoDream } from "./memory/lifecycle.js";
 import { MCPRegistry } from "./mcp/registry.js";
 import { mcpToolsToNativeDefinitions } from "./mcp/bridge.js";
-import { ApprovalGate, ApprovalRequiredError } from "./guard/approval.js";
+import { ApprovalGate } from "./guard/approval.js";
 import { MetricsCollector } from "./metrics/collector.js";
 import { AgentTelemetry } from "./metrics/agent-telemetry.js";
 import { VerificationAgent } from "./pipeline/verification.js";
 import { ContextCompactor } from "./context-compactor.js";
 import { KnowledgeAgentAdapter } from "./knowledge-agent.js";
 import { WorkflowRuntime } from "./workflow-runtime.js";
-import { checkToolConsistency } from "./pipeline/consistency-checker.js";
-import { DashboardServer } from "./dashboard-server.js";
 import { DiscoveryRegistry } from "./discovery-registry.js";
 import { MissionManager } from "./mission/manager.js";
 import { getSkillDirs } from "./tools/skill.js";
 import { listSkills } from "./skills/registry.js";
 import { buildSkillsSection } from "./pipeline/sections.js";
-import { applyContentFilter, setCustomPatterns } from "./guard/content-filter.js";
-import { appendGuardAudit } from "./guard.js";
+import { setCustomPatterns } from "./guard/content-filter.js";
 import { guardConfigFromEnv } from "./config.js";
 import { SessionRegistry, } from "./session/session-registry.js";
+import { applySessionSnapshot, buildSessionSnapshot, defaultSessionSaveName, } from "./session/session-persistence.js";
 import { apiKeyRequiredForEndpoint, isLoopbackEndpoint, } from "./providers/presets.js";
-import { maybeAutoCommitAfterWrite } from "./git/auto-commit.js";
+import { LlmHttpClient } from "./providers/llm-client.js";
+import { ExecutionEventBus } from "./execution/event-bus.js";
+import { RecoveryController } from "./execution/recovery-controller.js";
+import { RunTraceStore } from "./execution/run-trace-store.js";
+import { formatRecoveryInstruction, formatRecoveryPause, } from "./execution/recovery-messages.js";
+import { loadVerificationCommand as loadVerificationCommandFile, persistVerificationCommand as persistVerificationCommandFile, runShellCommand, stagesSummary, } from "./execution/verification-loop.js";
+import { assembleSystemPrompt, reflectiveThink, } from "./agent/system-prompt.js";
+import { runInnerIterationLoop, runOuterAgentLoop, } from "./agent/main-loop.js";
 const HOME_DIR = os.homedir();
 const DEFAULT_QLING_DIR = path.join(HOME_DIR, ".qling");
+const EXPLICIT_ENABLE_VALUES = new Set(["1", "true", "on", "yes"]);
+export function resolveMemoryDreamLlmEnabled(env = process.env) {
+    return EXPLICIT_ENABLE_VALUES.has(String(env.QLING_MEMORY_DREAM_LLM_ENABLED ?? "").trim().toLowerCase());
+}
 /** 本地 loopback / ollama 允许空 key，用占位符满足 OpenAI 兼容 Authorization 头 */
 function resolveSessionApiKey(raw, endpoint, provider) {
     const trimmed = String(raw ?? "").trim();
@@ -62,7 +69,7 @@ export class AgentEventEmitter {
 }
 export class AgentLoop extends AgentEventEmitter {
     // --- 核心组件 ---
-    client;
+    llmClient;
     messages = [];
     config;
     turnCount = 0;
@@ -74,7 +81,6 @@ export class AgentLoop extends AgentEventEmitter {
     pipeline;
     sectionRegistry = buildDefaultRegistry(ALL_TOOLS);
     memoryStore;
-    tokenBudget;
     verifier;
     compactor;
     knowledgeAdapter;
@@ -98,6 +104,10 @@ export class AgentLoop extends AgentEventEmitter {
     sessionRegistry;
     guardConfig;
     verificationCommand = null;
+    executionEventBus = new ExecutionEventBus();
+    recoveryController = new RecoveryController();
+    runTraceStore;
+    activeRun = null;
     // --- v0.3 Getters (Management) ---
     getWorkflowRuntime() { return this.workflowRuntime; }
     getMemoryStore() { return this.memoryStore; }
@@ -107,6 +117,34 @@ export class AgentLoop extends AgentEventEmitter {
     getWorkspaceDir() { return this.config.runtime?.workspaceDir ?? process.cwd(); }
     getMessagesSnapshot() { return this.messages.map((message) => ({ ...message })); }
     getVerificationCommand() { return this.verificationCommand; }
+    getActiveRun() { return this.activeRun ? { ...this.activeRun } : null; }
+    getRecoveryState() {
+        try {
+            return this.recoveryController.getRecoveryState();
+        }
+        catch {
+            return null;
+        }
+    }
+    subscribeExecutionEvents(listener) {
+        return this.executionEventBus.subscribe(listener);
+    }
+    applyRecoveryAction(action) {
+        const state = this.recoveryController.applyAction(action);
+        if ((action === "cancel" || action === "edit") && this.activeRun) {
+            this.executionEventBus.completeRun(this.activeRun.runId, "canceled");
+            this.activeRun = null;
+        }
+        return { state, ...(action === "edit" ? { prompt: state.originalTask } : {}) };
+    }
+    async listRunTraceIds() { return this.runTraceStore.listRunIds(this.sessionId); }
+    async readRunTrace(runId) { return this.runTraceStore.readRun(this.sessionId, runId); }
+    async getRecentRunTrace(sessionId = this.sessionId, runId) {
+        const target = runId ?? (await this.runTraceStore.listRunIds(sessionId))[0];
+        if (!target)
+            return [];
+        return (await this.runTraceStore.queryRecent(sessionId, target, { limit: 50 })).events;
+    }
     async setVerificationCommand(cmd) {
         this.verificationCommand = cmd;
         await this.persistVerificationCommand();
@@ -116,6 +154,8 @@ export class AgentLoop extends AgentEventEmitter {
             sessionId: this.sessionId,
             turnCount: this.turnCount,
             tokens: this.sessionTokens,
+            promptTokens: this.sessionPromptTokens,
+            completionTokens: this.sessionCompletionTokens,
             tokenSource: this.tokenUsageSource,
             compactions: this.compactionCount,
         };
@@ -142,8 +182,10 @@ export class AgentLoop extends AgentEventEmitter {
             this.messages = checkpoint.contextSnapshot;
         }
     }
-    // Token 追踪（仅计增量，避免每轮重复计算整个上下文）
+    // Token 追踪：仅累加 provider 官方 usage（按请求增量）
     sessionTokens = 0;
+    sessionPromptTokens = 0;
+    sessionCompletionTokens = 0;
     tokenUsageSource = "unknown";
     initPromise;
     // 轻量观测指标
@@ -175,6 +217,11 @@ export class AgentLoop extends AgentEventEmitter {
         this.runtimeRootDir = path.resolve(config.runtime?.fileStateDir ??
             process.env.QLING_FILE_STATE_DIR ??
             DEFAULT_QLING_DIR);
+        this.runTraceStore = new RunTraceStore({ rootDir: path.join(this.runtimeRootDir, "runs") });
+        this.executionEventBus.subscribe((event) => {
+            void this.runTraceStore.append(event).catch(() => undefined);
+            this.emit("execution", event);
+        });
         this.memoryDir = path.join(this.runtimeRootDir, "memory");
         this.loggingConfig = {
             level: config.logging?.level ?? "info",
@@ -191,11 +238,6 @@ export class AgentLoop extends AgentEventEmitter {
             systemPrompt: config.systemPrompt ?? "",
             maxIterations: config.maxIterations ?? 50,
             tools: config.tools ?? ALL_TOOLS,
-            tokenBudget: config.tokenBudget ?? {
-                maxTokens: 120_000,
-                nudgeThreshold: 0.2,
-                totalBudget: 120_000,
-            },
             runtime: {
                 workspaceDir: config.runtime?.workspaceDir ?? process.env.QLING_WORKSPACE_DIR ?? process.cwd(),
                 fileCacheDir: config.runtime?.fileCacheDir ??
@@ -204,7 +246,6 @@ export class AgentLoop extends AgentEventEmitter {
                 fileStateDir: this.runtimeRootDir,
                 maxSteps: config.runtime?.maxSteps ?? 50,
                 parseRetries: config.runtime?.parseRetries ?? 2,
-                maxTokenBudget: config.runtime?.maxTokenBudget ?? 120_000,
                 toolRepeatLimit: config.runtime?.toolRepeatLimit ?? 6,
                 timeoutMs: config.runtime?.timeoutMs ?? 300_000,
             },
@@ -223,7 +264,6 @@ export class AgentLoop extends AgentEventEmitter {
         this.memoryStore = new MemoryStore(this.memoryDir, {
             workspaceDir: this.config.runtime?.workspaceDir || undefined,
         });
-        this.tokenBudget = new TokenBudgetManager(this.config.tokenBudget?.totalBudget ?? 120_000, this.config.tokenBudget?.nudgeThreshold ?? 0.2);
         this.verifier = new VerificationAgent(apiKey, this.config.model);
         this.compactor = new ContextCompactor(6000, this.config.model);
         this.knowledgeAdapter = new KnowledgeAgentAdapter(this.memoryStore);
@@ -244,33 +284,19 @@ export class AgentLoop extends AgentEventEmitter {
         catch {
             // ignore parse errors
         }
-        this.discoveryRegistry = new DiscoveryRegistry(discoverySources);
-        this.missionManager = new MissionManager(this.runtimeRootDir);
-        // HTTP client + retry interceptor
-        this.client = axios.create({
-            baseURL: endpoint,
-            headers: {
-                Authorization: "Bearer " + this.config.apiKey,
-                "Content-Type": "application/json",
-            },
-            timeout: this.resolveLlmRequestTimeout(),
+        this.discoveryRegistry = new DiscoveryRegistry(discoverySources, {
+            guardConfig: this.guardConfig,
         });
-        this.client.interceptors.response.use((response) => response, async (err) => {
-            const cfg = err.config;
-            const maxRetries = 3;
-            cfg.__retryCount = cfg.__retryCount ?? 0;
-            // 只在 429 / 500-503 / ECONNRESET / ETIMEDOUT 时重试
-            const status = err.response?.status;
-            const shouldRetry = (!err.response || status === 429 || (status >= 500 && status <= 503)) &&
-                cfg.__retryCount < maxRetries;
-            if (shouldRetry) {
-                cfg.__retryCount++;
+        this.missionManager = new MissionManager(this.runtimeRootDir);
+        // HTTP client（foundation: providers/llm-client）
+        this.llmClient = new LlmHttpClient({
+            endpoint,
+            apiKey: this.config.apiKey,
+            timeoutMs: this.resolveLlmRequestTimeout(),
+            provider: this.config.provider,
+            onRetry: () => {
                 this.retryCountTotal++;
-                const delay = Math.min(1000 * Math.pow(2, cfg.__retryCount - 1), 10_000);
-                await new Promise((r) => setTimeout(r, delay));
-                return this.client(cfg);
-            }
-            return Promise.reject(err);
+            },
         });
         // 初始化系统（存储 promise，在 run() 中 await）
         this.initPromise = this.init();
@@ -288,9 +314,12 @@ export class AgentLoop extends AgentEventEmitter {
             console.error("🔍 正在同步动态插件与技能...");
             await this.discoveryRegistry.syncAll();
             const discoveredTools = this.discoveryRegistry.getDiscoveredTools();
-            if (discoveredTools.length > 0) {
-                this.config.tools = [...this.config.tools, ...discoveredTools];
-                console.error(`📦 已发现 ${discoveredTools.length} 个动态工具`);
+            const executableTools = this.discoveryRegistry.getExecutableTools();
+            if (executableTools.length > 0) {
+                this.config.tools = [...this.config.tools, ...executableTools];
+            }
+            if (discoveredTools.length > executableTools.length) {
+                console.error(`📦 已发现 ${discoveredTools.length} 个工具定义；未绑定执行器，仅作为本地元数据展示`);
             }
         }
         if (this.loggingConfig.inspectPrompt || this.loggingConfig.inspectRequest) {
@@ -302,7 +331,7 @@ export class AgentLoop extends AgentEventEmitter {
         const projectionInterval = Number.isFinite(projectionIntervalRaw) && projectionIntervalRaw > 0
             ? projectionIntervalRaw
             : 5000;
-        const dreamLLM = process.env.QLING_MEMORY_DREAM_LLM_ENABLED !== "false";
+        const dreamLLM = resolveMemoryDreamLlmEnabled();
         const dreamThresholdRaw = Number(process.env.QLING_MEMORY_DREAM_TURN_THRESHOLD ?? "24");
         const dreamThreshold = Number.isFinite(dreamThresholdRaw) && dreamThresholdRaw > 0
             ? dreamThresholdRaw
@@ -375,19 +404,21 @@ export class AgentLoop extends AgentEventEmitter {
                 if (metricsEnabled) {
                     console.error("[Metrics] enabled, dir=" + metricsDir);
                 }
-                // v0.3 Dashboard Server
+                // v0.3 Dashboard Server — dynamic import keeps agent-runtime free of adapters static edge
                 if (dashboardEnabled) {
-                    this.dashboardServer = new DashboardServer({
-                        port: Number(process.env.QLING_DASHBOARD_PORT) || 9999,
-                        collector: this.metricsCollector,
-                        workflowRuntime: this.workflowRuntime,
-                        agentLoop: this,
-                    });
                     try {
+                        const { DashboardServer } = await import("./dashboard-server.js");
+                        this.dashboardServer = new DashboardServer({
+                            port: Number(process.env.QLING_DASHBOARD_PORT) || 9999,
+                            collector: this.metricsCollector,
+                            workflowRuntime: this.workflowRuntime,
+                            agentLoop: this,
+                        });
                         await this.dashboardServer.start();
                     }
                     catch (serverErr) {
                         console.warn(`⚠️ Dashboard 启动跳过: ${serverErr.message}`);
+                        this.dashboardServer = null;
                     }
                 }
             }
@@ -447,378 +478,100 @@ export class AgentLoop extends AgentEventEmitter {
     }
     async run() {
         await this.initPromise;
-        const toolSignatureCounts = new Map();
-        const toolRepeatLimit = Math.max(1, this.config.runtime?.toolRepeatLimit ?? 6);
-        let selfHealingCount = 0;
-        for (let i = 0; i < this.config.maxIterations; i++) {
-            this.turnCount++;
-            // 保存本轮用户消息（在 assistant/tool 消息 push 之前）
-            let lastUserMsg = "";
-            for (let k = this.messages.length - 1; k >= 0; k--) {
-                if (this.messages[k].role === "user") {
-                    lastUserMsg = this.messages[k].content;
-                    break;
-                }
-            }
-            // 0. Token Budget Nudge
-            if (this.tokenBudget.shouldNudge()) {
-                const nudge = this.tokenBudget.buildNudgeMessage();
-                this.messages.push({ role: "user", content: nudge });
-                console.error("\n" + nudge + "\n");
-            }
-            // 0b. 上下文压缩（超过阈值时触发）
-            if (this.compactor.needsCompaction(this.messages)) {
-                console.error("\n📦 上下文压缩中...（" + this.messages.length + " 条消息）");
-                const compacted = await this.compactor.compact(this.messages);
-                this.messages = compacted;
-                this.compactionCount++;
-                console.error("📦 压缩完成 → " + this.messages.length + " 条消息\n");
-            }
-            // 0c. 冲突/注入扫描（Lesson 12: Context Validation）
-            const conflicts = this.compactor.scanConflicts(this.messages);
-            if (conflicts.length > 0) {
-                console.error("⚠️ 检测到 " + conflicts.length + " 处指令冲突");
-            }
-            const poison = this.compactor.scanPoison(this.messages);
-            if (poison.length > 0) {
-                console.error("🚨 检测到 " + poison.length + " 处可能的提示注入");
-            }
-            // 1. 构建 system prompt（动态sections）
-            const systemPrompt = await this.buildSystemPrompt();
-            // v0.3 Workflow Checkpoint: Update context
-            if (process.env.QLING_FEATURES_WORKFLOW_RUNTIME === "true") {
-                await this.workflowRuntime.updateContext(this.messages);
-            }
-            // 2. 准备本地 token fallback；若 provider 返回 usage，优先采用 provider 值。
-            const lastMsg = this.messages[this.messages.length - 1];
-            const estimatedRoundTokens = (lastMsg?.content?.length ?? 0) * 4 + (systemPrompt.length * 0.5);
-            // 3. API 调用
-            const { content, tool_calls, usage } = await this.chat(systemPrompt);
-            const tokenUsage = this.resolveRoundTokenUsage(usage, estimatedRoundTokens);
-            const roundTokens = tokenUsage.tokens;
-            this.tokenUsageSource = tokenUsage.source;
-            this.sessionTokens += roundTokens;
-            this.tokenBudget.addUsage(roundTokens);
-            this.messages.push({ role: "assistant", content, tool_calls });
-            this.emit("thinking", content || "正在思考...");
-            // 4. 无工具调用 → 结束
-            if (!tool_calls || tool_calls.length === 0) {
-                // 知识观察：助手消息
-                this.knowledgeAdapter.onAssistantMessage(content);
-                // Auto-dream 检查
-                await this.checkAutoDream();
-                // 知识观察：回合结束
-                await this.knowledgeAdapter.onTurnEnd(this.turnCount);
-                this.logTurnTelemetry({ turn: this.turnCount, toolCalls: 0, toolFailures: 0 });
-                return content;
-            }
-            // 5. Pipeline 执行（Hook → 工具）
-            console.error("\n🔧 执行 " + tool_calls.length + " 个工具...\n");
-            const preparedCalls = [];
-            for (const tc of tool_calls) {
-                const parseResult = this.parseToolArguments(tc.function.arguments);
-                if (!parseResult.ok) {
-                    preparedCalls.push({
-                        call: {
-                            id: tc.id,
-                            name: tc.function.name,
-                            arguments: {},
-                        },
-                        immediateResult: {
-                            tool_call_id: tc.id,
-                            output: `Error: [TOOL_INVALID_ARGUMENTS] ${parseResult.error}`,
-                            is_error: true,
-                            error: {
-                                code: "TOOL_INVALID_ARGUMENTS",
-                                message: parseResult.error,
-                                category: "runtime",
-                            },
-                        },
-                    });
-                    continue;
-                }
-                const call = {
-                    id: tc.id,
-                    name: tc.function.name,
-                    arguments: parseResult.value,
-                };
-                const signature = this.buildToolSignature(call.name, call.arguments);
-                const repeatCount = (toolSignatureCounts.get(signature) ?? 0) + 1;
-                toolSignatureCounts.set(signature, repeatCount);
-                if (repeatCount > toolRepeatLimit) {
-                    preparedCalls.push({
-                        call,
-                        immediateResult: {
-                            tool_call_id: tc.id,
-                            output: `Error: [TOOL_REPEAT_LIMIT_EXCEEDED] ` +
-                                `tool '${call.name}' exceeded repeat limit (${toolRepeatLimit})`,
-                            is_error: true,
-                            error: {
-                                code: "TOOL_REPEAT_LIMIT_EXCEEDED",
-                                message: `tool '${call.name}' exceeded repeat limit (${toolRepeatLimit})`,
-                                category: "guard",
-                            },
-                        },
-                    });
-                    continue;
-                }
-                preparedCalls.push({ call });
-            }
-            // v0.3 Workflow Checkpoint: Set pending tools
-            if (process.env.QLING_FEATURES_WORKFLOW_RUNTIME === "true") {
-                await this.workflowRuntime.setPendingTools(preparedCalls.map(p => p.call));
-            }
-            let turnToolCalls = 0;
-            let turnToolFailures = 0;
-            for (let j = 0; j < preparedCalls.length; j++) {
-                const prepared = preparedCalls[j];
-                const tc = prepared.call;
-                turnToolCalls++;
-                // v0.5 M2: Self-Reflective Loop (Inner Monologue)
-                // 针对高风险工具进行预演评估
-                if (tc.name === "write" || tc.name === "bash") {
-                    const reflection = await this.reflectiveThink(tc);
-                    if (reflection.decision === "block") {
-                        console.error(`🚨 [内省阻断] ${reflection.reason}`);
-                        this.messages.push({
-                            role: "tool",
-                            content: JSON.stringify({
-                                tool_call_id: tc.id,
-                                output: `Error: [REFLECTION_BLOCKED] ${reflection.reason}. This action was deemed too risky.`,
-                                is_error: true,
-                            }),
-                            tool_call_id: tc.id,
-                        });
-                        turnToolFailures++;
-                        continue;
-                    }
-                    else if (reflection.decision === "warn") {
-                        console.error(`💭 [内省警告] ${reflection.reason}`);
-                    }
-                }
-                // v0.3 Tool Spec Boost: Consistency Check
-                if (process.env.QLING_FEATURES_TOOL_SPEC_BOOST === "true") {
-                    const def = this.config.tools.find(t => t.name === tc.name);
-                    if (def) {
-                        const check = checkToolConsistency(tc, def);
-                        if (!check.ok) {
-                            console.error(`⚠️ [SpecBoost] 检查到幻觉风险: ${tc.name} - ${check.error}`);
-                            this.messages.push({
-                                role: "tool",
-                                content: JSON.stringify({
-                                    tool_call_id: tc.id,
-                                    output: `Error: [TOOL_SPEC_VIOLATION] ${check.error}. Please correct your arguments based on the schema and examples.`,
-                                    is_error: true,
-                                }),
-                                tool_call_id: tc.id,
-                            });
-                            turnToolFailures++;
-                            continue;
-                        }
-                        if (check.warnings.length > 0) {
-                            console.warn(`[SpecBoost] 潜在警告: ${check.warnings.join("; ")}`);
-                        }
-                    }
-                }
-                // 知识观察：工具调用前
-                this.knowledgeAdapter.onToolCall(tc);
-                this.emit("tool_start", tc.name, tc.arguments);
-                let result = prepared.immediateResult ?? {
-                    tool_call_id: tc.id,
-                    output: "",
-                    is_error: false,
-                };
-                if (!prepared.immediateResult) {
-                    try {
-                        result = await this.pipeline.execute(tc, (t) => dispatch(t));
-                    }
-                    catch (err) {
-                        if (err instanceof ApprovalRequiredError && this.channel) {
-                            // Approval flow
-                            if (process.env.QLING_FEATURES_WORKFLOW_RUNTIME === "true") {
-                                await this.workflowRuntime.awaitApproval();
-                            }
-                            const approvalResponse = await this.approvalGate.requestApproval({
-                                id: err.toolCallId,
-                                toolName: err.toolName,
-                                arguments: tc.arguments,
-                                reason: err.reasons.join("; "),
-                                timestamp: Date.now(),
-                            }, this.channel);
-                            if (approvalResponse.decision === "allow") {
-                                result = await dispatch(tc);
-                            }
-                            else {
-                                result = {
-                                    tool_call_id: tc.id,
-                                    output: "[Approval Denied] " + err.reasons.join("; "),
-                                    is_error: true,
-                                    error: { code: "APPROVAL_DENIED", message: "User denied tool execution", category: "permission" },
-                                };
-                                turnToolFailures++;
-                            }
-                        }
-                        else {
-                            result = {
-                                tool_call_id: tc.id,
-                                output: err.message,
-                                is_error: true,
-                                error: { code: "TOOL_ERROR", message: err.message, category: "runtime" },
-                            };
-                            turnToolFailures++;
-                        }
-                    }
-                }
-                else {
-                    turnToolFailures++;
-                }
-                // 知识观察：工具结果后
-                this.knowledgeAdapter.onToolResult(result, tc.name);
-                this.emit("tool_result", tc.name, result.output, result.is_error ?? false);
-                // v0.5 M1: Knowledge Graph Linking (Automatic)
-                if (!result.is_error && (tc.name === "bash" || tc.name === "write" || tc.name === "read")) {
-                    let lastUserMsg = "";
-                    for (let i = this.messages.length - 1; i >= 0; i--) {
-                        if (this.messages[i].role === "user") {
-                            lastUserMsg = this.messages[i].content;
-                            break;
-                        }
-                    }
-                    const taskId = "task_" + Buffer.from(lastUserMsg.slice(0, 10)).toString("hex");
-                    this.memoryStore.link({ id: taskId, type: "task", label: lastUserMsg.slice(0, 50) }, "uses", { id: "tool_" + tc.name, type: "tool", label: tc.name });
-                    const args = tc.arguments;
-                    const targetFile = args.path || args.file || "";
-                    if (targetFile) {
-                        this.memoryStore.link({ id: "tool_" + tc.name, type: "tool", label: tc.name }, tc.name === "read" ? "reads" : "writes", { id: "file_" + Buffer.from(targetFile).toString("hex"), type: "file", label: targetFile });
-                    }
-                }
-                // Phase 1.2: 可选 git auto-commit（write/patch 成功且非 dry_run）
-                if (!result.is_error &&
-                    (tc.name === "write" || tc.name === "patch") &&
-                    !tc.arguments?.dry_run) {
-                    const args = tc.arguments;
-                    const targetFile = String(args.path || args.file || "").trim();
-                    if (targetFile) {
-                        try {
-                            const ac = await maybeAutoCommitAfterWrite({
-                                workspaceDir: this.config.runtime?.workspaceDir || process.cwd(),
-                                filePath: targetFile,
-                                toolName: tc.name,
-                            });
-                            if (ac.mode !== "off") {
-                                result = {
-                                    ...result,
-                                    output: `${result.output}\n\n[${ac.message}]`,
-                                };
-                            }
-                        }
-                        catch {
-                            // auto-commit 失败不影响工具成功语义
-                        }
-                    }
-                }
-                // Guard M2: 内容过滤（工具输出）
-                if (this.guardConfig.enabled && this.guardConfig.content_filter?.enabled) {
-                    const cf = applyContentFilter(result.output, {
-                        pii: this.guardConfig.content_filter.pii_detection,
-                        injection: this.guardConfig.content_filter.injection_detection,
-                        custom: this.guardConfig.content_filter.custom_patterns.length > 0,
-                    });
-                    if (cf.blocked) {
-                        await appendGuardAudit(this.guardConfig, {
-                            tool: tc.name,
-                            action: "deny",
-                            category: "content_filter",
-                            reason: cf.reason,
-                        });
-                        result = {
-                            ...result,
-                            output: `[内容过滤] ${cf.reason}: ${(cf.matches ?? []).join(", ")}`,
-                            is_error: true,
-                            error: { code: "CONTENT_FILTERED", message: cf.reason ?? "content filtered", category: "guard" },
-                        };
-                        turnToolFailures++;
-                    }
-                }
-                // 进度展示
-                const preview = result.output.split("\n")[0].slice(0, 80);
-                const icon = result.is_error ? "❌" : "✅";
-                console.error(icon + " " + tc.name + ": " + preview + (result.output.length > 80 ? "..." : ""));
-                // v0.3 Workflow Checkpoint: Add result
-                if (process.env.QLING_FEATURES_WORKFLOW_RUNTIME === "true") {
-                    await this.workflowRuntime.addToolResult(result);
-                }
-                this.messages.push({
-                    role: "tool",
-                    content: JSON.stringify(result),
-                    tool_call_id: tc.id,
-                });
-            }
-            // 6. 验证阶段（针对写操作）
-            const hasWrites = preparedCalls.some((t) => t.call.name === "write" || t.call.name === "patch" || t.call.name === "bash");
-            if (hasWrites) {
-                if (this.verificationCommand) {
-                    console.error(`\n🔍 正在运行自动验证: ${this.verificationCommand}`);
-                    const { code, stdout, stderr } = await this.runVerificationCommand(this.verificationCommand);
-                    if (code !== 0) {
-                        if (selfHealingCount < 3) {
-                            selfHealingCount++;
-                            const truncatedStdout = stdout.length > 2000 ? stdout.slice(-2000) : stdout;
-                            const truncatedStderr = stderr.length > 2000 ? stderr.slice(-2000) : stderr;
-                            const errorContent = `【自动验证失败】运行验证命令 \`${this.verificationCommand}\` 失败。\n` +
-                                `[stdout]\n${truncatedStdout}\n` +
-                                `[stderr]\n${truncatedStderr}\n` +
-                                `请分析上述报错信息，并使用 patch 或其它工具修正它。(自愈尝试: ${selfHealingCount}/3)`;
-                            this.messages.push({ role: "user", content: errorContent });
-                            console.error(`❌ 自动验证失败，触发第 ${selfHealingCount} 轮自愈调试...`);
-                            continue;
-                        }
-                        else {
-                            console.error(`❌ 自动自愈达到 3 轮上限，验证命令仍然失败。`);
-                            return `❌ [自动验证失败] 已达到最多 3 轮自愈上限，验证命令仍然失败。\n最后报错信息:\n${stderr || stdout}`;
-                        }
-                    }
-                    else {
-                        console.error("✅ 自动验证成功！");
-                        selfHealingCount = 0; // Reset counter on success
-                    }
-                }
-                else {
-                    await this.verifyLastOperation();
-                }
-            }
-            // 7. Auto-dream 检查
-            await this.checkAutoDream();
-            // v0.5 M1: Experience Distillation (M1 Core)
-            if (this.turnCount > 0 && !preparedCalls.some(p => p.immediateResult?.is_error || (p.call.id && this.messages.some(m => m.tool_call_id === p.call.id && JSON.parse(m.content).is_error)))) {
-                const successfulCmds = preparedCalls
-                    .filter(p => p.call.name === "bash")
-                    .map(p => p.call.arguments.cmd || p.call.arguments.command);
-                if (successfulCmds.length > 0) {
-                    let lastUserMsg = "";
-                    for (let i = this.messages.length - 1; i >= 0; i--) {
-                        if (this.messages[i].role === "user") {
-                            lastUserMsg = this.messages[i].content;
-                            break;
-                        }
-                    }
-                    this.memoryStore.addPractice(lastUserMsg.slice(0, 100), successfulCmds, preparedCalls.map(p => p.call.arguments.path || p.call.arguments.file).filter(Boolean));
-                    console.error(`✨ [认知] 已将 ${successfulCmds.length} 条成功指令蒸馏为最佳实践`);
-                }
-            }
-            // 7b. 记录对话轮次（更新 conversation memory）
-            this.memoryStore.addConversationTurn("user", lastUserMsg);
-            this.memoryStore.addConversationTurn("assistant", content);
-            // 7c. 知识观察：助手消息 + 回合结束
-            this.knowledgeAdapter.onAssistantMessage(content);
-            await this.knowledgeAdapter.onTurnEnd(this.turnCount);
-            this.logTurnTelemetry({
-                turn: this.turnCount,
-                toolCalls: turnToolCalls,
-                toolFailures: turnToolFailures,
+        return runOuterAgentLoop({
+            sessionId: this.sessionId,
+            activeRun: this.activeRun,
+            messages: this.messages,
+            executionEventBus: this.executionEventBus,
+            recoveryController: this.recoveryController,
+            emit: (event, ...args) => this.emit(event, ...args),
+            getRecoveryState: () => this.getRecoveryState(),
+            formatRecoveryPause: (reason, next) => this.formatRecoveryPause(reason, next),
+            applyRecoveryStrategy: (failure, strategy) => this.applyRecoveryStrategy(failure, strategy),
+            setActiveRun: (run) => {
+                this.activeRun = run;
+            },
+            executeInner: () => this.executeRunInternal(),
+        });
+    }
+    async executeRunInternal() {
+        await this.initPromise;
+        const counters = {
+            sessionTokens: this.sessionTokens,
+            sessionPromptTokens: this.sessionPromptTokens,
+            sessionCompletionTokens: this.sessionCompletionTokens,
+            tokenUsageSource: this.tokenUsageSource,
+        };
+        const host = {
+            messages: this.messages,
+            turnCount: this.turnCount,
+            sessionId: this.sessionId,
+            maxIterations: this.config.maxIterations,
+            toolRepeatLimit: Math.max(1, this.config.runtime?.toolRepeatLimit ?? 6),
+            parseRetries: this.config.runtime?.parseRetries ?? 0,
+            verificationCommand: this.verificationCommand,
+            counters,
+            compactionCount: this.compactionCount,
+            toolCallTotal: this.toolCallTotal,
+            toolFailureTotal: this.toolFailureTotal,
+            retryCountTotal: this.retryCountTotal,
+            loggingFormat: this.loggingConfig.format,
+            activeRunId: this.activeRun?.runId,
+            compactor: this.compactor,
+            pipeline: this.pipeline,
+            tools: this.config.tools,
+            guardConfig: this.guardConfig,
+            channel: this.channel,
+            approvalGate: this.approvalGate,
+            knowledgeAdapter: this.knowledgeAdapter,
+            memoryStore: this.memoryStore,
+            workspaceDir: this.config.runtime?.workspaceDir || process.cwd(),
+            workflowRuntime: this.workflowRuntime,
+            executionEventBus: this.executionEventBus,
+            recoveryController: this.recoveryController,
+            verifier: this.verifier,
+            buildSystemPrompt: () => this.buildSystemPrompt(),
+            chat: (systemPrompt, overrides) => this.chat(systemPrompt, overrides ?? {}),
+            emit: (event, ...args) => this.emit(event, ...args),
+            runVerificationCommand: (cmd) => this.runVerificationCommand(cmd),
+            getRecoveryState: () => this.getRecoveryState(),
+            reflectiveThink: (tc) => this.reflectiveThink(tc),
+            checkAutoDream: () => this.checkAutoDream(),
+        };
+        const result = await runInnerIterationLoop(host);
+        // write back mutable counters from host
+        this.turnCount = host.turnCount;
+        this.sessionTokens = host.counters.sessionTokens;
+        this.sessionPromptTokens = host.counters.sessionPromptTokens;
+        this.sessionCompletionTokens = host.counters.sessionCompletionTokens;
+        this.tokenUsageSource = host.counters.tokenUsageSource;
+        this.compactionCount = host.compactionCount;
+        this.toolCallTotal = host.toolCallTotal;
+        this.toolFailureTotal = host.toolFailureTotal;
+        return result;
+    }
+    formatRecoveryPause(reason, next) {
+        return formatRecoveryPause({
+            reason,
+            next,
+            state: this.getRecoveryState(),
+            verificationStagesSummary: this.getVerificationStagesSummary(),
+        });
+    }
+    async applyRecoveryStrategy(failure, strategy) {
+        if (strategy === "compact_context_once") {
+            const result = await this.compactSessionNow();
+            this.messages.push({
+                role: "user",
+                content: formatRecoveryInstruction(failure, strategy) +
+                    `\n上下文压缩结果: before=${result.beforeCount} after=${result.afterCount} changed=${result.changed}`,
             });
+            return;
         }
-        return "⚠️ 达到最大迭代次数，任务未完成。";
+        this.messages.push({
+            role: "user",
+            content: formatRecoveryInstruction(failure, strategy),
+        });
     }
     getModel() {
         return this.config.model;
@@ -863,6 +616,16 @@ export class AgentLoop extends AgentEventEmitter {
             if (ensured)
                 this.config.apiKey = ensured;
         }
+        // Keep HTTP client in sync with session endpoint / key
+        this.llmClient.reconfigure({
+            endpoint: this.config.endpoint ?? "",
+            apiKey: this.config.apiKey,
+            timeoutMs: this.resolveLlmRequestTimeout(),
+            provider: this.config.provider,
+            onRetry: () => {
+                this.retryCountTotal++;
+            },
+        });
         return {
             provider: this.config.provider ?? "unknown",
             endpoint: this.config.endpoint ?? "",
@@ -876,8 +639,9 @@ export class AgentLoop extends AgentEventEmitter {
         this.messages = [];
         this.turnCount = 0;
         this.sessionTokens = 0;
+        this.sessionPromptTokens = 0;
+        this.sessionCompletionTokens = 0;
         this.tokenUsageSource = "unknown";
-        this.tokenBudget.reset();
         this.memoryStore.resetSession();
         this.sectionRegistry.clearCache();
     }
@@ -1025,11 +789,11 @@ export class AgentLoop extends AgentEventEmitter {
     }
     // --- Session Persistence ---
     async checkpointSession() {
-        return this.sessionRegistry.save(this.buildSessionSnapshot(this.sessionId));
+        return this.sessionRegistry.save(this.captureSessionSnapshot(this.sessionId));
     }
     async saveSession(name) {
-        const sessionName = name ?? "session-" + new Date().toISOString().replace(/[:.]/g, "-");
-        return this.sessionRegistry.save(this.buildSessionSnapshot(sessionName));
+        const sessionName = name ?? defaultSessionSaveName();
+        return this.sessionRegistry.save(this.captureSessionSnapshot(sessionName));
     }
     async loadSession(name) {
         return (await this.restoreSession(name)) !== null;
@@ -1046,39 +810,39 @@ export class AgentLoop extends AgentEventEmitter {
         if (!snapshot) {
             return null;
         }
-        return this.applySessionSnapshot(snapshot);
+        return this.hydrateSessionSnapshot(snapshot);
     }
     async restoreLatestSession() {
         const snapshot = await this.sessionRegistry.loadLatest();
         if (!snapshot) {
             return null;
         }
-        return this.applySessionSnapshot(snapshot);
+        return this.hydrateSessionSnapshot(snapshot);
     }
     // --- Private Methods ---
-    buildSessionSnapshot(name) {
-        return {
-            name,
+    captureSessionSnapshot(name) {
+        return buildSessionSnapshot(name, {
             sessionId: this.sessionId,
-            workspaceDir: this.getWorkspaceDir(),
-            createdAt: this.sessionCreatedAt,
-            updatedAt: new Date().toISOString(),
+            sessionCreatedAt: this.sessionCreatedAt,
             messages: this.getMessagesSnapshot(),
             turnCount: this.turnCount,
             sessionTokens: this.sessionTokens,
             compactionCount: this.compactionCount,
-        };
+            workspaceDir: this.getWorkspaceDir(),
+        });
     }
-    applySessionSnapshot(snapshot) {
-        this.messages = snapshot.messages.map((message) => ({ ...message }));
-        this.turnCount = snapshot.turnCount;
-        this.sessionTokens = snapshot.sessionTokens;
-        this.tokenUsageSource = "unknown";
-        this.compactionCount = snapshot.compactionCount;
-        this.sessionId = snapshot.sessionId;
-        this.sessionCreatedAt = snapshot.createdAt;
+    hydrateSessionSnapshot(snapshot) {
+        const patch = applySessionSnapshot(snapshot);
+        this.messages = patch.messages;
+        this.turnCount = patch.turnCount;
+        this.sessionTokens = patch.sessionTokens;
+        this.sessionPromptTokens = patch.sessionPromptTokens;
+        this.sessionCompletionTokens = patch.sessionCompletionTokens;
+        this.tokenUsageSource = patch.tokenUsageSource;
+        this.compactionCount = patch.compactionCount;
+        this.sessionId = patch.sessionId;
+        this.sessionCreatedAt = patch.sessionCreatedAt;
         this.pipeline.setSessionId(this.sessionId);
-        this.tokenBudget.syncUsage(this.sessionTokens);
         this.memoryStore.resetSession();
         this.sectionRegistry.clearCache();
         if (this.config.runtime) {
@@ -1086,323 +850,86 @@ export class AgentLoop extends AgentEventEmitter {
                 ...this.config,
                 runtime: {
                     ...this.config.runtime,
-                    workspaceDir: snapshot.workspaceDir ?? this.config.runtime.workspaceDir,
+                    workspaceDir: patch.workspaceDir ?? this.config.runtime.workspaceDir,
                 },
             };
         }
-        return {
-            name: snapshot.name,
-            sessionId: snapshot.sessionId,
-            workspaceDir: snapshot.workspaceDir,
-            createdAt: snapshot.createdAt,
-            updatedAt: snapshot.updatedAt,
-            turnCount: snapshot.turnCount,
-            messageCount: snapshot.messages.length,
-            sessionTokens: snapshot.sessionTokens,
-            compactionCount: snapshot.compactionCount,
-        };
+        return patch.summary;
     }
     /** 自我反思循环 (v0.5 M2) */
     async reflectiveThink(tc) {
-        const { buildReflectionPrompt } = await import("./pipeline/sections.js");
-        const prompt = buildReflectionPrompt(tc.name, tc.arguments);
-        try {
-            // 执行一次极简的内部调用进行风险评估
-            const resp = await this.chat(prompt, { max_tokens: 200, temperature: 0 });
-            // 提取 JSON（防止模型输出冗余文字）
-            const jsonStr = resp.content.match(/\{[\s\S]*\}/)?.[0] || "{}";
-            const analysis = JSON.parse(jsonStr);
-            return {
-                decision: analysis.decision || "proceed",
-                reason: analysis.reason || "评估完成。"
-            };
-        }
-        catch {
-            // 降级：启发式检查
-            const args = tc.arguments;
-            const cmd = (args.cmd || args.command || "").toLowerCase();
-            if (cmd.includes("rm ") || cmd.includes("del ")) {
-                return { decision: "warn", reason: "启发式拦截：检测到可能的删除操作。" };
-            }
-            return { decision: "proceed", reason: "启发式通过。" };
-        }
+        return reflectiveThink(tc, (systemPrompt, overrides) => this.chat(systemPrompt, overrides ?? {}));
     }
     async buildSystemPrompt() {
-        // 加载代码地图并更新 REPOMAP section
-        const cognitiveIndex = this.memoryStore?.getCognitiveIndex?.();
-        if (cognitiveIndex) {
-            try {
-                const symbols = cognitiveIndex.getAllSymbols();
-                this.sectionRegistry.register(buildRepoMapSection(symbols));
-            }
-            catch (err) {
-                // Ignore
-            }
-        }
-        // 更新 token budget section
-        const budgetSec = this.sectionRegistry.get(SECTION_IDS.TOKEN_BUDGET);
-        if (budgetSec) {
-            const used = this.sessionTokens;
-            const max = this.tokenBudget.maxTokens;
-            this.sectionRegistry.register({
-                ...budgetSec,
-                content: "【Token 预算】\n已使用: ~" +
-                    used.toLocaleString() +
-                    " tokens\n剩余: ~" +
-                    (max - used).toLocaleString() +
-                    " tokens (" +
-                    Math.round(((max - used) / max) * 100) +
-                    "%)\n当剩余低于 20% 时，主动精简回复，减少工具调用频率。",
-                dynamic: true,
-            });
-        }
-        // 加载记忆 (v0.3 支持语义异步预取)
-        let memoryStr = "";
-        if (this.messages.length > 0) {
-            let lastUserMsg = "";
-            for (let i = this.messages.length - 1; i >= 0; i--) {
-                if (this.messages[i].role === "user") {
-                    lastUserMsg = this.messages[i].content;
-                    break;
-                }
-            }
-            const relevant = await this.memoryStore.getRelevant(lastUserMsg, 10);
-            if (relevant.length > 0) {
-                memoryStr = relevant.map((e) => "[" + e.source + "] " + e.content).join("\n");
-            }
-        }
-        const sectionPrompt = buildSystemPrompt(this.sectionRegistry, {
-            memory: memoryStr || undefined,
+        return assembleSystemPrompt({
+            baseSystemPrompt: this.config.systemPrompt,
+            sectionRegistry: this.sectionRegistry,
+            memoryStore: this.memoryStore,
+            messages: this.messages,
+            provider: this.config.provider,
+            endpoint: this.config.endpoint,
+            workspaceDir: this.config.runtime?.workspaceDir,
+            fileCacheDir: this.config.runtime?.fileCacheDir,
+            fileStateDir: this.config.runtime?.fileStateDir,
+            runtimeRootDir: this.runtimeRootDir,
         });
-        const parts = [
-            this.config.systemPrompt.trim(),
-            this.buildRuntimeMetaSection(),
-            sectionPrompt,
-        ].filter((p) => p && p.trim().length > 0);
-        return parts.join("\n\n");
     }
     async chat(systemPrompt, overrides = {}) {
-        const systemMsg = { role: "system", content: systemPrompt };
-        const payload = {
-            model: this.config.model,
-            messages: [systemMsg, ...this.messages],
-            tools: this.config.tools.map((t) => ({
-                type: "function",
-                function: {
-                    name: t.name,
-                    description: t.description,
-                    parameters: t.parameters,
-                },
-            })),
-            stream: false,
-            ...overrides,
-        };
         await this.maybeDumpInspect("prompt", {
             turn: this.turnCount,
             model: this.config.model,
             runtime: this.config.runtime ?? null,
             prompt: systemPrompt,
         });
-        await this.maybeDumpInspect("request", payload);
-        let resp;
-        try {
-            resp = await this.client.post("/chat/completions", payload);
-        }
-        catch (err) {
-            const e = err;
-            const detail = JSON.stringify(e.response?.data ?? {}).slice(0, 500);
-            throw new Error(`${this.config.provider} API error: ` + detail);
-        }
-        const choice = resp.data.choices?.[0];
-        if (!choice)
-            throw new Error(`${this.config.provider} API error: ` + JSON.stringify(resp.data));
-        const msg = choice.message;
-        let rawToolCalls;
-        if (msg.tool_calls && msg.tool_calls.length > 0) {
-            rawToolCalls = msg.tool_calls.map((tc) => ({
-                id: tc.id,
-                type: "function",
-                function: {
-                    name: tc.function.name,
-                    arguments: typeof tc.function.arguments === "string"
-                        ? tc.function.arguments
-                        : JSON.stringify(tc.function.arguments),
-                },
-            }));
-        }
-        return {
-            content: msg.content ?? "",
-            tool_calls: rawToolCalls,
-            usage: this.extractChatUsage(resp.data?.usage),
-        };
-    }
-    extractChatUsage(rawUsage) {
-        if (!rawUsage || typeof rawUsage !== "object")
-            return undefined;
-        const usage = rawUsage;
-        const total = Number(usage.total_tokens ?? usage.totalTokens);
-        if (!Number.isFinite(total) || total <= 0)
-            return undefined;
-        return { totalTokens: Math.floor(total) };
-    }
-    resolveRoundTokenUsage(usage, fallbackTokens) {
-        if (usage?.totalTokens && Number.isFinite(usage.totalTokens) && usage.totalTokens > 0) {
-            return { tokens: usage.totalTokens, source: "provider" };
-        }
-        return { tokens: fallbackTokens, source: "estimate" };
+        await this.maybeDumpInspect("request", {
+            model: this.config.model,
+            systemPrompt,
+            messageCount: this.messages.length,
+            toolCount: this.config.tools.length,
+            overrides,
+        });
+        return this.llmClient.chatCompletions({
+            model: this.config.model,
+            systemPrompt,
+            messages: this.messages,
+            tools: this.config.tools,
+            overrides,
+        });
     }
-    async verifyLastOperation() {
-        // 取最近的 bash/write 结果
-        const toolMsgs = this.messages.filter((m) => m.role === "tool");
-        if (toolMsgs.length === 0)
-            return;
-        try {
-            const lastResult = JSON.parse(toolMsgs[toolMsgs.length - 1].content);
-            const vr = await this.verifier.verify("文件操作/Bash执行", "操作成功完成", lastResult.output);
-            const icon = vr.verdict === "PASS" ? "✅" : vr.verdict === "FAIL" ? "❌" : "⚠️";
-            console.error(icon + " 验证结果: " + vr.verdict);
-            if (vr.verdict !== "PASS") {
-                console.error("   详情: " + vr.details);
-            }
-            this.emit("verification", vr.verdict, vr.details ?? vr.verdict);
-        }
-        catch {
-            // 忽略验证错误
-        }
+    /** Exposed for doctor / status: current staged verification plan. */
+    getVerificationStagesSummary() {
+        return stagesSummary(this.verificationCommand);
     }
     async persistVerificationCommand() {
-        const workspaceDir = this.getWorkspaceDir();
-        const filePath = path.join(workspaceDir, ".qling-verify.json");
-        try {
-            if (this.verificationCommand) {
-                await fs.writeFile(filePath, JSON.stringify({ verificationCommand: this.verificationCommand }, null, 2), "utf-8");
-            }
-            else {
-                if (existsSync(filePath)) {
-                    await fs.unlink(filePath);
-                }
-            }
-        }
-        catch (err) {
-            console.error("[AgentLoop] Failed to persist verification command: " + err.message);
-        }
+        await persistVerificationCommandFile(this.getWorkspaceDir(), this.verificationCommand);
     }
     async loadVerificationCommand() {
-        const workspaceDir = this.getWorkspaceDir();
-        const filePath = path.join(workspaceDir, ".qling-verify.json");
-        if (existsSync(filePath)) {
-            try {
-                const content = await fs.readFile(filePath, "utf-8");
-                const data = JSON.parse(content);
-                this.verificationCommand = data.verificationCommand ?? null;
-            }
-            catch (err) {
-                console.error("[AgentLoop] Failed to load verification command: " + err.message);
-            }
-        }
+        this.verificationCommand = await loadVerificationCommandFile(this.getWorkspaceDir());
     }
     runVerificationCommand(cmd) {
-        return new Promise((resolve) => {
-            exec(cmd, { cwd: this.getWorkspaceDir() }, (error, stdout, stderr) => {
-                const code = error ? (error.code ?? 1) : 0;
-                resolve({ code, stdout, stderr });
-            });
-        });
+        return runShellCommand(cmd, this.getWorkspaceDir());
     }
     async checkAutoDream() {
         try {
-            const transcript = this.messages
-                .filter((m) => m.role === "user" || m.role === "assistant")
-                .map((m) => m.content);
-            let memories;
-            let changedCount = 0;
-            if (this.memoryDreamLLMEnabled) {
-                memories = await extractDreamMemoriesLLM(transcript, this.turnCount, {
-                    enabled: true,
-                    model: this.config.model,
-                    maxTokens: 300,
-                    apiKey: this.config.apiKey,
-                    endpoint: this.config.endpoint ?? "https://api.deepseek.com",
-                });
-                const { consolidateMemoriesLLM } = await import("./memory/consolidation.js");
-                const existing = this.memoryStore.exportPersisted();
-                const ops = await consolidateMemoriesLLM(memories, existing, {
-                    apiKey: this.config.apiKey,
-                    endpoint: this.config.endpoint ?? "https://api.deepseek.com",
-                    model: this.config.model,
-                });
-                this.memoryStore.applyOperations(ops, "workspace");
-                changedCount = ops.filter((op) => op.action !== "NOOP").length;
-            }
-            else {
-                memories = await extractDreamMemories({ turnCount: this.turnCount, transcript }, { enabled: true, turnThreshold: this.memoryDreamTurnThreshold, transcriptWindow: 4 });
-                const existingContents = new Set(this.memoryStore.exportPersisted().map((e) => e.content));
-                const newMems = memories.filter((m) => !existingContents.has(m));
-                for (const mem of newMems) {
-                    this.memoryStore.add(mem, "auto-dream", 0.6);
-                }
-                changedCount = newMems.length;
-            }
+            const changedCount = await runAutoDream({
+                messages: this.messages,
+                turnCount: this.turnCount,
+                memoryStore: this.memoryStore,
+                memoryDreamLLMEnabled: this.memoryDreamLLMEnabled,
+                memoryDreamTurnThreshold: this.memoryDreamTurnThreshold,
+                memoryMaxEntries: this.memoryMaxEntries,
+                model: this.config.model,
+                apiKey: this.config.apiKey,
+                endpoint: this.config.endpoint ?? "https://api.deepseek.com",
+            });
             if (changedCount > 0) {
-                this.memoryStore.compactPersisted(this.memoryMaxEntries);
-                await this.memoryStore.saveToDisk();
                 console.error("[AutoDream] " + changedCount + " 项长期记忆已整理并保存");
             }
         }
-        catch (err) {
+        catch {
             // ignore
         }
     }
-    estimateTokens() {
-        // 粗略估算：总字符数 × 4
-        const totalChars = this.messages.reduce((sum, m) => sum + m.content.length, 0);
-        return totalChars * 4;
-    }
-    logTurnTelemetry(metrics) {
-        this.toolCallTotal += metrics.toolCalls;
-        this.toolFailureTotal += metrics.toolFailures;
-        const turnFailureRate = metrics.toolCalls === 0 ? 0 : Math.round((metrics.toolFailures / metrics.toolCalls) * 100);
-        const totalFailureRate = this.toolCallTotal === 0 ? 0 : Math.round((this.toolFailureTotal / this.toolCallTotal) * 100);
-        const text = "📊 [Obs] turn=" +
-            metrics.turn +
-            " tools=" +
-            metrics.toolCalls +
-            " turnFailRate=" +
-            turnFailureRate +
-            "% totalFailRate=" +
-            totalFailureRate +
-            "% compactions=" +
-            this.compactionCount +
-            " retries=" +
-            this.retryCountTotal;
-        if (this.loggingConfig.format === "json") {
-            console.error(JSON.stringify({
-                type: "observability",
-                turn: metrics.turn,
-                toolCalls: metrics.toolCalls,
-                turnFailureRate,
-                totalFailureRate,
-                compactions: this.compactionCount,
-                retries: this.retryCountTotal,
-            }));
-            return;
-        }
-        console.error(text);
-    }
-    buildRuntimeMetaSection() {
-        const runtime = this.config.runtime;
-        const workspace = runtime?.workspaceDir ?? "(disabled)";
-        const cache = runtime?.fileCacheDir ?? path.join(this.runtimeRootDir, "cache");
-        const state = runtime?.fileStateDir ?? this.runtimeRootDir;
-        return [
-            "【Runtime Meta】",
-            `provider=${this.config.provider ?? "default"}`,
-            `endpoint=${this.config.endpoint ?? "default"}`,
-            `workspace_dir=${workspace}`,
-            `file_cache_dir=${cache}`,
-            `file_state_dir=${state}`,
-        ].join("\n");
-    }
     async maybeDumpInspect(kind, payload) {
         if (kind === "prompt" && !this.loggingConfig.inspectPrompt)
             return;
@@ -1423,76 +950,4 @@ export class AgentLoop extends AgentEventEmitter {
         }
         return this.config.runtime?.timeoutMs ?? 120_000;
     }
-    parseToolArguments(raw) {
-        const retries = Math.max(0, this.config.runtime?.parseRetries ?? 0);
-        let candidate = String(raw ?? "");
-        let lastError = "invalid arguments";
-        for (let attempt = 0; attempt <= retries; attempt++) {
-            try {
-                const parsed = JSON.parse(candidate);
-                if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-                    lastError = "arguments must be a JSON object";
-                }
-                else {
-                    return { ok: true, value: parsed };
-                }
-            }
-            catch (err) {
-                lastError = err instanceof Error ? err.message : String(err);
-            }
-            if (attempt < retries) {
-                candidate = this.repairToolArguments(candidate, attempt);
-            }
-        }
-        return {
-            ok: false,
-            error: `failed after ${retries + 1} attempt(s): ${lastError}`,
-        };
-    }
-    repairToolArguments(source, attempt) {
-        let out = source.trim();
-        if (attempt === 0) {
-            const fenced = out.match(/^```(?:json)?\s*([\s\S]*?)\s*```$/i);
-            if (fenced) {
-                out = fenced[1].trim();
-            }
-            return out;
-        }
-        if (attempt === 1) {
-            return out.replace(/,\s*([}\]])/g, "$1");
-        }
-        if (attempt === 2) {
-            return out
-                .replace(/[“”]/g, "\"")
-                .replace(/[‘’]/g, "'")
-                .replace(/([{,]\s*)'([^']+?)'\s*:/g, '$1"$2":')
-                .replace(/:\s*'([^']*?)'(\s*[,}])/g, ': "$1"$2');
-        }
-        return out;
-    }
-    buildToolSignature(name, args) {
-        return `${name}:${this.stableStringify(args)}`;
-    }
-    stableStringify(value) {
-        const normalize = (input) => {
-            if (Array.isArray(input)) {
-                return input.map((item) => normalize(item));
-            }
-            if (input && typeof input === "object") {
-                const entries = Object.entries(input).sort(([a], [b]) => a.localeCompare(b));
-                const obj = {};
-                for (const [k, v] of entries) {
-                    obj[k] = normalize(v);
-                }
-                return obj;
-            }
-            return input;
-        };
-        try {
-            return JSON.stringify(normalize(value));
-        }
-        catch {
-            return "[unstringifiable]";
-        }
-    }
 }