@gracker/smartperfetto 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gracker/smartperfetto",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "SmartPerfetto CLI and backend runtime",
   "main": "dist/index.js",
   "bin": {
@@ -55,7 +55,7 @@
     "prepack": "npm run build",
     "typecheck": "tsc --noEmit",
     "test": "jest",
-    "test:core": "jest --runInBand --forceExit src/agent/communication/__tests__/agentMessageBus.test.ts src/agent/core/executors/__tests__/strategyExecutor.test.ts src/agent/core/executors/__tests__/hypothesisExecutor.test.ts src/agent/core/__tests__/modelRouter.test.ts src/agent/context/__tests__/enhancedSessionContext.test.ts src/tests/adbTools.test.ts src/services/__tests__/sessionLogger.test.ts src/agent/__tests__/llmAdapter.test.ts src/agent/agents/domain/__tests__/registry.test.ts src/agentv3/__tests__/sqlIncludeInjector.test.ts src/agentv3/__tests__/analysisPatternMemory.test.ts src/agentv3/__tests__/claudeRuntimeRuntimeSnapshots.test.ts src/agentv3/__tests__/claudeSseBridge.test.ts src/agentOpenAI/__tests__/openAiRuntime.test.ts src/agentRuntime/__tests__/runtimeSelection.test.ts src/middleware/__tests__/auth.test.ts src/assistant/application/__tests__/assistantApplicationService.test.ts src/assistant/application/__tests__/agentAnalyzeSessionService.test.ts src/services/__tests__/finalResultQualityGate.test.ts src/services/__tests__/persistAgentSession.test.ts src/services/__tests__/htmlReportGenerator.test.ts src/services/__tests__/analysisResultSnapshotPipeline.test.ts src/services/__tests__/rbac.test.ts src/routes/__tests__/agentRoutesRbac.test.ts src/routes/__tests__/ownerGuardRoutes.test.ts src/routes/__tests__/memoryRoutes.test.ts src/cli-user/services/__tests__/cliAnalyzeService.test.ts src/cli-user/services/__tests__/cliAnalyzeService.runTurn.test.ts src/middleware/__tests__/legacyApiCompatibility.test.ts src/services/__tests__/enterpriseDb.test.ts src/services/__tests__/enterpriseSchema.test.ts src/services/__tests__/enterpriseRepository.test.ts src/services/__tests__/processRss.test.ts src/services/__tests__/workingTraceProcessor.enterpriseIsolation.test.ts src/services/__tests__/traceProcessorLeaseStore.test.ts src/services/__tests__/traceProcessorLeaseModeDecision.test.ts src/services/__tests__/traceProcessorLeaseProcessorRouting.test.ts src/services/__tests__/traceProcessorSqlWorker.test.ts src/services/__tests__/traceProcessorRamBudget.test.ts src/scripts/__tests__/benchmarkTraceProcessorRss.test.ts src/scripts/__tests__/auditTraceProcessorRssMatrix.test.ts src/scripts/__tests__/enterpriseReadinessAudit.test.ts src/scripts/__tests__/enterpriseAcceptanceLoadTest.test.ts src/scripts/__tests__/enterpriseRuntimeIsolationChecklist.test.ts src/scripts/__tests__/enterpriseSecurityAuditChecklist.test.ts src/services/__tests__/analysisRunStore.test.ts src/services/__tests__/agentEventStore.test.ts src/services/__tests__/enterpriseKnowledgeScope.test.ts src/services/__tests__/enterpriseMigration.test.ts src/services/__tests__/runtimeSnapshotStore.test.ts src/services/providerManager/__tests__/localSecretStore.test.ts src/services/providerManager/__tests__/enterpriseProviderStore.test.ts src/services/providerManager/__tests__/providerSnapshot.test.ts src/routes/__tests__/enterpriseTraceMetadataRoutes.test.ts src/routes/__tests__/enterpriseTenantRoutes.test.ts src/routes/__tests__/traceProcessorProxyRoutes.test.ts src/routes/__tests__/enterpriseReportRoutes.test.ts src/routes/__tests__/enterpriseRuntimeDashboardRoutes.test.ts src/routes/__tests__/enterpriseRestartPersistence.test.ts",
+    "test:core": "jest --runInBand --forceExit src/agent/communication/__tests__/agentMessageBus.test.ts src/agent/core/executors/__tests__/strategyExecutor.test.ts src/agent/core/executors/__tests__/hypothesisExecutor.test.ts src/agent/core/__tests__/modelRouter.test.ts src/agent/context/__tests__/enhancedSessionContext.test.ts src/tests/adbTools.test.ts src/services/__tests__/sessionLogger.test.ts src/agent/__tests__/llmAdapter.test.ts src/agent/agents/domain/__tests__/registry.test.ts src/agentv3/__tests__/sqlIncludeInjector.test.ts src/agentv3/__tests__/analysisPatternMemory.test.ts src/agentv3/__tests__/claudeRuntimeRuntimeSnapshots.test.ts src/agentv3/__tests__/claudeSseBridge.test.ts src/agentOpenAI/__tests__/openAiRuntime.test.ts src/agentRuntime/__tests__/runtimeSelection.test.ts src/middleware/__tests__/auth.test.ts src/assistant/application/__tests__/assistantApplicationService.test.ts src/assistant/application/__tests__/agentAnalyzeSessionService.test.ts src/services/__tests__/finalResultQualityGate.test.ts src/services/__tests__/persistAgentSession.test.ts src/services/__tests__/htmlReportGenerator.test.ts src/services/__tests__/analysisResultSnapshotPipeline.test.ts src/services/__tests__/rbac.test.ts src/routes/__tests__/agentRoutesRbac.test.ts src/routes/__tests__/ownerGuardRoutes.test.ts src/routes/__tests__/memoryRoutes.test.ts src/cli-user/services/__tests__/cliAnalyzeService.test.ts src/cli-user/services/__tests__/cliAnalyzeService.runTurn.test.ts src/cli-user/services/__tests__/captureConfig.test.ts src/cli-user/services/__tests__/captureTools.test.ts src/cli-user/services/__tests__/androidCapture.test.ts src/middleware/__tests__/legacyApiCompatibility.test.ts src/services/__tests__/enterpriseDb.test.ts src/services/__tests__/enterpriseSchema.test.ts src/services/__tests__/enterpriseRepository.test.ts src/services/__tests__/processRss.test.ts src/services/__tests__/workingTraceProcessor.enterpriseIsolation.test.ts src/services/__tests__/traceProcessorLeaseStore.test.ts src/services/__tests__/traceProcessorLeaseModeDecision.test.ts src/services/__tests__/traceProcessorLeaseProcessorRouting.test.ts src/services/__tests__/traceProcessorSqlWorker.test.ts src/services/__tests__/traceProcessorRamBudget.test.ts src/scripts/__tests__/benchmarkTraceProcessorRss.test.ts src/scripts/__tests__/auditTraceProcessorRssMatrix.test.ts src/scripts/__tests__/enterpriseReadinessAudit.test.ts src/scripts/__tests__/enterpriseAcceptanceLoadTest.test.ts src/scripts/__tests__/enterpriseRuntimeIsolationChecklist.test.ts src/scripts/__tests__/enterpriseSecurityAuditChecklist.test.ts src/services/__tests__/analysisRunStore.test.ts src/services/__tests__/agentEventStore.test.ts src/services/__tests__/enterpriseKnowledgeScope.test.ts src/services/__tests__/enterpriseMigration.test.ts src/services/__tests__/runtimeSnapshotStore.test.ts src/services/providerManager/__tests__/localSecretStore.test.ts src/services/providerManager/__tests__/enterpriseProviderStore.test.ts src/services/providerManager/__tests__/providerSnapshot.test.ts src/routes/__tests__/enterpriseTraceMetadataRoutes.test.ts src/routes/__tests__/enterpriseTenantRoutes.test.ts src/routes/__tests__/traceProcessorProxyRoutes.test.ts src/routes/__tests__/enterpriseReportRoutes.test.ts src/routes/__tests__/enterpriseRuntimeDashboardRoutes.test.ts src/routes/__tests__/enterpriseRestartPersistence.test.ts",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
     "test:unit": "jest --testPathPatterns=src/tests",
@@ -86,7 +86,7 @@
     "test:scrolling": "tsx src/scripts/runScrollingTest.ts",
     "test:scrolling:real": "tsx src/scripts/runScrollingTestRealData.ts",
     "verify:agent-sse-scrolling": "tsx src/scripts/verifyAgentSseScrolling.ts",
-    "verify:e2e:openai-startup": "SMARTPERFETTO_AGENT_RUNTIME=openai-agents-sdk tsx src/scripts/verifyAgentSseScrolling.ts --mode full --trace ../test-traces/lacunh_heavy.pftrace --query \"分析启动性能\" --output test-output/e2e-openai-startup-real.json --keep-session --require-conclusion-evidence --require-claim-verifier-ok --require-non-partial --require-final-report-heading --forbid-process-narration --forbid-degraded-fallback completed_plan_summary_fallback --max-analysis-completed-conclusion-chars 6500 --require-text \"冷启动\" --require-text \"ChaosTask\" --forbid-text \"完成综合结论输出\" --forbid-text \"分阶段证据摘要\" --forbid-text \"完整结构化报告已生成\" --forbid-text \"应维持温启动\" --forbid-text \"bindApplication 不存在\"",
+    "verify:e2e:openai-startup": "SMARTPERFETTO_AGENT_RUNTIME=openai-agents-sdk tsx src/scripts/verifyAgentSseScrolling.ts --mode full --trace ../test-traces/lacunh_heavy.pftrace --query \"分析启动性能\" --output test-output/e2e-openai-startup-real.json --keep-session --require-conclusion-evidence --require-claim-verifier-ok --require-non-partial --require-final-report-heading --forbid-process-narration --forbid-degraded-fallback completed_plan_summary_fallback --require-text \"冷启动\" --require-text \"ChaosTask\" --forbid-text \"完成综合结论输出\" --forbid-text \"分阶段证据摘要\" --forbid-text \"完整结构化报告已生成\" --forbid-text \"应维持温启动\" --forbid-text \"bindApplication 不存在\"",
     "generate:frontend-types": "tsx scripts/generateFrontendTypes.ts",
     "check:types": "tsx scripts/checkTypesSync.ts",
     "types": "npm run generate:frontend-types"

package/prebuilts/android-platform-tools/README.md

@@ -0,0 +1,13 @@
+# Android Platform-Tools Slot
+
+This directory is reserved for approved bundled ADB binaries used by
+`smp capture android`.
+
+Resolution order is:
+
+1. `ADB_PATH`
+2. `prebuilts/android-platform-tools/<platform>/adb[.exe]`
+3. `adb` on `PATH`
+
+Do not copy Google SDK Platform-Tools binaries here unless the release process
+has explicitly approved the license and redistribution path.

package/prebuilts/perfetto-recording-tools/README.md

@@ -0,0 +1,17 @@
+# Perfetto Recording Tool Slot
+
+This directory is reserved for approved `tracebox` prebuilts used by
+`smp capture android --sideload` and Android devices older than API 29.
+
+Expected layout:
+
+```text
+prebuilts/perfetto-recording-tools/android-arm64/tracebox
+prebuilts/perfetto-recording-tools/android-arm/tracebox
+prebuilts/perfetto-recording-tools/android-x64/tracebox
+prebuilts/perfetto-recording-tools/android-x86/tracebox
+```
+
+The pin source is `scripts/perfetto-recording-tools-pin.env`. SmartPerfetto
+does not download these binaries at capture time; use `--tracebox` to point at
+a local binary until approved artifacts are packaged.

package/skills/atomic/cpu_topology_detection.skill.yaml

@@ -5,204 +5,167 @@
 # =============================================================================
 # CPU 拓扑动态检测 (CPU Topology Detection)
 # =============================================================================
-# 从 cpufreq 最大值动态推断 CPU 集群类型
+# Public compatibility wrapper around cpu_topology_view.
 #
-# 背景：
-# - 现代 SoC 使用异构多核设计 (big.LITTLE, DynamIQ)
-# - 不同芯片的 CPU 拓扑差异很大：
-#   - Snapdragon 8 Gen 3: 2 小核 + 3 中核 + 1 Prime + 2 超大核
-#   - Dimensity 9300: 4 大核 + 4 超大核 (全大核设计)
-#   - Tensor G3: 4 小核 + 3 中核 + 1 大核
-#
-# 检测方法：
-# - 通过每个 CPU 核心的最大频率推断其类型
-# - 最高频率的 90%+ 归为 prime/big
-# - 60%-90% 归为 mid
-# - 60% 以下归为 little
+# Keep CPU topology inference centralized in `_cpu_topology`; do not maintain
+# another threshold-based classifier here. The shared view:
+# - builds the CPU universe from observed trace evidence first;
+# - ignores stale CPU table rows unless no observed CPU evidence exists;
+# - classifies common Android layouts such as 6+2, 4+3+1, 4+4, 4+2, 4-only,
+#   and 10-core tri-cluster layouts from capacity/frequency scale clusters;
+# - keeps unsupported/insufficient scale evidence explicit as `unknown`.
 # =============================================================================
 
 name: cpu_topology_detection
 version: "1.0"
-type: atomic
+type: composite
 category: hardware
 tier: B
 
 meta:
   display_name: "CPU 拓扑检测"
-  description: "从 cpufreq 动态检测 CPU 大小核拓扑"
+  description: "基于共享 _cpu_topology 视图检测 CPU 大小核拓扑"
   icon: "memory"
   tags: [cpu, topology, cluster, atomic]
 
-prerequisites:
-  required_tables:
-    - counter
-    - cpu_counter_track
-
 inputs:
   - name: start_ts
     type: timestamp
     required: false
-    description: "分析起始时间（可选）"
+    description: "分析起始时间（保留兼容；共享拓扑检测使用整条 trace 的观测证据）"
   - name: end_ts
     type: timestamp
     required: false
-    description: "分析结束时间（可选）"
+    description: "分析结束时间（保留兼容；共享拓扑检测使用整条 trace 的观测证据）"
 
 steps:
-  # Step 1: 检测每个 CPU 的最大频率
+  - id: init_cpu_topology
+    type: skill
+    name: "初始化 CPU 拓扑"
+    skill: cpu_topology_view
+    display:
+      level: hidden
+    optional: true
+
   - id: detect_cpu_clusters
     type: atomic
     name: "检测 CPU 集群"
     display:
       level: summary
+      layer: overview
       title: "CPU 拓扑检测结果"
+      columns:
+        - name: cpu
+          label: "CPU"
+          type: number
+        - name: cluster_type
+          label: "核心类型"
+          type: string
+        - name: max_freq_mhz
+          label: "Max Freq"
+          type: number
+        - name: capacity
+          label: "Capacity"
+          type: number
+        - name: topology_source
+          label: "判定来源"
+          type: string
+        - name: cluster_rank
+          label: "簇档位"
+          type: number
+        - name: cluster_count
+          label: "簇数量"
+          type: number
     sql: |
-      WITH
-      -- 获取时间范围
-      time_bounds AS (
-        SELECT
-          COALESCE(${start_ts}, (SELECT MIN(ts) FROM counter)) as start_ts,
-          COALESCE(${end_ts}, (SELECT MAX(ts) FROM counter)) as end_ts
-      ),
-      -- 获取每个 CPU 的最大频率
-      cpu_max_freq AS (
-        SELECT 
-          t.cpu,
-          MAX(c.value) as max_freq_khz,
-          MIN(c.value) as min_freq_khz,
-          AVG(c.value) as avg_freq_khz,
-          COUNT(*) as sample_count
-        FROM counter c
-        JOIN cpu_counter_track t ON c.track_id = t.id
-        WHERE t.name = 'cpufreq'
-          AND c.ts >= (SELECT start_ts FROM time_bounds)
-          AND c.ts <= (SELECT end_ts FROM time_bounds)
-        GROUP BY t.cpu
-      ),
-      -- 获取全局最大频率用于计算比例
-      global_max AS (
-        SELECT MAX(max_freq_khz) as global_max_freq FROM cpu_max_freq
-      ),
-      -- 根据最大频率比例推断集群类型
-      cpu_clusters AS (
-        SELECT 
-          cpu,
-          max_freq_khz,
-          min_freq_khz,
-          ROUND(max_freq_khz / 1000.0, 0) as max_freq_mhz,
-          ROUND(100.0 * max_freq_khz / (SELECT global_max_freq FROM global_max), 1) as freq_ratio_pct,
-          CASE
-            -- 最高频率的 90%+ 归为 prime (超大核)
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.95 THEN 'prime'
-            -- 75%-95% 归为 big (大核)
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.75 THEN 'big'
-            -- 50%-75% 归为 mid (中核)
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.50 THEN 'mid'
-            -- 50% 以下归为 little (小核)
-            ELSE 'little'
-          END as cluster_type,
-          sample_count
-        FROM cpu_max_freq
-      )
       SELECT
-        cpu,
-        cluster_type,
-        max_freq_mhz,
-        freq_ratio_pct,
-        CASE cluster_type
+        cpu_id as cpu,
+        core_type as cluster_type,
+        CASE WHEN max_freq IS NULL THEN NULL ELSE ROUND(max_freq / 1000.0, 0) END as max_freq_mhz,
+        capacity,
+        topology_source,
+        cluster_rank,
+        cluster_count,
+        CASE core_type
           WHEN 'prime' THEN '超大核'
           WHEN 'big' THEN '大核'
-          WHEN 'mid' THEN '中核'
-          ELSE '小核'
+          WHEN 'medium' THEN '中核'
+          WHEN 'little' THEN '小核'
+          ELSE '未知'
         END as cluster_type_cn
-      FROM cpu_clusters
-      ORDER BY max_freq_khz DESC, cpu
+      FROM _cpu_topology
+      ORDER BY
+        CASE core_type
+          WHEN 'prime' THEN 1
+          WHEN 'big' THEN 2
+          WHEN 'medium' THEN 3
+          WHEN 'little' THEN 4
+          ELSE 5
+        END,
+        cpu_id
     save_as: cpu_clusters
 
-  # Step 2: 集群汇总
   - id: cluster_summary
     type: atomic
     name: "集群汇总"
     display:
       level: summary
+      layer: overview
       title: "CPU 集群汇总"
+      columns:
+        - name: cluster_type
+          label: "核心类型"
+          type: string
+        - name: cpu_count
+          label: "CPU 数"
+          type: number
+        - name: cpus
+          label: "CPU 列表"
+          type: string
+        - name: max_freq_mhz
+          label: "最高频率"
+          type: number
+        - name: min_freq_mhz
+          label: "最低频率"
+          type: number
+        - name: topology_source
+          label: "判定来源"
+          type: string
     sql: |
-      WITH
-      cpu_max_freq AS (
-        SELECT 
-          t.cpu,
-          MAX(c.value) as max_freq_khz
-        FROM counter c
-        JOIN cpu_counter_track t ON c.track_id = t.id
-        WHERE t.name = 'cpufreq'
-        GROUP BY t.cpu
-      ),
-      global_max AS (
-        SELECT MAX(max_freq_khz) as global_max_freq FROM cpu_max_freq
-      ),
-      cpu_clusters AS (
-        SELECT 
-          cpu,
-          max_freq_khz,
-          CASE
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.95 THEN 'prime'
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.75 THEN 'big'
-            WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.50 THEN 'mid'
-            ELSE 'little'
-          END as cluster_type
-        FROM cpu_max_freq
-      )
       SELECT
-        cluster_type,
+        core_type as cluster_type,
         COUNT(*) as cpu_count,
-        GROUP_CONCAT(cpu, ', ') as cpus,
-        ROUND(MAX(max_freq_khz) / 1000.0, 0) as max_freq_mhz,
-        ROUND(MIN(max_freq_khz) / 1000.0, 0) as min_freq_mhz,
-        CASE cluster_type
+        GROUP_CONCAT(cpu_id, ', ') as cpus,
+        CASE WHEN MAX(max_freq) IS NULL THEN NULL ELSE ROUND(MAX(max_freq) / 1000.0, 0) END as max_freq_mhz,
+        CASE WHEN MIN(max_freq) IS NULL THEN NULL ELSE ROUND(MIN(max_freq) / 1000.0, 0) END as min_freq_mhz,
+        GROUP_CONCAT(DISTINCT topology_source) as topology_source,
+        CASE core_type
           WHEN 'prime' THEN 1
           WHEN 'big' THEN 2
-          WHEN 'mid' THEN 3
-          ELSE 4
+          WHEN 'medium' THEN 3
+          WHEN 'little' THEN 4
+          ELSE 5
         END as cluster_order
-      FROM cpu_clusters
-      GROUP BY cluster_type
+      FROM _cpu_topology
+      GROUP BY core_type
       ORDER BY cluster_order
     save_as: cluster_summary
 
-  # Step 3: 导出供其他 skill 使用的集群映射
   - id: cluster_mapping
     type: atomic
     name: "集群映射"
     sql: |
-      WITH
-      cpu_max_freq AS (
-        SELECT 
-          t.cpu,
-          MAX(c.value) as max_freq_khz
-        FROM counter c
-        JOIN cpu_counter_track t ON c.track_id = t.id
-        WHERE t.name = 'cpufreq'
-        GROUP BY t.cpu
-      ),
-      global_max AS (
-        SELECT MAX(max_freq_khz) as global_max_freq FROM cpu_max_freq
-      )
       SELECT
-        cpu,
-        max_freq_khz,
+        cpu_id as cpu,
+        max_freq as max_freq_khz,
+        core_type as cluster_type,
         CASE
-          WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.95 THEN 'prime'
-          WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.75 THEN 'big'
-          WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.50 THEN 'mid'
-          ELSE 'little'
-        END as cluster_type,
-        -- 简化的 big/little 分类 (兼容旧逻辑)
-        CASE
-          WHEN max_freq_khz >= (SELECT global_max_freq FROM global_max) * 0.60 THEN 'big'
-          ELSE 'little'
-        END as simple_cluster_type
-      FROM cpu_max_freq
-      ORDER BY cpu
+          WHEN core_type IN ('prime', 'big', 'medium') THEN 'big'
+          WHEN core_type = 'little' THEN 'little'
+          ELSE 'unknown'
+        END as simple_cluster_type,
+        topology_source
+      FROM _cpu_topology
+      ORDER BY cpu_id
     save_as: cluster_mapping
 
 output:
@@ -214,20 +177,3 @@ output:
       description: "集群汇总（每种类型的核心数）"
     - name: cluster_mapping
       description: "集群映射表（供其他 skill 使用）"
-
-# =============================================================================
-# 使用示例
-# =============================================================================
-# 其他 skill 可以通过以下 CTE 使用动态检测的集群：
-#
-# WITH cpu_clusters AS (
-#   -- 复制 cluster_mapping 的 SQL
-# )
-# SELECT
-#   CASE 
-#     WHEN cpu IN (SELECT cpu FROM cpu_clusters WHERE cluster_type = 'prime') THEN 'prime'
-#     WHEN cpu IN (SELECT cpu FROM cpu_clusters WHERE cluster_type = 'big') THEN 'big'
-#     WHEN cpu IN (SELECT cpu FROM cpu_clusters WHERE cluster_type = 'mid') THEN 'mid'
-#     ELSE 'little'
-#   END as core_type
-# FROM ...

package/skills/atomic/cpu_topology_view.skill.yaml

@@ -194,6 +194,7 @@ steps:
         cs.scale_bucket,
         CASE
           WHEN cs.scale_bucket IS NULL OR cs.scale_bucket <= 0 THEN 'unknown'
+          WHEN sc.cluster_count <= 1 AND (SELECT COUNT(*) FROM cpu_scale) <= 4 THEN 'little'
           WHEN sc.cluster_count <= 1 THEN 'unknown'
           WHEN sc.cluster_count = 2 AND sc.cluster_rank = sc.cluster_count THEN 'big'
           WHEN sc.cluster_rank = 1 THEN 'little'
@@ -205,6 +206,7 @@ steps:
         END as core_type,
         CASE
           WHEN cs.scale_bucket IS NULL OR cs.scale_bucket <= 0 THEN cs.topology_source
+          WHEN sc.cluster_count <= 1 AND (SELECT COUNT(*) FROM cpu_scale) <= 4 THEN cs.topology_source || '_uniform_four_little'
           WHEN sc.cluster_count <= 1 THEN cs.topology_source || '_uniform'
           ELSE cs.topology_source
         END as topology_source,

package/strategies/prompt-openai-final-report-continuation-en.template.md

@@ -8,7 +8,9 @@ Now output only the final report body. The first line must be `## Final Conclusi
 The report must include: final conclusion, key evidence chain, root-cause breakdown, ruled-out factors, recommendations, and confidence/limitations.
 
 Continue to obey the scene strategy, Final Report Contract, and latest next_phase_reminder constraints from this run. If the scene strategy or contract requires root-cause distributions, representative samples, phase-duration breakdowns, dual-audience recommendations, architecture branch judgments, or any other scene-specific structure, keep that structure in the final report instead of compressing it into a short summary.
+When the Final Report Contract names required items, prefer explicit matching sections or labels, for example "Phase Duration Breakdown", "[App Layer]", and "[System/Platform Layer]", instead of only implying those items inside prose.
+Output all structures required by the Final Report Contract before long trees, appendices, or expanded details. Do not place required recommendations, audience/layered recommendations, or limitations after a long code block or long tree where a truncated report could lose key conclusions.
 
 Do not merely restate phase summaries; synthesize the collected concrete values and evidence into a readable conclusion.
 
-Length target: about 1,200-1,800 English words. Use compact aggregation tables where helpful; do not expand into a phase-by-phase log, do not copy raw artifact tables, do not output the data-source/evidence-table index because the system will generate it, and do not repeat raw SQL. When evidence is abundant, prioritize the key evidence chain, structures required by the scene contract, and the highest-priority root causes.
+Prioritize completeness. Use compact aggregation tables where helpful; do not expand into a phase-by-phase log, do not copy raw artifact tables, do not output the data-source/evidence-table index because the system will generate it, and do not repeat raw SQL. When evidence is abundant, prioritize the key evidence chain, structures required by the scene contract, and the highest-priority root causes; do not omit key conclusions or evidence just to shorten the report.

package/strategies/prompt-openai-final-report-continuation-zh.template.md

@@ -8,7 +8,9 @@
 报告必须包含：综合结论、关键证据链、根因拆解、已排除因素、优化建议、置信度/限制。
 
 必须继续遵守本轮场景策略、Final Report Contract 和最后一个 next_phase_reminder 的输出约束。若场景策略或契约要求根因分布、代表样本、阶段耗时拆分、双受众建议、架构分支判断或其他专属结构，最终报告必须保留这些结构，不能降级为短摘要。
+如果 Final Report Contract 给出了必检项名称，优先用同名小节或清晰标签呈现，例如“阶段耗时分解”、“[App层]”、“[系统/平台层]”，避免只把契约内容隐含在叙述里。
+先输出 Final Report Contract 要求的必需结构，再输出长树状图、附录或扩展说明；不要把必需的优化建议、分层建议、限制说明放在长代码块或长树之后，以免报告中途截断时缺失关键结论。
 
 不要只复述阶段摘要；必须把已采集到的具体数值和证据串成可读结论。
 
-长度目标：约 2500-3500 个中文字符。可以用小型聚合表压缩信息；不要展开逐阶段流水账，不要复制 artifact 原表，不要重复 SQL 原文，不要输出“数据来源索引/证据表索引”（系统会自动生成）。若证据很多，优先保留关键证据链、场景契约要求的结构和最高优先级根因。
+完整性优先。可以用小型聚合表压缩信息；不要展开逐阶段流水账，不要复制 artifact 原表，不要重复 SQL 原文，不要输出“数据来源索引/证据表索引”（系统会自动生成）。若证据很多，优先保留关键证据链、场景契约要求的结构和最高优先级根因，不要为了压缩长度裁剪关键结论或证据。

package/strategies/prompt-output-format.template.md

@@ -84,7 +84,7 @@ graph LR
 ```
 
 ### 结论结构
-结论必须完整但克制：优先输出能支撑决策的证据链，避免把已经展示过的大表逐行搬进最终报告。中文目标长度控制在约 2500-3500 字符，英文目标长度控制在约 1200-1800 words；如果证据很多，用聚合表和证据索引压缩，不要生成会在 token 上限处截断的超长报告。
+结论必须完整但克制：优先输出能支撑决策的证据链，避免把已经展示过的大表逐行搬进最终报告。如果证据很多，用聚合表和证据索引压缩，降低重复信息密度；不要为了压缩长度裁剪关键结论或证据，也不要生成会在 token 上限处截断的超长报告。
 
 1. **概览**: 一句话总结性能状况。如果架构检测置信度 < 80%，在概览中标注（如"⚠️ 架构检测置信度 50%，分析策略可能不完全匹配"），帮助用户理解分析的局限性
 2. **关键发现**: 按严重程度排列的发现列表（含根因推理链 + 📚 背景知识）

package/strategies/startup.strategy.md

@@ -50,7 +50,7 @@ final_report_contract:
       label: 阶段耗时分解
       description: '包含 startup_detail / phase breakdown 口径，并优先使用 self_ms 解释阶段贡献。'
       pattern_groups:
-        - ['阶段耗时', '阶段分解', 'phase\s+breakdown', 'startup_detail']
+        - ['阶段耗时', '阶段分解', 'phase\s+breakdown', 'startup_detail', '根因分析树', 'Phase\s*\d+']
         - ['self_ms', 'dur_ms', '耗时', '\d+(?:\.\d+)?\s*ms']
     - id: root_cause_references
       label: 根因编号引用
@@ -61,8 +61,8 @@ final_report_contract:
       label: App/系统分层建议
       description: '优化建议必须区分 App 层和系统/平台/ROM 层。'
       pattern_groups:
-        - ['App层', '应用层', 'App\s+layer']
-        - ['系统/平台层', '系统层', '平台层', 'ROM层', 'System/Platform', 'platform\s+layer']
+        - ['App\s*层', '应用\s*层', 'App\s+layer']
+        - ['系统\s*/\s*平台\s*层', '系统\s*层', '平台\s*层', 'ROM\s*层', 'System/Platform', 'platform\s+layer']
 
 phase_hints:
   - id: detail_breakdown
@@ -644,7 +644,7 @@ TTID 和 TTFD 是两个不同的指标，必须区分：
    - **数据不足时**：标注"数据不足，无法归类"而非强行贴标签
    - **纯排除项**：编号可选（如"Binder 阻塞(B6) < 10ms ✓"）
 
-3. **根因分析树**：层级式展示启动耗时分解，**必须体现嵌套关系、使用 self_ms、标注根因编号**
+3. **根因分析树**：层级式展示启动耗时分解，**必须体现嵌套关系、使用 self_ms、标注根因编号**。树可以保持紧凑；不要让长树状图挤掉后面的 App/系统分层建议。
    ```
    启动总耗时 XXms
    ├── [Phase 1] bindApplication = XXms wall