@gracker/smartperfetto 1.0.19 → 1.0.20

package/dist/agentv3/claudeRuntime.js

@@ -65,18 +65,10 @@ const contextTokenMeter_1 = require("./contextTokenMeter");
 const agentMetrics_1 = require("./agentMetrics");
 const analysisPatternMemory_1 = require("./analysisPatternMemory");
 const codeAwareOutputRegistry_1 = require("../services/security/codeAwareOutputRegistry");
-const skillNotesInjector_1 = require("./selfImprove/skillNotesInjector");
 const strategyFingerprint_1 = require("./selfImprove/strategyFingerprint");
 const claudeVerifier_1 = require("./claudeVerifier");
 const runtimePaths_1 = require("../runtimePaths");
 const finalResultQualityGate_1 = require("../services/finalResultQualityGate");
-function parseQuickBudgetEnv() {
-    const v = process.env.SELF_IMPROVE_QUICK_NOTES_BUDGET;
-    if (!v)
-        return undefined;
-    const n = Number.parseInt(v, 10);
-    return Number.isFinite(n) && n >= 0 ? n : undefined;
-}
 function parseLeadingJsonObject(text) {
     let depth = 0;
     let inString = false;
@@ -142,7 +134,7 @@ function extractPlanPhaseIdFromToolResult(resultStr) {
     return undefined;
 }
 function looksLikeProcessNarration(text) {
-    return /(?:我需要|我将|接下来|先重新|重新读取|继续调用|工具|tool|let me|i need to|i will|next i)/i
+    return /(?:我来|我需要|我将|接下来|先重新|重新读取|继续调用|首先.*提交|计划已提交|工具|tool|let me|i need to|i will|next i)/i
         .test(text.slice(0, 500));
 }
 function correctionResultLooksUsable(text) {
@@ -156,16 +148,116 @@ function correctionResultLooksUsable(text) {
         return false;
     return hasFinalReportMarker || !(0, claudeVerifier_1.isConclusionIncomplete)(trimmed);
 }
+function findDeliverableReportHeadingIndex(text) {
+    const match = text.match(/(?:^|\n)\s{0,3}(?:#{1,3}\s*)?(?:(?:[^\n#]{0,40})?分析报告|综合结论|关键结论|最终结论|最终报告|根因分析|Final Conclusion|Final Report|Analysis Report|Root Cause)(?=\s|[：:。.!！?\n]|$)/i);
+    return match?.index ?? -1;
+}
+function stripLeadingProcessNarrationBeforeSection(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return '';
+    const reportHeadingMatch = trimmed.match(/^\s{0,3}#{1,3}\s*[^\n]*(?:分析报告|最终报告|Final Report|Analysis Report)[^\n]*\n+/i);
+    const heading = reportHeadingMatch ? reportHeadingMatch[0].trimEnd() : '';
+    const body = reportHeadingMatch
+        ? trimmed.slice(reportHeadingMatch[0].length).trimStart()
+        : trimmed;
+    const sectionMatch = /(?:^|\n)\s{0,3}#{1,4}\s+\S/.exec(body);
+    if (!sectionMatch || sectionMatch.index === undefined || sectionMatch.index <= 0) {
+        return trimmed;
+    }
+    const prefix = body.slice(0, sectionMatch.index).trim();
+    const prefixIsProcessNarration = looksLikeProcessNarration(prefix) ||
+        (0, finalResultQualityGate_1.looksLikeProcessNarrationConclusion)(prefix) ||
+        /(?:我来分析|计划已提交|开始\s*Phase|进入\s*Phase|Phase\s*\d+|所有假设已解决|完整结构化报告|修正重试|验证发现|update_plan_phase|resolve_hypothesis)/i.test(prefix);
+    if (!prefixIsProcessNarration)
+        return trimmed;
+    const reportBody = body.slice(sectionMatch.index).trimStart();
+    return heading ? `${heading}\n\n${reportBody}` : reportBody;
+}
+function sanitizeClaudeConclusionText(text) {
+    const trimmed = text.trim();
+    if (!trimmed)
+        return '';
+    const singleLineCleaned = trimmed
+        .replace(/^(?:完成综合结论输出|完整结构化报告已(?:输出|生成))[。:：\s]*/i, '')
+        .replace(/^所有假设已解决[。；;,\s]*(?:现在)?输出完整结构化报告[。:：\s-]*/i, '')
+        .replace(/^所有(?:深钻)?数据已收集完毕[。；;,\s]*(?:现在)?输出(?:综合结论|最终报告|完整结构化报告)[。:：\s-]*/i, '')
+        .trim();
+    const processIntroCleaned = stripLeadingProcessNarrationBeforeSection(singleLineCleaned);
+    if (processIntroCleaned !== trimmed)
+        return processIntroCleaned;
+    const headingIndex = findDeliverableReportHeadingIndex(trimmed);
+    if (headingIndex <= 0 || !(0, finalResultQualityGate_1.hasDeliverableFinalReportHeading)(trimmed.slice(headingIndex))) {
+        return trimmed;
+    }
+    const prefix = trimmed.slice(0, headingIndex).trim();
+    const prefixIsProcessNarration = looksLikeProcessNarration(prefix) ||
+        (0, finalResultQualityGate_1.looksLikeProcessNarrationConclusion)(prefix) ||
+        /(?:我来分析|计划已提交|开始\s*Phase|进入\s*Phase|Phase\s*\d+|所有假设已解决|完整结构化报告|修正重试|验证发现|update_plan_phase|resolve_hypothesis)/i.test(prefix);
+    if (!prefixIsProcessNarration)
+        return trimmed;
+    return trimmed.slice(headingIndex).trim();
+}
+function reportHeadingForScene(sceneType, outputLanguage) {
+    const zh = outputLanguage !== 'en';
+    switch (sceneType) {
+        case 'startup':
+            return zh ? '# 启动性能分析报告' : '# Startup Performance Analysis Report';
+        case 'scrolling':
+            return zh ? '# 滑动性能分析报告' : '# Scrolling Performance Analysis Report';
+        case 'anr':
+            return zh ? '# ANR 分析报告' : '# ANR Analysis Report';
+        default:
+            return zh ? '# 性能分析报告' : '# Performance Analysis Report';
+    }
+}
+function looksLikeStructuredDeliverableReport(text) {
+    const trimmed = text.trim();
+    const headingCount = (trimmed.match(/(^|\n)\s{0,3}#{1,3}\s+\S/g) || []).length;
+    if (headingCount < 2)
+        return false;
+    return /(?:evidence_ref_id|source_ref|art-\d+|data:art-\d+|data:skill:|##?\s*(?:概览|关键发现|根因|优化建议|Recommendations|Evidence))/i.test(trimmed);
+}
+function ensureClaudeFinalReportHeading(text, sceneType, outputLanguage) {
+    const trimmed = sanitizeClaudeConclusionText(text);
+    if (!trimmed || (0, finalResultQualityGate_1.hasDeliverableFinalReportHeading)(trimmed))
+        return trimmed;
+    if (!looksLikeStructuredDeliverableReport(trimmed))
+        return trimmed;
+    return `${reportHeadingForScene(sceneType, outputLanguage)}\n\n${trimmed}`;
+}
+function shouldMarkCorrectionTimeoutPartial(input) {
+    if (correctionResultLooksUsable(sanitizeClaudeConclusionText(input.correctedResult))) {
+        return false;
+    }
+    return !correctionResultLooksUsable(sanitizeClaudeConclusionText(input.existingConclusion));
+}
+function chooseClaudeConclusionText(input) {
+    const finalResult = sanitizeClaudeConclusionText(input.finalResult);
+    const accumulatedAnswer = sanitizeClaudeConclusionText(input.accumulatedAnswer);
+    if (!finalResult)
+        return accumulatedAnswer;
+    if (!accumulatedAnswer)
+        return finalResult;
+    if ((0, claudeVerifier_1.isConclusionIncomplete)(finalResult) &&
+        accumulatedAnswer.length > finalResult.length &&
+        (0, finalResultQualityGate_1.hasDeliverableFinalReportHeading)(accumulatedAnswer)) {
+        return accumulatedAnswer;
+    }
+    if (!(0, finalResultQualityGate_1.hasDeliverableFinalReportHeading)(finalResult) &&
+        (0, finalResultQualityGate_1.hasDeliverableFinalReportHeading)(accumulatedAnswer)) {
+        return accumulatedAnswer;
+    }
+    return finalResult;
+}
 const traceCompletenessProber_1 = require("./traceCompletenessProber");
-const entityCapture_1 = require("../agent/core/entityCapture");
 const outputLanguage_1 = require("./outputLanguage");
 const runtimeSnapshotStore_1 = require("../services/runtimeSnapshotStore");
 const enterpriseMigration_1 = require("../services/enterpriseMigration");
+const runtimeCommon_1 = require("../agentRuntime/runtimeCommon");
 const SESSION_MAP_FILE = (0, runtimePaths_1.backendLogPath)('claude_session_map.json');
 /** Max age for session map entries before pruning (24 hours). */
 const SESSION_MAP_MAX_AGE_MS = 24 * 60 * 60 * 1000;
-/** Claude SDK sessions expire server-side after roughly 4 hours. */
-const SDK_SESSION_FRESHNESS_MS = 4 * 60 * 60 * 1000;
 function enterpriseSessionMapDbWritesEnabled() {
     return (0, enterpriseMigration_1.enterpriseDbWritesEnabled)();
 }
@@ -213,25 +305,6 @@ function loadSessionMapForCurrentMode() {
     }
     return new Map();
 }
-function providerScopeFromOptions(options) {
-    if (!options.tenantId || !options.workspaceId)
-        return undefined;
-    return {
-        tenantId: options.tenantId,
-        workspaceId: options.workspaceId,
-        userId: options.userId,
-    };
-}
-function knowledgeScopeFromOptions(options) {
-    if (!options.tenantId || !options.workspaceId)
-        return undefined;
-    return {
-        tenantId: options.tenantId,
-        workspaceId: options.workspaceId,
-        userId: options.userId,
-        sourceRunId: options.runId,
-    };
-}
 /**
  * Debounce timer for session map persistence — avoids blocking event loop on every SDK message.
  * P2-1: Use a Map keyed by the Map reference to support multiple ClaudeRuntime instances.
@@ -272,24 +345,6 @@ function savePersistedSessionMapSync(map) {
 // The old logs/session_notes/ directory is no longer written to.
 // P2-G1: ALLOWED_TOOLS is now auto-derived from createClaudeMcpServer() return value.
 // No longer hardcoded — adding a new MCP tool automatically includes it.
-/**
- * Format pre-queried trace datasets as Markdown tables to prepend to the AI prompt.
- * Mirrors smartperfetto's approach: data is ready upfront so the AI skips basic SQL turns.
- */
-function formatTraceContext(datasets, outputLanguage = outputLanguage_1.DEFAULT_OUTPUT_LANGUAGE) {
-    if (!datasets || datasets.length === 0)
-        return '';
-    const parts = datasets.map((d) => {
-        const header = `| ${d.columns.join(' | ')} |`;
-        const sep = `| ${d.columns.map(() => '---').join(' | ')} |`;
-        const rows = d.rows.slice(0, 100).map((r) => `| ${r.map((v) => String(v ?? '—')).join(' | ')} |`);
-        const truncNote = d.rows.length > 100
-            ? (0, outputLanguage_1.localize)(outputLanguage, `\n*(前 100 行，共 ${d.rows.length} 行)*`, `\n*(first 100 rows out of ${d.rows.length})*`)
-            : '';
-        return `### ${d.label}\n${header}\n${sep}\n${rows.join('\n')}${truncNote}`;
-    });
-    return (0, outputLanguage_1.localize)(outputLanguage, `## 前端预查询 Trace 数据\n\n以下数据已由前端查询完毕，直接使用，无需重复 SQL 查询：\n\n${parts.join('\n\n')}`, `## Frontend Pre-queried Trace Data\n\nThe frontend has already queried the following data. Use it directly; do not repeat the same SQL query.\n\n${parts.join('\n\n')}`);
-}
 /** Check if an error is retryable (API overload/server errors). */
 function isRetryableError(err) {
     const msg = err.message || '';
@@ -331,44 +386,18 @@ function isMissingSdkConversationError(message) {
 function isFreshFullSdkSessionEntry(entry, now = Date.now()) {
     return !!entry
         && entry.mode === 'full'
-        && now - (entry.updatedAt || 0) < SDK_SESSION_FRESHNESS_MS;
-}
-function compactForPrompt(value, maxChars) {
-    const text = String(value ?? '').replace(/\s+/g, ' ').trim();
-    if (text.length <= maxChars)
-        return text;
-    return `${text.slice(0, Math.max(0, maxChars - 1))}...`;
-}
-function buildQuickConversationContext(previousTurns, outputLanguage = outputLanguage_1.DEFAULT_OUTPUT_LANGUAGE) {
-    const turns = previousTurns.filter(turn => turn.completed).slice(-3);
-    if (turns.length === 0)
-        return undefined;
-    const lines = [
-        (0, outputLanguage_1.localize)(outputLanguage, '## 最近对话上下文\n\n以下是 SmartPerfetto 本地保存的最近问答，用于理解“继续/刚才/这个”等指代；不要把它当作当前问题的新证据。', '## Recent Conversation Context\n\nThe following recent SmartPerfetto turns are local context for references like "continue", "earlier", or "this"; do not treat them as new evidence for the current question.'),
-    ];
-    for (const turn of turns) {
-        const query = compactForPrompt(turn.query, 220);
-        const answer = compactForPrompt(turn.result?.message || '', 700);
-        const findings = turn.findings
-            .slice(0, 3)
-            .map(f => `[${f.severity}] ${compactForPrompt(f.title, 160)}`)
-            .filter(Boolean);
-        lines.push(`### Turn ${turn.turnIndex + 1}`);
-        lines.push(`- ${(0, outputLanguage_1.localize)(outputLanguage, '用户', 'User')}: ${query}`);
-        if (answer) {
-            lines.push(`- ${(0, outputLanguage_1.localize)(outputLanguage, '上轮回答', 'Previous answer')}: ${answer}`);
-        }
-        if (findings.length > 0) {
-            lines.push(`- ${(0, outputLanguage_1.localize)(outputLanguage, '上轮发现', 'Previous findings')}: ${findings.join('; ')}`);
-        }
-    }
-    return lines.join('\n');
+        && (0, runtimeCommon_1.isFreshRuntimeEntry)(entry, runtimeCommon_1.SDK_SESSION_FRESHNESS_MS, now);
 }
 exports.__testing = {
     getSdkResultErrorMessage,
     isMissingSdkConversationError,
     isFreshFullSdkSessionEntry,
-    buildQuickConversationContext,
+    buildQuickConversationContext: runtimeCommon_1.buildQuickConversationContext,
+    correctionResultLooksUsable,
+    chooseClaudeConclusionText,
+    ensureClaudeFinalReportHeading,
+    sanitizeClaudeConclusionText,
+    shouldMarkCorrectionTimeoutPartial,
 };
 /** Sleep for the given milliseconds. */
 function sleep(ms) {
@@ -491,7 +520,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
     }
     /** Restore a cached architecture detection result (e.g., from session persistence). */
     restoreArchitectureCache(traceId, architecture) {
-        this.architectureCache.set(traceId, architecture);
+        (0, runtimeCommon_1.setLruCacheEntry)(this.architectureCache, traceId, architecture);
     }
     /** Get cached architecture for a traceId (used for persistence). */
     getCachedArchitecture(traceId) {
@@ -503,7 +532,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
         return isFreshFullSdkSessionEntry(entry) ? entry.sdkSessionId : undefined;
     }
     buildSessionMapKey(sessionId, referenceTraceId) {
-        return referenceTraceId ? `${sessionId}:ref:${referenceTraceId}` : sessionId;
+        return (0, runtimeCommon_1.buildRuntimeSessionMapKey)(sessionId, referenceTraceId);
     }
     persistSessionMapEntry(sessionId, traceId, sessionMapKey, entry, options) {
         if (legacySessionMapWritesEnabled()) {
@@ -541,7 +570,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
         }
         if (enterpriseSessionMapDbWritesEnabled()) {
             try {
-                (0, runtimeSnapshotStore_1.deleteClaudeSessionMapRuntimeSnapshot)(sessionId, sessionMapKey, providerScopeFromOptions(options));
+                (0, runtimeSnapshotStore_1.deleteClaudeSessionMapRuntimeSnapshot)(sessionId, sessionMapKey, (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options));
             }
             catch (err) {
                 console.warn('[ClaudeRuntime] Failed to delete stale SDK session map from runtime_snapshots:', err.message);
@@ -607,7 +636,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 // Distinguish: only full analysis turns trigger multi-turn continuity (not prior quick turns)
                 hasPriorFullAnalysis: previousTurns.some(t => t.intent?.complexity !== 'simple'),
             };
-            const cachedArch = this.architectureCache.get(traceId);
+            const cachedArch = (0, runtimeCommon_1.getLruCacheEntry)(this.architectureCache, traceId);
             // Focus detection runs for every path — kick it off once and let the classifier
             // (if needed) share the wait. Explicit 'fast'/'full' skips the classifier entirely.
             const explicitMode = options.analysisMode;
@@ -615,7 +644,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 console.warn('[ClaudeRuntime] Focus app detection failed (graceful):', err.message);
                 return { apps: [], primaryApp: undefined, method: 'none' };
             });
-            const providerScope = providerScopeFromOptions(options);
+            const providerScope = (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options);
             const runtimeConfig = (0, claudeConfig_1.resolveRuntimeConfig)(this.config, options.providerId, providerScope);
             let queryComplexity;
             let classifierSource;
@@ -654,6 +683,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 sessionContext,
                 previousTurns,
                 sceneType,
+                runtimeConfig,
             });
             const { handleMessage: bridge, getAccumulatedAnswer } = (0, claudeSseBridge_1.createSseBridge)((update) => {
                 this.emitUpdate(update);
@@ -702,7 +732,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             }
             // Prepend pre-queried trace data so the AI has all context without spending turns on SQL
             if (options.traceContext && options.traceContext.length > 0) {
-                const traceSection = formatTraceContext(options.traceContext, this.config.outputLanguage);
+                const traceSection = (0, runtimeCommon_1.formatTraceContext)(options.traceContext, this.config.outputLanguage);
                 effectivePrompt = `${traceSection}\n\n${effectivePrompt}`;
             }
             const sdkEnv = (0, claudeConfig_1.createSdkEnv)(options.providerId, providerScope);
@@ -1091,8 +1121,8 @@ class ClaudeRuntime extends events_1.EventEmitter {
                             terminationMessage = (0, analysisTermination_1.buildMaxTurnsTerminationMessage)({
                                 mode: 'full',
                                 turns: rounds,
-                                maxTurns: this.config.maxTurns,
-                                outputLanguage: this.config.outputLanguage,
+                                maxTurns: runtimeConfig.maxTurns,
+                                outputLanguage: runtimeConfig.outputLanguage,
                             });
                         }
                         // Record SDK token usage and prompt cache metrics
@@ -1181,13 +1211,24 @@ class ClaudeRuntime extends events_1.EventEmitter {
                     mode: 'full',
                 });
             }
-            // Use SDK terminal result if available; fall back to accumulated streamed answer tokens.
-            // On timeout, the SDK result message may never arrive, but answer_token events
-            // were already streamed to the frontend — use that text to populate the report.
-            conclusionText = finalResult || getAccumulatedAnswer() || '';
+            // Prefer a deliverable streamed report over a short SDK terminal summary.
+            // Some compatible providers put the full report in answer_token chunks but
+            // return only a terse summary in the terminal result.
+            const accumulatedAnswerBeforeVerification = getAccumulatedAnswer();
+            conclusionText = chooseClaudeConclusionText({
+                finalResult: finalResult || '',
+                accumulatedAnswer: accumulatedAnswerBeforeVerification,
+            });
+            conclusionText = ensureClaudeFinalReportHeading(conclusionText, ctx.sceneType, runtimeConfig.outputLanguage);
             if (!finalResult && conclusionText) {
                 console.warn(`[ClaudeRuntime] Session ${sessionId}: SDK result was empty, recovered ${conclusionText.length} chars from streamed answer tokens`);
             }
+            else if (finalResult &&
+                conclusionText === sanitizeClaudeConclusionText(accumulatedAnswerBeforeVerification) &&
+                conclusionText !== sanitizeClaudeConclusionText(finalResult)) {
+                console.warn(`[ClaudeRuntime] Session ${sessionId}: SDK result was a short terminal summary ` +
+                    `(${finalResult.length} chars), using streamed report (${conclusionText.length} chars) before verification`);
+            }
             allFindings.push((0, claudeFindingExtractor_1.extractFindingsFromText)(conclusionText));
             let mergedFindings = (0, claudeFindingExtractor_1.mergeFindings)(allFindings);
             if (conclusionText.trim() && ctx.analysisPlan.current) {
@@ -1284,7 +1325,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                             type: 'progress',
                             content: {
                                 phase: 'concluding',
-                                message: (0, outputLanguage_1.localize)(this.config.outputLanguage, `发现 ${errorIssues.length} 个 ERROR 级问题，启动修正重试 (${attempt + 1}/${MAX_CORRECTION_ATTEMPTS})...`, `Found ${errorIssues.length} ERROR-level issue(s). Starting correction retry (${attempt + 1}/${MAX_CORRECTION_ATTEMPTS})...`),
+                                message: (0, outputLanguage_1.localize)(this.config.outputLanguage, `最终报告仍需补齐，正在自动修正 (${attempt + 1}/${MAX_CORRECTION_ATTEMPTS})...`, `The final report still needs completion; applying automatic correction (${attempt + 1}/${MAX_CORRECTION_ATTEMPTS})...`),
                             },
                             timestamp: Date.now(),
                         });
@@ -1378,11 +1419,15 @@ class ClaudeRuntime extends events_1.EventEmitter {
                             if (!correctedResult && !correctionTimedOut) {
                                 correctedResult = correctionAnswerBridge.getAccumulatedAnswer();
                             }
+                            correctedResult = ensureClaudeFinalReportHeading(correctedResult, ctx.sceneType, runtimeConfig.outputLanguage);
                             if (correctionTimedOut) {
                                 console.warn(`[ClaudeRuntime] Correction attempt ${attempt + 1} timed out, using partial result (${correctedResult.length} chars)`);
-                                if (!correctionResultLooksUsable(correctedResult)) {
+                                if (shouldMarkCorrectionTimeoutPartial({ correctedResult, existingConclusion: conclusionText })) {
+                                    correctedResult = '';
+                                    verificationDegradedMessage = (0, outputLanguage_1.localize)(this.config.outputLanguage, '修正重试超时，且当前结论仍不可独立交付；已保留原结论并标记为 partial。', 'Correction retry timed out and the current conclusion is still not independently deliverable; keeping the previous conclusion and marking the result partial.');
+                                }
+                                else if (!correctionResultLooksUsable(correctedResult)) {
                                     correctedResult = '';
-                                    verificationDegradedMessage = (0, outputLanguage_1.localize)(this.config.outputLanguage, 'Claude 修正重试超时，且没有产出可独立交付的修正报告；已保留原结论并标记为 partial。', 'Claude correction retry timed out without a deliverable corrected report; keeping the previous conclusion and marking the result partial.');
                                 }
                             }
                             // P2-G13: Compare correction quality by finding count and coverage, not text length.
@@ -1424,27 +1469,28 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 allFindings.push((0, claudeFindingExtractor_1.extractFindingsFromText)(conclusionText));
                 mergedFindings = (0, claudeFindingExtractor_1.mergeFindings)(allFindings);
             }
+            conclusionText = ensureClaudeFinalReportHeading(conclusionText, ctx.sceneType, runtimeConfig.outputLanguage);
             const isPartialResult = terminationReason === analysisTermination_1.MAX_TURNS_TERMINATION_REASON;
             if (isPartialResult) {
                 terminationMessage || (terminationMessage = (0, analysisTermination_1.buildMaxTurnsTerminationMessage)({
                     mode: 'full',
                     turns: rounds,
-                    maxTurns: this.config.maxTurns,
-                    outputLanguage: this.config.outputLanguage,
+                    maxTurns: runtimeConfig.maxTurns,
+                    outputLanguage: runtimeConfig.outputLanguage,
                 }));
                 conclusionText = conclusionText.trim()
-                    ? (0, analysisTermination_1.prependPartialNotice)(conclusionText, terminationMessage, this.config.outputLanguage)
+                    ? (0, analysisTermination_1.prependPartialNotice)(conclusionText, terminationMessage, runtimeConfig.outputLanguage)
                     : (0, analysisTermination_1.buildMaxTurnsFallbackConclusion)({
                         mode: 'full',
                         turns: rounds,
-                        maxTurns: this.config.maxTurns,
-                        outputLanguage: this.config.outputLanguage,
+                        maxTurns: runtimeConfig.maxTurns,
+                        outputLanguage: runtimeConfig.outputLanguage,
                     });
                 allFindings.push((0, claudeFindingExtractor_1.extractFindingsFromText)(conclusionText));
                 mergedFindings = (0, claudeFindingExtractor_1.mergeFindings)(allFindings);
                 failedApproaches.push({
                     type: 'strategy_failure',
-                    approach: `analysis reached ${this.config.maxTurns} full-mode turns`,
+                    approach: `analysis reached ${runtimeConfig.maxTurns} full-mode turns`,
                     reason: 'SDK returned error_max_turns before a normal success result',
                 });
                 this.emitUpdate({
@@ -1457,7 +1503,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                         partial: true,
                         terminationReason,
                         turns: rounds,
-                        maxTurns: this.config.maxTurns,
+                        maxTurns: runtimeConfig.maxTurns,
                     },
                     timestamp: Date.now(),
                 });
@@ -1469,12 +1515,12 @@ class ClaudeRuntime extends events_1.EventEmitter {
                     ? `${terminationMessage}\n\n${verificationDegradedMessage}`
                     : verificationDegradedMessage;
                 conclusionText = conclusionText.trim()
-                    ? (0, analysisTermination_1.prependPartialNotice)(conclusionText, verificationDegradedMessage, this.config.outputLanguage)
+                    ? (0, analysisTermination_1.prependPartialNotice)(conclusionText, verificationDegradedMessage, runtimeConfig.outputLanguage)
                     : (0, analysisTermination_1.buildMaxTurnsFallbackConclusion)({
                         mode: 'full',
                         turns: rounds,
-                        maxTurns: this.config.maxTurns,
-                        outputLanguage: this.config.outputLanguage,
+                        maxTurns: runtimeConfig.maxTurns,
+                        outputLanguage: runtimeConfig.outputLanguage,
                     });
                 mergedFindings = (0, claudeFindingExtractor_1.mergeFindings)([(0, claudeFindingExtractor_1.extractFindingsFromText)(conclusionText)]);
                 this.emitUpdate({
@@ -1566,7 +1612,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                         sessionId,
                         turnIndex: ctx.previousTurns.length,
                     },
-                    knowledgeScope: knowledgeScopeFromOptions(options),
+                    knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
                 };
                 (0, analysisPatternMemory_1.saveAnalysisPattern)(fullFeatures, insights, sceneType, ctx.architecture?.type, finalAnalysisResult.confidence, patternExtras)
                     .catch(err => console.warn('[ClaudeRuntime] Pattern save failed:', err.message));
@@ -1578,7 +1624,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                     sceneType,
                     architectureType: ctx.architecture?.type,
                     verifierPassed: true,
-                    knowledgeScope: knowledgeScopeFromOptions(options),
+                    knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
                 }).catch(err => console.warn('[ClaudeRuntime] Quick→full promote failed:', err.message));
             }
             // Derive sql_error FailedApproach entries from persistent SQL errors
@@ -1594,7 +1640,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             // P1: Save negative patterns to long-term memory (fire-and-forget)
             if (failedApproaches.length > 0 && fullFeatures.length > 0) {
                 (0, analysisPatternMemory_1.saveNegativePattern)(fullFeatures, failedApproaches, sceneType, ctx.architecture?.type, {
-                    knowledgeScope: knowledgeScopeFromOptions(options),
+                    knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
                 })
                     .catch(err => console.warn('[ClaudeRuntime] Negative pattern save failed:', err.message));
             }
@@ -1602,7 +1648,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
         }
         catch (error) {
             const rawErrorMessage = error.message || 'Unknown error';
-            const errMsg = (0, claudeConfig_1.explainClaudeRuntimeError)(rawErrorMessage, this.config.outputLanguage, (0, claudeConfig_1.getCredentialSourceHint)(options.providerId, providerScopeFromOptions(options)));
+            const errMsg = (0, claudeConfig_1.explainClaudeRuntimeError)(rawErrorMessage, this.config.outputLanguage, (0, claudeConfig_1.getCredentialSourceHint)(options.providerId, (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options)));
             const quotaExceeded = (0, claudeConfig_1.isClaudeQuotaError)(rawErrorMessage);
             console.error('[ClaudeRuntime] Analysis failed:', errMsg);
             // P1-3: Preserve partial findings and generate partial conclusion on mid-stream errors
@@ -1696,13 +1742,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                             packageName: effectivePackageName,
                         });
                         if (arch) {
-                            this.architectureCache.set(traceId, arch);
-                            // LRU eviction: match full path's 50-entry cap
-                            if (this.architectureCache.size > 50) {
-                                const firstKey = this.architectureCache.keys().next().value;
-                                if (firstKey)
-                                    this.architectureCache.delete(firstKey);
-                            }
+                            (0, runtimeCommon_1.setLruCacheEntry)(this.architectureCache, traceId, arch);
                         }
                         return arch;
                     }
@@ -1719,12 +1759,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             const watchdogWarning = { current: null };
             // Quick path defaults to no skill-notes injection per §8 of the
             // self-improving design. Operators can opt-in via the env override.
-            const quickNotesBudget = process.env.SELF_IMPROVE_NOTES_INJECT_ENABLED === '1'
-                ? new skillNotesInjector_1.SkillNotesBudget({
-                    mode: 'quick',
-                    quickOverrideTotal: parseQuickBudgetEnv(),
-                })
-                : undefined;
+            const quickNotesBudget = (0, runtimeCommon_1.createRuntimeSkillNotesBudget)(true);
             const { server: mcpServer, allowedTools } = (0, claudeMcpServer_1.createClaudeMcpServer)({
                 sessionId,
                 traceId,
@@ -1737,7 +1772,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 lightweight: true,
                 skillNotesBudget: quickNotesBudget,
                 outputLanguage: this.config.outputLanguage,
-                knowledgeScope: knowledgeScopeFromOptions(options),
+                knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
                 codeAwareMode: options.codeAwareMode,
                 codebaseIds: options.codebaseIds,
             });
@@ -1749,8 +1784,9 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 selectionContext: options.selectionContext,
                 outputLanguage: this.config.outputLanguage,
             });
