oh-my-knowledge 0.42.0 → 0.44.0

package/dist/eval-core/report-file-migration.js

@@ -0,0 +1,90 @@
+import { existsSync, readdirSync, readFileSync, renameSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { doctorReportFileStem, isReportFileName, reportFilePath, stripDomainPrefix } from './artifact-file-names.js';
+function legacyJsonStem(fileName) {
+    if (!fileName.endsWith('.json'))
+        return null;
+    if (isReportFileName(fileName))
+        return null;
+    if (fileName.includes('.json.tmp.'))
+        return null;
+    return fileName.slice(0, -'.json'.length);
+}
+function isObject(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function looksLikeObserveHealthReport(value) {
+    return isObject(value.meta) && isObject(value.bySkill) && isObject(value.overall);
+}
+function targetStemForLegacyReport(domain, fileName, data) {
+    const fileStem = legacyJsonStem(fileName);
+    if (!fileStem || !isObject(data))
+        return null;
+    if (domain === 'report') {
+        const kind = data.kind;
+        return (kind === 'evaluation' || kind === 'batch-evaluation') && typeof data.id === 'string' && data.id
+            ? data.id
+            : null;
+    }
+    if (domain === 'doctor') {
+        if (data.kind !== 'doctor' || typeof data.id !== 'string' || !Array.isArray(data.skills) || data.skills.length !== 1)
+            return null;
+        const skill = data.skills[0];
+        return isObject(skill) && typeof skill.skillName === 'string' && skill.skillName
+            ? doctorReportFileStem(skill.skillName, data.id)
+            : null;
+    }
+    if (domain === 'observe-health') {
+        if (data.kind !== 'observe-health' && !looksLikeObserveHealthReport(data))
+            return null;
+        return stripDomainPrefix(fileStem.replace(/-observe-health$/, ''), 'observe-health');
+    }
+    if (data.kind !== 'observe-inbox')
+        return null;
+    return stripDomainPrefix(fileStem.replace(/-observe-inbox$/, ''), 'observe-inbox');
+}
+/**
+ * One-shot migration for pre-`.report.json` run artifacts.
+ *
+ * This is deliberately scoped to measurement report directories. It does not make
+ * bare `.json` a normal reader format again; it just renames known legacy report
+ * files into the canonical name so old local data can be discovered, rotated, and
+ * eventually garbage-collected by the new code paths.
+ */
+export function migrateLegacyReportFiles(dir, domain) {
+    if (!existsSync(dir))
+        return;
+    let files;
+    try {
+        files = readdirSync(dir);
+    }
+    catch {
+        return;
+    }
+    for (const file of files) {
+        if (!legacyJsonStem(file))
+            continue;
+        const sourcePath = join(dir, file);
+        let targetStem = null;
+        try {
+            targetStem = targetStemForLegacyReport(domain, file, JSON.parse(readFileSync(sourcePath, 'utf-8')));
+        }
+        catch {
+            continue;
+        }
+        if (!targetStem)
+            continue;
+        const targetPath = reportFilePath(dir, targetStem);
+        try {
+            if (existsSync(targetPath)) {
+                unlinkSync(sourcePath);
+            }
+            else {
+                renameSync(sourcePath, targetPath);
+            }
+        }
+        catch {
+            // Best-effort migration only. Readers will ignore the legacy file if it remains.
+        }
+    }
+}

package/dist/inputs/sample-locator.d.ts

@@ -0,0 +1,23 @@
+export declare const PROJECT_SAMPLE_FILENAMES: readonly ["eval-samples.json", "eval-samples.yaml", "eval-samples.yml"];
+export declare const SKILL_LOCAL_SAMPLE_FILENAMES: readonly ["samples.json", "samples.yaml", "samples.yml"];
+export interface DeprecatedSkillSamplesHint {
+    oldPath: string;
+    newPath: string;
+}
+export declare function isExistingDirectory(path: string): boolean;
+export declare function hasLoadableSampleFile(dir: string): boolean;
+export declare function findProjectSamplesFile(dir: string): string | null;
+export declare function skillLocalSamplesDir(skillRoot: string): string;
+export declare function defaultSkillLocalSamplesFile(skillRoot: string): string;
+export declare function hasUsableSamplesPath(path: string): boolean;
+export declare function findSkillLocalSamplesDir(skillRoot: string): string | null;
+export declare function findSkillSamplesPath(skillRoot: string): string | null;
+export declare function findDeprecatedSkillSamplesHint(skillRoot: string): DeprecatedSkillSamplesHint | null;
+export declare function findFlatSkillSamplesPath(skillDir: string, skillName: string): string | null;
+export declare function defaultFlatSkillSamplesFile(skillDir: string, skillName: string): string;
+export declare function isDirectorySkillRoot(path: string): boolean;
+export declare function findNamedSkillSamplesPath(skillDir: string, skillName: string): string | null;
+export declare function findSingleTreatmentSamplesPath(treatmentExpr: string, skillDir: string, cwd?: string): string | null;
+export declare function findSingleTreatmentDeprecatedSamplesHint(treatmentExpr: string, skillDir: string, cwd?: string): DeprecatedSkillSamplesHint | null;
+export declare function findDoctorSamplesPath(target: string | null, cwd: string): string | null;
+export declare function findDoctorDeprecatedSamplesHint(target: string | null, cwd: string): DeprecatedSkillSamplesHint | null;

package/dist/inputs/sample-locator.js

@@ -0,0 +1,195 @@
+import { existsSync, readdirSync, statSync } from 'node:fs';
+import { basename, dirname, join, resolve } from 'node:path';
+export const PROJECT_SAMPLE_FILENAMES = ['eval-samples.json', 'eval-samples.yaml', 'eval-samples.yml'];
+export const SKILL_LOCAL_SAMPLE_FILENAMES = ['samples.json', 'samples.yaml', 'samples.yml'];
+const SAMPLE_FILE_RE = /\.(json|ya?ml)$/i;
+const RESERVED_SAMPLE_FILE_RE = /^(report|health|_)/i;
+function isExistingFile(path) {
+    try {
+        return existsSync(path) && statSync(path).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+export function isExistingDirectory(path) {
+    try {
+        return existsSync(path) && statSync(path).isDirectory();
+    }
+    catch {
+        return false;
+    }
+}
+export function hasLoadableSampleFile(dir) {
+    if (!isExistingDirectory(dir))
+        return false;
+    try {
+        return readdirSync(dir).some((file) => SAMPLE_FILE_RE.test(file) && !RESERVED_SAMPLE_FILE_RE.test(file));
+    }
+    catch {
+        return false;
+    }
+}
+export function findProjectSamplesFile(dir) {
+    for (const name of PROJECT_SAMPLE_FILENAMES) {
+        const candidate = join(dir, name);
+        if (isExistingFile(candidate))
+            return candidate;
+    }
+    return null;
+}
+export function skillLocalSamplesDir(skillRoot) {
+    return join(skillRoot, '.omk');
+}
+export function defaultSkillLocalSamplesFile(skillRoot) {
+    return join(skillLocalSamplesDir(skillRoot), SKILL_LOCAL_SAMPLE_FILENAMES[0]);
+}
+export function hasUsableSamplesPath(path) {
+    if (isExistingFile(path))
+        return true;
+    return hasLoadableSampleFile(path);
+}
+export function findSkillLocalSamplesDir(skillRoot) {
+    const dir = skillLocalSamplesDir(skillRoot);
+    return hasLoadableSampleFile(dir) ? dir : null;
+}
+export function findSkillSamplesPath(skillRoot) {
+    return findSkillLocalSamplesDir(skillRoot);
+}
+export function findDeprecatedSkillSamplesHint(skillRoot) {
+    if (!isDirectorySkillRoot(skillRoot))
+        return null;
+    for (const name of PROJECT_SAMPLE_FILENAMES) {
+        const oldPath = join(skillRoot, name);
+        if (isExistingFile(oldPath)) {
+            return { oldPath, newPath: defaultSkillLocalSamplesFile(skillRoot) };
+        }
+    }
+    return null;
+}
+export function findFlatSkillSamplesPath(skillDir, skillName) {
+    for (const ext of ['json', 'yaml', 'yml']) {
+        const candidate = join(skillDir, `${skillName}.eval-samples.${ext}`);
+        if (isExistingFile(candidate))
+            return candidate;
+    }
+    return null;
+}
+export function defaultFlatSkillSamplesFile(skillDir, skillName) {
+    return join(skillDir, `${skillName}.eval-samples.json`);
+}
+export function isDirectorySkillRoot(path) {
+    return isExistingDirectory(path) && isExistingFile(join(path, 'SKILL.md'));
+}
+export function findNamedSkillSamplesPath(skillDir, skillName) {
+    const flatSkillPath = join(skillDir, `${skillName}.md`);
+    if (isExistingFile(flatSkillPath)) {
+        return findFlatSkillSamplesPath(skillDir, skillName);
+    }
+    const dirSkillRoot = join(skillDir, skillName);
+    if (isDirectorySkillRoot(dirSkillRoot)) {
+        return findSkillSamplesPath(dirSkillRoot);
+    }
+    return null;
+}
+function findSamplesForExistingSkillPath(path) {
+    if (isExistingDirectory(path)) {
+        return findSkillSamplesPath(path);
+    }
+    const parent = dirname(path);
+    if (basename(path) === 'SKILL.md') {
+        return findSkillSamplesPath(parent);
+    }
+    if (/\.md$/i.test(path)) {
+        const skillName = basename(path).replace(/\.md$/i, '');
+        return findFlatSkillSamplesPath(parent, skillName);
+    }
+    return findProjectSamplesFile(parent);
+}
+function findDeprecatedSamplesForExistingSkillPath(path) {
+    if (isExistingDirectory(path)) {
+        return findDeprecatedSkillSamplesHint(path);
+    }
+    if (basename(path) === 'SKILL.md') {
+        return findDeprecatedSkillSamplesHint(dirname(path));
+    }
+    return null;
+}
+export function findSingleTreatmentSamplesPath(treatmentExpr, skillDir, cwd = process.cwd()) {
+    const resolved = resolve(cwd, treatmentExpr);
+    if (existsSync(resolved)) {
+        const samplesPath = findSamplesForExistingSkillPath(resolved);
+        if (samplesPath)
+            return samplesPath;
+    }
+    return findNamedSkillSamplesPath(skillDir, treatmentExpr);
+}
+export function findSingleTreatmentDeprecatedSamplesHint(treatmentExpr, skillDir, cwd = process.cwd()) {
+    const resolved = resolve(cwd, treatmentExpr);
+    if (existsSync(resolved)) {
+        return findDeprecatedSamplesForExistingSkillPath(resolved);
+    }
+    const flatSkillPath = join(skillDir, `${treatmentExpr}.md`);
+    if (isExistingFile(flatSkillPath))
+        return null;
+    return findDeprecatedSkillSamplesHint(join(skillDir, treatmentExpr));
+}
+function projectSampleSearchDirs(target, cwd) {
+    const dirs = [];
+    const add = (dir) => {
+        const abs = resolve(dir);
+        if (!dirs.includes(abs))
+            dirs.push(abs);
+    };
+    if (target) {
+        const absTarget = resolve(target);
+        if (existsSync(absTarget)) {
+            if (isExistingDirectory(absTarget)) {
+                if (isDirectorySkillRoot(absTarget)) {
+                    add(dirname(dirname(absTarget)));
+                }
+                else {
+                    add(absTarget);
+                    add(dirname(absTarget));
+                    add(dirname(dirname(absTarget)));
+                }
+            }
+            else {
+                const parent = dirname(absTarget);
+                if (basename(absTarget) === 'SKILL.md') {
+                    add(dirname(dirname(parent)));
+                }
+                else {
+                    add(parent);
+                    add(dirname(parent));
+                }
+            }
+        }
+    }
+    add(cwd);
+    return dirs;
+}
+export function findDoctorSamplesPath(target, cwd) {
+    if (target) {
+        const absTarget = resolve(target);
+        if (existsSync(absTarget)) {
+            const targetSamples = findSamplesForExistingSkillPath(absTarget);
+            if (targetSamples)
+                return targetSamples;
+        }
+    }
+    for (const dir of projectSampleSearchDirs(target, cwd)) {
+        const samplesPath = findProjectSamplesFile(dir);
+        if (samplesPath)
+            return samplesPath;
+    }
+    return null;
+}
+export function findDoctorDeprecatedSamplesHint(target, cwd) {
+    if (!target)
+        return null;
+    const absTarget = resolve(cwd, target);
+    if (!existsSync(absTarget))
+        return null;
+    return findDeprecatedSamplesForExistingSkillPath(absTarget);
+}

package/dist/inputs/skill-loader.js

@@ -5,6 +5,7 @@ import { execFileSync } from 'node:child_process';
 import { extractSkillHardRules, extractSkillWorkflows } from '../shared/hard-rules.js';
 import { hashArtifactSource, hashBytes, isDistributablePath } from './content-hash.js';
 import { materializeIsolatedCopy } from './materialize-copy.js';
+import { findFlatSkillSamplesPath, findSkillSamplesPath } from './sample-locator.js';
 function parseFrontmatterPreflight(content) {
     const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
     if (!match)
@@ -388,14 +389,9 @@ export function discoverBatchSkills(skillDir) {
         const mdMatch = entry.endsWith('.md') && !entry.endsWith('.eval-samples.json');
         if (mdMatch) {
             const name = entry.slice(0, -3);
-            const candidates = [
-                join(skillDir, name, '.omk'),
-                join(skillDir, `${name}.eval-samples.json`),
-                join(skillDir, `${name}.eval-samples.yaml`),
-                join(skillDir, `${name}.eval-samples.yml`),
-            ].filter(existsSync);
-            if (candidates.length > 0) {
-                skills.push({ name, skillPath: join(skillDir, entry), samplesPath: candidates[0] });
+            const samplesPath = findFlatSkillSamplesPath(skillDir, name);
+            if (samplesPath) {
+                skills.push({ name, skillPath: join(skillDir, entry), samplesPath });
             }
             else {
                 warned.push(name);
@@ -406,15 +402,9 @@ export function discoverBatchSkills(skillDir) {
             const skillMd = join(entryPath, 'SKILL.md');
             if (!existsSync(skillMd))
                 continue;
-            // .omk/ dir (loadSamples handles dir mode) > .omk/samples.json > eval-samples.{json,yaml,yml}
-            const omkDir = join(entryPath, '.omk');
-            const candidates = [
-                ...(existsSync(omkDir) ? [omkDir] : []),
-                join(entryPath, 'eval-samples.json'),
-                join(entryPath, 'eval-samples.yaml'),
-                join(entryPath, 'eval-samples.yml'),
-            ];
-            const samplesPath = candidates.find(existsSync);
+            if (existsSync(join(skillDir, `${entry}.md`)))
+                continue;
+            const samplesPath = findSkillSamplesPath(entryPath);
             if (samplesPath) {
                 skills.push({ name: entry, skillPath: skillMd, samplesPath });
             }

package/dist/observability/inbox.js

@@ -2,13 +2,15 @@ import { createHash } from 'node:crypto';
 import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { OMK_HOME } from '../eval-core/default-dirs.js';
+import { isReportFileName, reportFilePath } from '../eval-core/artifact-file-names.js';
+import { migrateLegacyReportFiles } from '../eval-core/report-file-migration.js';
 import { extractGapSignalsFromTrace } from '../analysis/gap-analyzer.js';
 import { ccTracesToResultEntries } from './trace-adapter.js';
 import { isSearchToolCall, toolCallQuery } from '../shared/tool-search.js';
 import { durationMsBetween } from '../shared/time.js';
 import { buildObservationExperienceReport, normalizeObservationExperienceReport, } from './experience.js';
 // observe inbox（观测收件箱）产物根目录。导出名沿用 *_OBSERVATIONS_DIR 以少动 importer,
-// 但落盘目录已统一到 observe-inbox 词根(命令 omk observe inbox / 文件 *-observe-inbox.json / kind observe-inbox)。
+// 但落盘目录已统一到 observe-inbox 词根(命令 omk observe inbox / kind observe-inbox)。
 // 项目级 .omk/observe-inbox 优先、全局兜底 —— 这套 project/global 归属是既有正常行为,本次只改名不改归属。
 export const DEFAULT_PROJECT_OBSERVATIONS_DIR = join(process.cwd(), '.omk', 'observe-inbox');
 export const DEFAULT_GLOBAL_OBSERVATIONS_DIR = join(OMK_HOME, 'observe-inbox');
@@ -529,10 +531,11 @@ function compareInboxItems(a, b) {
 }
 export function saveObservationInboxReport(report, outDir = DEFAULT_OBSERVATIONS_DIR) {
     mkdirSync(outDir, { recursive: true });
+    migrateLegacyReportFiles(outDir, 'observe-inbox');
     // 保留毫秒;同秒不同毫秒生成的两份 report 不应静默互相覆盖。
     // 例: '2026-05-07T12:00:00.999Z' → '2026-05-07T12-00-00-999'
     const stamp = report.meta.generatedAt.replace(/[:.]/g, '-').replace(/Z$/, '');
-    const path = join(outDir, `${stamp}-observe-inbox.json`);
+    const path = reportFilePath(outDir, stamp);
     writeFileSync(path, JSON.stringify(report, null, 2));
     return path;
 }
@@ -543,8 +546,9 @@ export function loadObservationInboxReports(dir = DEFAULT_OBSERVATIONS_DIR) {
         }
         return [];
     }
+    migrateLegacyReportFiles(dir, 'observe-inbox');
     return readdirSync(dir)
-        .filter((file) => file.endsWith('-observe-inbox.json'))
+        .filter(isReportFileName)
         .map((file) => {
         try {
             const report = normalizeObservationInboxReport(JSON.parse(readFileSync(join(dir, file), 'utf-8')));

package/dist/renderer/html-renderer.js

@@ -149,9 +149,10 @@ export function renderRunList(runs, lang = DEFAULT_LANG) {
     // 顶部 verdict pill 主导视觉,id+date 是身份,scores 是成绩,底部 meta 是元数据,
     // delete 默认隐藏在 hover 出现避免误点。批量报告共用同一组件,batch pill 替代 verdict。
     const formatDateFromId = (id, fallbackTs) => {
-        // 兼容两代 run id 后缀:旧 `…YYYYMMDD-HHmm`、新 `…YYYYMMDD-HHmmss-rand4`(含秒+随机)。
+        // 兼容三代 run id 后缀:旧 `…YYYYMMDD-HHmm`、过渡期 `…YYYYMMDD-HHmmss-rand4`、
+        // 统一后 `…YYYYMMDDTHHmmss-rand4`(含秒+随机)。
         // 都从 id 直接派生本地展示时间(确定性,不走时区敏感的 toLocaleString);新增的秒段 + 随机后缀可选匹配。
-        const idMatch = id.match(/(\d{4})(\d{2})(\d{2})-(\d{2})(\d{2})(?:\d{2}-[a-z0-9]+)?$/);
+        const idMatch = id.match(/(\d{4})(\d{2})(\d{2})(?:T|-)(\d{2})(\d{2})(?:\d{2})?(?:-[a-z0-9]+)?$/);
         if (idMatch)
             return `${idMatch[2]}/${idMatch[3]} ${idMatch[4]}:${idMatch[5]}`;
         return fallbackTs ? new Date(fallbackTs).toLocaleString('zh-CN', { month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit' }) : '';