oh-my-knowledge 0.42.0 → 0.44.0

package/dist/renderer/skill-list-renderer.js

@@ -134,13 +134,8 @@ function renderPanel(a, lang) {
 // renderSkillModal 已移除:首页点行直接进 skill 详情页(doctor/eval/observe 已在该页合一),弹框预览冗余。
 function renderRow(entry, insights, langQ, lang) {
     const h = assessHealth(entry, insights, lang);
-    // 点行直接进该 skill 最新 eval 报告(无 eval 则最新 doctor);跨维度/历史在报告页内切换。
-    const amp = lang === DEFAULT_LANG ? '' : `&lang=${lang}`;
-    const href = entry.eval
-        ? `/reports/${encodeURIComponent(entry.eval.reportId)}${langQ}`
-        : entry.doctor
-            ? `/doctors/${encodeURIComponent(entry.doctor.reportId)}?skill=${encodeURIComponent(entry.skillName)}${amp}`
-            : `/runs${langQ}`;
+    // 点行先进入 skill hub：Skill Map / 三阶段状态 / Evidence Card 是用户第一视角。
+    const href = `/skills/${encodeURIComponent(entry.skillName)}${langQ}`;
     const dT = entry.doctor ? entry.doctor.passCount + entry.doctor.warnCount + entry.doctor.failCount : 0;
     const dP = dT > 0 ? Math.round(((entry.doctor.passCount + entry.doctor.warnCount * 0.5) / dT) * 100) : null;
     const eP = entry.eval?.compositeScore != null ? Math.round((entry.eval.compositeScore / 5) * 100) : null;

package/dist/server/report-server.js

@@ -6,14 +6,17 @@ import { renderReportDocumentDetail, renderTrendsPage, renderRunList } from '../
 import { renderSkillList } from '../renderer/skill-list-renderer.js';
 import { renderSkillHealthReport } from '../renderer/skill-health-renderer.js';
 import { renderDoctorDetail } from '../renderer/doctor-detail-renderer.js';
-import { assessHealth } from '../renderer/skill-detail-renderer.js';
+import { assessHealth, renderSkillDetail } from '../renderer/skill-detail-renderer.js';
 import { renderObservationInboxPage } from '../renderer/observation-inbox-renderer.js';
 import { DEFAULT_LANG, t, layout } from '../renderer/layout.js';
 import { loadAllManagedRecords, resolveManagedDir, managedDir as projectManagedDir, listManagedRows, buildVersionScores } from '../managed/index.js';
 import { renderManagedList, renderManagedHistory } from '../renderer/managed-history-renderer.js';
 import { DEFAULT_JOBS_DIR } from '../eval-core/default-dirs.js';
 import { resolveObserveHealthDir, projectObserveHealthDir, resolveDoctorsDir, projectDoctorsDir, projectReportsDir, globalReportsDir } from '../eval-core/measurement-dirs.js';
+import { evalGraphDirForReportOutput } from '../artifact-graph/eval.js';
 import { listObserveCards, listDoctorCards, listLiveObserveCards } from '../eval-core/artifact-index.js';
+import { isReportFileName, reportFilePath, reportFileStem } from '../eval-core/artifact-file-names.js';
+import { migrateLegacyReportFiles } from '../eval-core/report-file-migration.js';
 import { buildSkillIndex } from './skill-index.js';
 import { createFileJobStore } from './job-store.js';
 import { createFileStore, queryJob, queryJobList, queryRun, queryRunList, queryTrend } from './report-store.js';
@@ -46,18 +49,20 @@ function loadChartJsBundle() {
 }
 function listAnalyses(dir, includeCards = false) {
     const items = [];
+    migrateLegacyReportFiles(dir, 'observe-health');
     // live 扫描 dir 存在才做;dir 不存在(默认机器级模式下当前项目还没 .omk/observe-health、全局也空)时 live 为空,
     // 但**不能早退** —— 后面仍要按 includeCards 合并别项目卡片,否则 observe 列表会与合卡片的 /api/skills 口径分裂。
     if (existsSync(dir)) {
         for (const file of readdirSync(dir)) {
-            if (!file.endsWith('.json'))
+            const id = reportFileStem(file);
+            if (!id)
                 continue;
             try {
                 const data = JSON.parse(readFileSync(join(dir, file), 'utf-8'));
                 if (!data.meta || !data.overall)
                     continue;
                 items.push({
-                    id: file.replace(/\.json$/, ''),
+                    id,
                     generatedAt: data.meta.generatedAt,
                     sessionCount: data.meta.sessionCount,
                     segmentCount: data.meta.segmentCount,
@@ -89,7 +94,8 @@ function listAnalyses(dir, includeCards = false) {
     return items;
 }
 function loadAnalysis(dir, id, includeCards = false) {
-    const path = join(dir, `${id}.json`);
+    migrateLegacyReportFiles(dir, 'observe-health');
+    const path = reportFilePath(dir, id);
     if (existsSync(path)) {
         try {
             return JSON.parse(readFileSync(path, 'utf-8'));
@@ -114,9 +120,10 @@ function loadAnalysis(dir, id, includeCards = false) {
  *  优先返回含该 skill 的那份；都不含时回退首个 id 命中（单 skill / 无参行为不变）。 */
 function loadDoctorReport(dir, id, skillName, includeCards = false) {
     let fallback = null;
+    migrateLegacyReportFiles(dir, 'doctor');
     if (existsSync(dir)) {
         for (const file of readdirSync(dir)) {
-            if (!file.endsWith('.json'))
+            if (!isReportFileName(file))
                 continue;
             try {
                 const data = JSON.parse(readFileSync(join(dir, file), 'utf-8'));
@@ -596,6 +603,18 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
         : doctorsDir !== undefined
             ? () => doctorsDir
             : () => resolveDoctorsDir(projectDoctorsDir());
+    const includeReportCards = reportsDir === undefined && store == null;
+    const evalGraphDirs = reportsDir !== undefined
+        ? [evalGraphDirForReportOutput(reportsDir)]
+        : store
+            ? []
+            : [evalGraphDirForReportOutput(projectReportsDir()), evalGraphDirForReportOutput(globalReportsDir())];
+    const skillIndexOptions = () => ({
+        includeObserveCards,
+        includeDoctorCards,
+        includeReportCards,
+        evalGraphDirs,
+    });
     async function handleRequest(req, res) {
         try {
             const parsed = new URL(req.url || '/', 'http://127.0.0.1');
@@ -746,7 +765,7 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
             }
             if (path === '/api/observe-inbox/diagnostics') {
                 const runs = await reportStore.list();
-                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                 res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
                 res.end(JSON.stringify({
                     sourceCoverage: idx.diagnosisSummary.sourceCoverage,
@@ -832,7 +851,7 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
                 let ctx;
                 if (skillName) {
                     const runs = await reportStore.list();
-                    const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                    const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                     const entry = idx.entries.find((en) => en.skillName === skillName);
                     if (entry)
                         ctx = buildSkillContext(entry, 'doctor', id, idx.insightsBySkill.get(entry.skillName) ?? [], lang);
@@ -994,7 +1013,7 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
                 let ctx;
                 if (report && report.kind === 'evaluation') {
                     const runs = await reportStore.list();
-                    const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                    const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                     // 按 evalHistory 匹配(非仅最新),历史 eval 报告也能定位到所属 skill。
                     const entry = idx.entries.find((en) => en.evalHistory.some((h) => h.reportId === reportId));
                     if (entry)
@@ -1016,14 +1035,14 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
             // list renderer 直接消费,不再每请求 N×detectInsights 重算。
             if (path === '/') {
                 const runs = await reportStore.list();
-                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                 res.end(renderSkillList(idx, lang));
                 return;
             }
             if (path === '/api/skills') {
                 const runs = await reportStore.list();
-                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                 res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
                 res.end(JSON.stringify({
                     entries: idx.entries.map((entry) => ({
@@ -1036,15 +1055,36 @@ export function createReportServer({ port, host: hostOption, reportsDir, analyse
                 }));
                 return;
             }
-            // 注:/skills/<name> 详情页(hub)已下线 — 首页点行直接进 eval/doctor 报告,跨维度靠
-            // 报告页 chip 条 +「全部历史」弹框,不再有中间汇总页。该路由不做兼容重定向:Studio
-            // 是本地临时服务器、端口每次启动都变,跨会话书签 localhost:<port> 本就失效,且 PR 内
-            // 已无任何链接指向它。未匹配的 /skills/<name> 直接落到下方通用 404。
+            const skillHubMatch = path.match(/^\/skills\/(.+)$/);
+            if (skillHubMatch) {
+                let skillName;
+                try {
+                    skillName = decodeURIComponent(skillHubMatch[1]);
+                }
+                catch {
+                    res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                    res.end(lang === 'en' ? 'skill not found' : '未找到该 skill');
+                    return;
+                }
+                const runs = await reportStore.list();
+                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
+                const entry = idx.entries.find((en) => en.skillName === skillName);
+                if (!entry) {
+                    res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+                    res.end(lang === 'en' ? 'skill not found' : '未找到该 skill');
+                    return;
+                }
+                const report = entry.eval ? await queryRun(reportStore, entry.eval.reportId) : null;
+                const evalReport = report?.kind === 'evaluation' ? report : null;
+                res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+                res.end(renderSkillDetail(entry, evalReport, lang, idx.insightsBySkill.get(entry.skillName) ?? []));
+                return;
+            }
             const skillDiagnosticsApiMatch = path.match(/^\/api\/skills\/(.+)\/diagnostics$/);
             if (skillDiagnosticsApiMatch) {
                 const skillName = decodeURIComponent(skillDiagnosticsApiMatch[1]);
                 const runs = await reportStore.list();
-                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, { includeObserveCards, includeDoctorCards });
+                const idx = buildSkillIndex(runs, analysesDir, doctorsDir, observationsDir, skillIndexOptions());
                 const diagnostics = idx.diagnosticsBySkill.get(skillName);
                 if (!diagnostics) {
                     res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });

package/dist/server/report-store.js

@@ -5,6 +5,8 @@
  */
 import { readdir, readFile, writeFile, unlink, access, mkdir, rename, stat } from 'node:fs/promises';
 import { join } from 'node:path';
+import { isReportFileName, reportFilePath, reportFileStem } from '../eval-core/artifact-file-names.js';
+import { migrateLegacyReportFiles } from '../eval-core/report-file-migration.js';
 // Per-id in-memory mutex for safe read-modify-write.
 // Uses a queue to avoid the race window between checking and acquiring the lock.
 const locks = new Map();
@@ -67,7 +69,7 @@ export function createFileStore(dir) {
     function isEvaluationReport(report) {
         return report.kind === 'evaluation';
     }
-    // Studio 每个 / 和 /skills/<name> 请求都调 list(),里面对每个 .json 同步 readFile +
+    // Studio 每个 / 和 /skills/<name> 请求都调 list(),里面对每个 .report.json 同步 readFile +
     // JSON.parse。报告数上来后这是主性能瓶颈。缓存策略:fingerprint = dir mtime + 文件名
     // 排序串 + 每个文件 mtime;任一变化 invalidate。fingerprint 算 cheap(只 stat),命中后
     // 完全跳过 readFile。
@@ -76,7 +78,7 @@ export function createFileStore(dir) {
     async function computeListFingerprint() {
         try {
             const dirStat = await stat(dir);
-            const files = (await readdir(dir)).filter((f) => f.endsWith('.json')).sort();
+            const files = (await readdir(dir)).filter(isReportFileName).sort();
             const parts = await Promise.all(files.map(async (f) => {
                 try {
                     const s = await stat(join(dir, f));
@@ -99,18 +101,19 @@ export function createFileStore(dir) {
         catch {
             return [];
         }
+        migrateLegacyReportFiles(dir, 'report');
         const fp = await computeListFingerprint();
         if (fp != null && fp === cachedFingerprint && cachedRuns)
             return cachedRuns;
         const files = (await readdir(dir))
-            .filter((f) => f.endsWith('.json'))
+            .filter(isReportFileName)
             .sort()
             .reverse();
         const runs = [];
         for (const file of files) {
             try {
                 const data = JSON.parse(await readFile(join(dir, file), 'utf-8'));
-                const report = normalizeReportDocument(data, file.replace(/\.json$/, ''));
+                const report = normalizeReportDocument(data, reportFileStem(file) ?? file);
                 if (report)
                     runs.push(report);
             }
@@ -128,8 +131,9 @@ export function createFileStore(dir) {
         return runs;
     }
     async function get(id) {
+        migrateLegacyReportFiles(dir, 'report');
         try {
-            const data = JSON.parse(await readFile(join(dir, `${id}.json`), 'utf-8'));
+            const data = JSON.parse(await readFile(reportFilePath(dir, id), 'utf-8'));
             return normalizeReportDocument(data, id);
         }
         catch {
@@ -138,9 +142,11 @@ export function createFileStore(dir) {
     }
     async function save(id, report) {
         await ensureDir();
-        const tmpPath = join(dir, `${id}.json.tmp.${Date.now()}.${Math.random().toString(36).slice(2)}`);
+        migrateLegacyReportFiles(dir, 'report');
+        const targetPath = reportFilePath(dir, id);
+        const tmpPath = `${targetPath}.tmp.${Date.now()}.${Math.random().toString(36).slice(2)}`;
         await writeFile(tmpPath, JSON.stringify(report, null, 2));
-        await rename(tmpPath, join(dir, `${id}.json`));
+        await rename(tmpPath, targetPath);
     }
     /**
      * Atomic read-modify-write with in-memory mutex.
@@ -157,8 +163,9 @@ export function createFileStore(dir) {
         });
     }
     async function remove(id) {
+        migrateLegacyReportFiles(dir, 'report');
         try {
-            await unlink(join(dir, `${id}.json`));
+            await unlink(reportFilePath(dir, id));
             return true;
         }
         catch (err) {
@@ -169,8 +176,9 @@ export function createFileStore(dir) {
         }
     }
     async function exists(id) {
+        migrateLegacyReportFiles(dir, 'report');
         try {
-            await access(join(dir, `${id}.json`));
+            await access(reportFilePath(dir, id));
             return true;
         }
         catch {

package/dist/server/skill-index.d.ts

@@ -13,6 +13,12 @@ export interface BuildSkillIndexOptions {
     includeObserveCards?: boolean;
     /** 合并别项目 doctor 卡片(机器级模式)。固定 --doctors-dir / --global 时为 false,只看该目录。 */
     includeDoctorCards?: boolean;
+    /** 合并别项目 eval report 卡片对应的 graph sidecar。 */
+    includeReportCards?: boolean;
+    /** 当前可见 eval graph sidecar 目录。 */
+    evalGraphDirs?: string[];
+    /** 当前可见 doctor graph sidecar 目录。默认跟随 doctorsDir 推导。 */
+    doctorGraphDirs?: string[];
 }
 export declare function buildSkillIndex(reports: ReportDocument[], analysesDir: string, doctorsDir: string, observationsDir?: string, opts?: BuildSkillIndexOptions): SkillIndex;
 /** 单 skill 详情查询(用于 /skills/<name> 详情页)— 复用 buildSkillIndex 的扫描结果。 */