-            const providerScope = providerScopeFromOptions(options);
-            const quickConfig = (0, claudeConfig_1.createQuickConfig)((0, claudeConfig_1.resolveRuntimeConfig)(this.config, options.providerId, providerScope));
+            const providerScope = (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options);
+            const sdkEnv = (0, claudeConfig_1.createSdkEnv)(options.providerId, providerScope);
+            const quickConfig = (0, claudeConfig_1.createQuickConfig)((0, claudeConfig_1.resolveRuntimeConfig)(this.config, options.providerId, providerScope), sdkEnv);
             const { handleMessage: bridge, getAccumulatedAnswer } = (0, claudeSseBridge_1.createSseBridge)((update) => {
                 this.emitUpdate(update);
             }, this.config.outputLanguage);
@@ -1762,20 +1798,19 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 },
                 timestamp: Date.now(),
             });
-            const sdkEnv = (0, claudeConfig_1.createSdkEnv)(options.providerId, providerScope);
             // Quick calls intentionally do not resume or persist Claude SDK sessions.
             // The SDK's maxTurns budget is tied to the resumed conversation, while
             // SmartPerfetto's fast mode budget is a per-question latency guard. Keep
             // cross-turn context local and compact so quick cannot exhaust or overwrite
             // the full-mode SDK conversation.
             let quickPrompt = query;
-            const quickConversationContext = buildQuickConversationContext(previousTurns, this.config.outputLanguage);
+            const quickConversationContext = (0, runtimeCommon_1.buildQuickConversationContext)(previousTurns, this.config.outputLanguage);
             if (quickConversationContext) {
                 quickPrompt = `${quickConversationContext}\n\n${quickPrompt}`;
             }
             // Prepend pre-queried trace data so the AI skips basic SQL turns in fast mode.
             if (options.traceContext && options.traceContext.length > 0) {
-                quickPrompt = `${formatTraceContext(options.traceContext, this.config.outputLanguage)}\n\n${quickPrompt}`;
+                quickPrompt = `${(0, runtimeCommon_1.formatTraceContext)(options.traceContext, this.config.outputLanguage)}\n\n${quickPrompt}`;
             }
             const { stream, close: closeSdk } = sdkQueryWithRetry({
                 prompt: quickPrompt,
@@ -1966,14 +2001,14 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 (0, analysisPatternMemory_1.saveQuickPathPattern)(quickFeatures, insights, sceneType, cachedArch?.type, {
                     status: 'provisional',
                     provenance: { sessionId, turnIndex: previousTurns.length },
-                    knowledgeScope: knowledgeScopeFromOptions(options),
+                    knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
                 }).catch(err => console.warn('[ClaudeRuntime] Quick pattern save failed:', err.message));
             }
             return quickResult;
         }
         catch (error) {
             const rawErrorMessage = error.message || 'Unknown error';
-            const errMsg = (0, claudeConfig_1.explainClaudeRuntimeError)(rawErrorMessage, this.config.outputLanguage, (0, claudeConfig_1.getCredentialSourceHint)(options.providerId, providerScopeFromOptions(options)));
+            const errMsg = (0, claudeConfig_1.explainClaudeRuntimeError)(rawErrorMessage, this.config.outputLanguage, (0, claudeConfig_1.getCredentialSourceHint)(options.providerId, (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options)));
             const quotaExceeded = (0, claudeConfig_1.isClaudeQuotaError)(rawErrorMessage);
             console.error('[ClaudeRuntime] Quick analysis failed:', errMsg);
             this.emitUpdate({
@@ -2135,7 +2170,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             this.artifactStores.set(sessionId, artifactStore_1.ArtifactStore.fromSnapshot(snapshot.artifacts));
         }
         if (snapshot.architecture) {
-            this.architectureCache.set(traceId, snapshot.architecture);
+            (0, runtimeCommon_1.setLruCacheEntry)(this.architectureCache, traceId, snapshot.architecture);
         }
         if (snapshot.sdkSessionId && snapshot.sdkSessionMode === 'full') {
             this.sessionMap.set(this.buildSessionMapKey(sessionId, snapshot.referenceTraceId), {
@@ -2147,24 +2182,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
     }
     /** P0-1: Convert agentv3 Hypothesis to agentProtocol Hypothesis format for AnalysisResult. */
     toProtocolHypothesis(h) {
-        const statusMap = {
-            formed: 'proposed',
-            confirmed: 'confirmed',
-            rejected: 'rejected',
-        };
-        const confidenceMap = { formed: 0.5, confirmed: 0.85, rejected: 0.1 };
-        return {
-            id: h.id,
-            description: h.statement,
-            status: statusMap[h.status] || 'proposed',
-            confidence: confidenceMap[h.status] ?? 0.5,
-            supportingEvidence: h.evidence && h.status === 'confirmed' ? [{ id: `${h.id}-ev`, type: 'observation', description: h.evidence, source: 'claude', strength: 0.8 }] : [],
-            contradictingEvidence: h.evidence && h.status === 'rejected' ? [{ id: `${h.id}-ev`, type: 'observation', description: h.evidence, source: 'claude', strength: 0.8 }] : [],
-            proposedBy: 'claude',
-            relevantAgents: ['claude'],
-            createdAt: h.formedAt,
-            updatedAt: h.resolvedAt || h.formedAt,
-        };
+        return (0, runtimeCommon_1.toProtocolHypothesis)(h, 'claude');
     }
     reset() {
         this.architectureCache.clear();
@@ -2187,64 +2205,14 @@ class ClaudeRuntime extends events_1.EventEmitter {
      * Caps at 5 findings to prevent unbounded prompt growth.
      */
     collectPreviousFindings(sessionContext, maxTurns) {
-        try {
-            let turns = sessionContext.getAllTurns?.() || [];
-            if (maxTurns && maxTurns > 0) {
-                turns = turns.slice(-maxTurns);
-            }
-            return turns.flatMap((turn) => turn.findings || []).slice(-5);
-        }
-        catch {
-            return [];
-        }
+        return (0, runtimeCommon_1.collectRecentFindings)(sessionContext, { maxTurns, maxFindings: 5 });
     }
     /**
      * Build a compact entity context string for the system prompt.
      * Gives Claude awareness of known frames/sessions for drill-down resolution.
      */
     buildEntityContext(entityStore) {
-        try {
-            const stats = entityStore.getStats();
-            if (stats.totalEntityCount === 0)
-                return undefined;
-            const lines = [];
-            const frames = entityStore.getAllFrames?.() || [];
-            if (frames.length > 0) {
-                lines.push(`**帧 (${frames.length})**:`);
-                for (const f of frames.slice(0, 15)) {
-                    const parts = [`frame_id=${f.frame_id}`];
-                    if (f.start_ts)
-                        parts.push(`ts=${f.start_ts}`);
-                    if (f.jank_type)
-                        parts.push(`jank=${f.jank_type}`);
-                    if (f.dur_ms)
-                        parts.push(`dur=${f.dur_ms}ms`);
-                    if (f.process_name)
-                        parts.push(`proc=${f.process_name}`);
-                    lines.push(`- ${parts.join(', ')}`);
-                }
-                if (frames.length > 15)
-                    lines.push(`- ...及其他 ${frames.length - 15} 帧`);
-            }
-            const sessions = entityStore.getAllSessions?.() || [];
-            if (sessions.length > 0) {
-                lines.push(`**滑动会话 (${sessions.length})**:`);
-                for (const s of sessions.slice(0, 8)) {
-                    const parts = [`session_id=${s.session_id}`];
-                    if (s.start_ts)
-                        parts.push(`ts=${s.start_ts}`);
-                    if (s.jank_count)
-                        parts.push(`janks=${s.jank_count}`);
-                    if (s.process_name)
-                        parts.push(`proc=${s.process_name}`);
-                    lines.push(`- ${parts.join(', ')}`);
-                }
-            }
-            return lines.length > 0 ? lines.join('\n') : undefined;
-        }
-        catch {
-            return undefined;
-        }
+        return (0, runtimeCommon_1.buildEntityContext)(entityStore);
     }
     /**
      * Prepare all context needed for a Claude analysis run.
@@ -2253,6 +2221,9 @@ class ClaudeRuntime extends events_1.EventEmitter {
      * into a single cohesive preparation phase.
      */
     async prepareAnalysisContext(query, sessionId, traceId, options, precomputed) {
+        const providerScope = (0, runtimeCommon_1.providerScopeFromAnalysisOptions)(options);
+        const runtimeConfig = precomputed?.runtimeConfig
+            ?? (0, claudeConfig_1.resolveRuntimeConfig)(this.config, options.providerId, providerScope);
         // Phase 0: Selection context logging
         if (options.selectionContext) {
             const sc = options.selectionContext;
@@ -2276,7 +2247,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 type: 'progress',
                 content: {
                     phase: 'starting',
-                    message: (0, outputLanguage_1.localize)(this.config.outputLanguage, `检测到焦点应用: ${focusResult.primaryApp} (${focusResult.method})`, `Detected focus app: ${focusResult.primaryApp} (${focusResult.method})`),
+                    message: (0, outputLanguage_1.localize)(runtimeConfig.outputLanguage, `检测到焦点应用: ${focusResult.primaryApp} (${focusResult.method})`, `Detected focus app: ${focusResult.primaryApp} (${focusResult.method})`),
                 },
                 timestamp: Date.now(),
             });
@@ -2287,13 +2258,8 @@ class ClaudeRuntime extends events_1.EventEmitter {
         skillExecutor.registerSkills(skillLoader_1.skillRegistry.getAllSkills());
         skillExecutor.setFragmentRegistry(skillLoader_1.skillRegistry.getFragmentCache());
         // Phase 2: Architecture detection (LRU cached per traceId)
-        let architecture = this.architectureCache.get(traceId);
-        if (architecture) {
-            // LRU touch: delete and re-insert to move to end of Map iteration order
-            this.architectureCache.delete(traceId);
-            this.architectureCache.set(traceId, architecture);
-        }
-        else {
+        let architecture = (0, runtimeCommon_1.getLruCacheEntry)(this.architectureCache, traceId);
+        if (!architecture) {
             try {
                 const detector = (0, architectureDetector_1.createArchitectureDetector)();
                 architecture = await detector.detect({
@@ -2302,13 +2268,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                     packageName: effectivePackageName,
                 });
                 if (architecture) {
-                    this.architectureCache.set(traceId, architecture);
-                    // LRU eviction: remove oldest entry (first key in Map)
-                    if (this.architectureCache.size > 50) {
-                        const firstKey = this.architectureCache.keys().next().value;
-                        if (firstKey)
-                            this.architectureCache.delete(firstKey);
-                    }
+                    (0, runtimeCommon_1.setLruCacheEntry)(this.architectureCache, traceId, architecture);
                 }
                 this.emitUpdate({ type: 'architecture_detected', content: { architecture }, timestamp: Date.now() });
             }
@@ -2317,7 +2277,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             }
         }
         // Phase 2.5: Vendor detection (LRU cached per traceId, reuses SkillAnalysisAdapter.detectVendor)
-        let detectedVendor = this.vendorCache.get(traceId) ?? null;
+        let detectedVendor = (0, runtimeCommon_1.getLruCacheEntry)(this.vendorCache, traceId) ?? null;
         if (!detectedVendor) {
             try {
                 const adapter = (0, skillAnalysisAdapter_1.getSkillAnalysisAdapter)(this.traceProcessorService);
@@ -2325,13 +2285,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 const vendorResult = await adapter.detectVendor(traceId);
                 detectedVendor = vendorResult.vendor;
                 if (detectedVendor && detectedVendor !== 'aosp') {
-                    this.vendorCache.set(traceId, detectedVendor);
-                    // LRU eviction: match architectureCache limit
-                    if (this.vendorCache.size > 50) {
-                        const firstKey = this.vendorCache.keys().next().value;
-                        if (firstKey)
-                            this.vendorCache.delete(firstKey);
-                    }
+                    (0, runtimeCommon_1.setLruCacheEntry)(this.vendorCache, traceId, detectedVendor);
                 }
             }
             catch (err) {
@@ -2347,7 +2301,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 type: 'progress',
                 content: {
                     phase: 'starting',
-                    message: (0, outputLanguage_1.localize)(this.config.outputLanguage, '对比模式：正在检测参考 Trace...', 'Comparison mode: detecting the reference trace...'),
+                    message: (0, outputLanguage_1.localize)(runtimeConfig.outputLanguage, '对比模式：正在检测参考 Trace...', 'Comparison mode: detecting the reference trace...'),
                 },
                 timestamp: Date.now(),
             });
@@ -2356,7 +2310,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             const [refFocusResult, refArchitecture, currentTables, refTables] = await Promise.all([
                 (0, focusAppDetector_1.detectFocusApps)(this.traceProcessorService, referenceTraceId).catch(() => ({ apps: [], method: 'none', primaryApp: undefined })),
                 (async () => {
-                    let refArch = this.architectureCache.get(referenceTraceId);
+                    let refArch = (0, runtimeCommon_1.getLruCacheEntry)(this.architectureCache, referenceTraceId);
                     if (!refArch) {
                         try {
                             const detector = (0, architectureDetector_1.createArchitectureDetector)();
@@ -2366,7 +2320,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
                                 packageName: undefined,
                             }) ?? undefined;
                             if (refArch)
-                                this.architectureCache.set(referenceTraceId, refArch);
+                                (0, runtimeCommon_1.setLruCacheEntry)(this.architectureCache, referenceTraceId, refArch);
                         }
                         catch { /* non-fatal */ }
                     }
@@ -2405,16 +2359,11 @@ class ClaudeRuntime extends events_1.EventEmitter {
                 `capDiff=${capabilityDiff ? `cur=${capabilityDiff.currentOnly.length}/ref=${capabilityDiff.referenceOnly.length}` : 'none'}`);
         }
         // Phase 2.9: Trace data completeness probe (cached per traceId, ~50ms first run)
-        let traceCompleteness = this.completenessCache.get(traceId);
+        let traceCompleteness = (0, runtimeCommon_1.getLruCacheEntry)(this.completenessCache, traceId);
         if (!traceCompleteness) {
             try {
                 traceCompleteness = await (0, traceCompletenessProber_1.probeTraceCompleteness)(this.traceProcessorService, traceId, architecture?.type);
-                this.completenessCache.set(traceId, traceCompleteness);
-                if (this.completenessCache.size > 50) {
-                    const firstKey = this.completenessCache.keys().next().value;
-                    if (firstKey)
-                        this.completenessCache.delete(firstKey);
-                }
+                (0, runtimeCommon_1.setLruCacheEntry)(this.completenessCache, traceId, traceCompleteness);
             }
             catch (err) {
                 console.warn('[ClaudeRuntime] Trace completeness probe failed (non-fatal):', err.message);
@@ -2445,15 +2394,17 @@ class ClaudeRuntime extends events_1.EventEmitter {
         const entityContext = this.buildEntityContext(entityStore);
         // Phase 5: Scene classification + effort resolution (reuse precomputed if available)
         const sceneType = precomputed?.sceneType ?? (0, sceneClassifier_1.classifyScene)(query);
-        const effectiveEffort = (0, claudeConfig_1.resolveEffort)(this.config, sceneType);
+        const effectiveEffort = (0, claudeConfig_1.resolveEffort)(runtimeConfig, sceneType, {
+            configuredEffortOverridesScene: (0, claudeConfig_1.hasConfiguredClaudeEffortOverride)(options.providerId, providerScope),
+        });
         // Phase 5.5: Pattern memory — match similar historical traces (P2-2)
         const traceFeatures = (0, analysisPatternMemory_1.extractTraceFeatures)({
             architectureType: architecture?.type,
             sceneType,
             packageName: effectivePackageName,
         });
-        const patternContext = (0, analysisPatternMemory_1.buildPatternContextSection)(traceFeatures, knowledgeScopeFromOptions(options));
-        const negativePatternContext = (0, analysisPatternMemory_1.buildNegativePatternSection)(traceFeatures, knowledgeScopeFromOptions(options));
+        const patternContext = (0, analysisPatternMemory_1.buildPatternContextSection)(traceFeatures, (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options));
+        const negativePatternContext = (0, analysisPatternMemory_1.buildNegativePatternSection)(traceFeatures, (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options));
         // Phase 6: Session-scoped artifact store + analysis notes
         if (!this.artifactStores.has(sessionId)) {
             this.artifactStores.set(sessionId, new artifactStore_1.ArtifactStore());
@@ -2497,14 +2448,12 @@ class ClaudeRuntime extends events_1.EventEmitter {
         // Seed new sessions with previously learned fix pairs from disk (cross-session learning)
         let sqlErrors = this.sessionSqlErrors.get(sessionId);
         if (!sqlErrors) {
-            sqlErrors = (0, claudeMcpServer_1.loadLearnedSqlFixPairs)(5, knowledgeScopeFromOptions(options));
+            sqlErrors = (0, claudeMcpServer_1.loadLearnedSqlFixPairs)(5, (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options));
             this.sessionSqlErrors.set(sessionId, sqlErrors);
         }
         // Phase 8: MCP server with all session-scoped state
         // P2-G1: Destructure to get both server and auto-derived allowedTools
-        const fullNotesBudget = process.env.SELF_IMPROVE_NOTES_INJECT_ENABLED === '1'
-            ? new skillNotesInjector_1.SkillNotesBudget({ mode: 'full' })
-            : undefined;
+        const fullNotesBudget = (0, runtimeCommon_1.createRuntimeSkillNotesBudget)(false);
         const { server: mcpServer, allowedTools } = (0, claudeMcpServer_1.createClaudeMcpServer)({
             sessionId,
             traceId,
@@ -2530,8 +2479,8 @@ class ClaudeRuntime extends events_1.EventEmitter {
             referenceTraceId,
             comparisonContext,
             skillNotesBudget: fullNotesBudget,
-            outputLanguage: this.config.outputLanguage,
-            knowledgeScope: knowledgeScopeFromOptions(options),
+            outputLanguage: runtimeConfig.outputLanguage,
+            knowledgeScope: (0, runtimeCommon_1.knowledgeScopeFromAnalysisOptions)(options),
             codeAwareMode: options.codeAwareMode,
             codebaseIds: options.codebaseIds,
         });
@@ -2548,12 +2497,12 @@ class ClaudeRuntime extends events_1.EventEmitter {
         }
         // Phase 11: Sub-agent definitions (feature-gated)
         let agents;
-        if (this.config.enableSubAgents && sceneType !== 'anr') {
+        if (runtimeConfig.enableSubAgents && sceneType !== 'anr') {
             agents = (0, claudeAgentDefinitions_1.buildAgentDefinitions)(sceneType, {
                 architecture,
                 packageName: effectivePackageName,
                 allowedTools,
-                subAgentModel: this.config.subAgentModel,
+                subAgentModel: runtimeConfig.subAgentModel,
             });
         }
         // Phase 12: SQL error-fix pairs for prompt injection
@@ -2586,7 +2535,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
             traceCompleteness,
             traceOs: traceInfo?.traceOs,
             traceFormat: traceInfo?.traceFormat,
-            outputLanguage: this.config.outputLanguage,
+            outputLanguage: runtimeConfig.outputLanguage,
             codeAwareMode: options.codeAwareMode,
             codebaseIds: options.codebaseIds,
         };
@@ -2617,23 +2566,7 @@ class ClaudeRuntime extends events_1.EventEmitter {
     }
     /** Capture entities from skill displayResults into EntityStore for multi-turn drill-down. */
     captureEntitiesFromSkillDisplayResults(displayResults, entityStore) {
-        try {
-            const data = {};
-            for (const dr of displayResults) {
-                if (dr.stepId && dr.data) {
-                    data[dr.stepId] = dr.data;
-                }
-            }
-            const captured = (0, entityCapture_1.captureEntitiesFromResponses)([{
-                    agentId: 'claude-agent',
-                    success: true,
-                    toolResults: [{ toolName: 'invoke_skill', data }],
-                }]);
-            (0, entityCapture_1.applyCapturedEntities)(entityStore, captured);
-        }
-        catch (err) {
-            console.warn('[ClaudeRuntime] Entity capture failed:', err.message);
-        }
+        (0, runtimeCommon_1.captureSkillDisplayEntities)(displayResults, entityStore, 'claude-agent');
     }
 }
 exports.ClaudeRuntime = ClaudeRuntime;