oh-my-knowledge 0.22.0 → 0.24.0

package/dist/src/executors/runtime-fingerprint.d.ts

@@ -0,0 +1,7 @@
+import type { ExecutorRuntimeFingerprint } from '../types/index.js';
+export interface ExecutorRuntimeFingerprintOptions {
+    skillDir?: string | null;
+    env?: NodeJS.ProcessEnv;
+}
+export declare function getExecutorRuntimeFingerprint(executorName: string, model: string, options?: ExecutorRuntimeFingerprintOptions): ExecutorRuntimeFingerprint;
+//# sourceMappingURL=runtime-fingerprint.d.ts.map

package/dist/src/executors/runtime-fingerprint.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-fingerprint.d.ts","sourceRoot":"","sources":["../../../src/executors/runtime-fingerprint.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAGV,0BAA0B,EAG3B,MAAM,mBAAmB,CAAC;AAqL3B,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB;AAMD,wBAAgB,6BAA6B,CAC3C,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,OAAO,GAAE,iCAAsC,GAC9C,0BAA0B,CA+F5B"}

package/dist/src/executors/runtime-fingerprint.js

@@ -0,0 +1,277 @@
+import { execFileSync } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { delimiter, dirname, isAbsolute, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { buildExecEnv } from './shared.js';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const requireFromHere = createRequire(import.meta.url);
+const RUNTIME_CACHE = new Map();
+const UNKNOWN_CAPABILITIES = {
+    systemPrompt: 'unknown',
+    costUSD: 'unknown',
+    trace: 'unknown',
+    skillIsolation: 'unknown',
+};
+function hashString(value) {
+    return createHash('sha256').update(value).digest('hex').slice(0, 12);
+}
+function canonicalStringify(value) {
+    if (value === null || typeof value !== 'object')
+        return JSON.stringify(value);
+    if (Array.isArray(value))
+        return '[' + value.map(canonicalStringify).join(',') + ']';
+    const entries = Object.keys(value).sort();
+    return '{' + entries.map((k) => JSON.stringify(k) + ':' + canonicalStringify(value[k])).join(',') + '}';
+}
+function packagePathSegments(packageName) {
+    return packageName.split('/');
+}
+function findInstalledPackageJson(packageName) {
+    const parts = packagePathSegments(packageName);
+    let dir = __dirname;
+    for (let i = 0; i < 10; i++) {
+        const candidate = join(dir, 'node_modules', ...parts, 'package.json');
+        if (existsSync(candidate))
+            return candidate;
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+function findNearestPackageJson(fromPath) {
+    let dir = dirname(fromPath);
+    for (let i = 0; i < 10; i++) {
+        const candidate = join(dir, 'package.json');
+        if (existsSync(candidate))
+            return candidate;
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+function resolvePackageJson(packageName, from) {
+    const req = from ? createRequire(from) : requireFromHere;
+    try {
+        try {
+            return req.resolve(`${packageName}/package.json`);
+        }
+        catch {
+            const entry = req.resolve(packageName);
+            return findNearestPackageJson(entry);
+        }
+    }
+    catch {
+        return findInstalledPackageJson(packageName);
+    }
+}
+function readPackage(packageName, from) {
+    const packageJson = resolvePackageJson(packageName, from);
+    if (!packageJson) {
+        return { name: packageName, error: 'package.json not found' };
+    }
+    try {
+        const pkg = JSON.parse(readFileSync(packageJson, 'utf-8'));
+        return { name: packageName, ...(pkg.version ? { version: pkg.version } : {}) };
+    }
+    catch (err) {
+        return { name: packageName, error: err instanceof Error ? err.message : String(err) };
+    }
+}
+function readPackageField(packageName, field, from) {
+    const packageJson = resolvePackageJson(packageName, from);
+    if (!packageJson)
+        return undefined;
+    try {
+        const pkg = JSON.parse(readFileSync(packageJson, 'utf-8'));
+        return pkg[field];
+    }
+    catch {
+        return undefined;
+    }
+}
+function readCommand(command, args, env, timeout = 1000) {
+    try {
+        const output = execFileSync(command, args, {
+            encoding: 'utf-8',
+            env,
+            stdio: ['ignore', 'pipe', 'pipe'],
+            timeout,
+        }).trim();
+        return { output };
+    }
+    catch (err) {
+        return { error: err instanceof Error ? err.message : String(err) };
+    }
+}
+function resolvePathBinary(command, env) {
+    if (isAbsolute(command) && existsSync(command))
+        return command;
+    const pathValue = env.PATH || '';
+    const pathExt = process.platform === 'win32'
+        ? (env.PATHEXT || '.EXE;.CMD;.BAT;.COM').split(';')
+        : [''];
+    for (const dir of pathValue.split(delimiter).filter(Boolean)) {
+        for (const ext of pathExt) {
+            const candidate = join(dir, process.platform === 'win32' && ext && !command.toUpperCase().endsWith(ext) ? `${command}${ext}` : command);
+            if (existsSync(candidate))
+                return candidate;
+        }
+    }
+    return undefined;
+}
+function readPathBinary(command, env) {
+    const version = readCommand(command, ['--version'], env);
+    const path = resolvePathBinary(command, env);
+    return {
+        name: command,
+        source: 'path',
+        ...(version.output ? { version: version.output.split('\n')[0].trim() } : {}),
+        ...(path ? { path } : {}),
+        ...(!version.output && version.error ? { error: version.error } : {}),
+    };
+}
+function withFingerprint(input) {
+    const stablePayload = {
+        executor: input.executor,
+        model: input.model,
+        kind: input.kind,
+        binary: input.binary
+            ? {
+                name: input.binary.name,
+                source: input.binary.source,
+                version: input.binary.version,
+                status: input.binary.version ? 'ok' : input.binary.error ? 'error' : 'missing',
+                package: input.binary.package
+                    ? {
+                        name: input.binary.package.name,
+                        version: input.binary.package.version,
+                        status: input.binary.package.version ? 'ok' : input.binary.package.error ? 'error' : 'missing',
+                    }
+                    : undefined,
+            }
+            : undefined,
+        sdk: input.sdk
+            ? {
+                name: input.sdk.name,
+                version: input.sdk.version,
+                status: input.sdk.version ? 'ok' : input.sdk.error ? 'error' : 'missing',
+            }
+            : undefined,
+        capabilities: input.capabilities,
+    };
+    return { ...input, fingerprint: hashString(canonicalStringify(stablePayload)) };
+}
+function runtime(executor, model, kind, capabilities, extra = {}) {
+    return withFingerprint({
+        executor,
+        model,
+        kind,
+        capabilities,
+        ...extra,
+    });
+}
+function runtimeEnv(options) {
+    return options?.env ?? buildExecEnv(options?.skillDir);
+}
+export function getExecutorRuntimeFingerprint(executorName, model, options = {}) {
+    const env = runtimeEnv(options);
+    const pathHash = hashString(env.PATH || '');
+    const cacheKey = `${executorName}\0${model}\0${pathHash}`;
+    const cached = RUNTIME_CACHE.get(cacheKey);
+    if (cached)
+        return cached;
+    let fp;
+    switch (executorName) {
+        case 'claude': {
+            fp = runtime(executorName, model, 'agent-cli', {
+                systemPrompt: 'native',
+                costUSD: 'reported',
+                trace: 'native',
+                skillIsolation: 'full-no-partial',
+            }, { binary: readPathBinary('claude', env) });
+            break;
+        }
+        case 'claude-sdk': {
+            const sdkPackageJson = resolvePackageJson('@anthropic-ai/claude-agent-sdk');
+            const sdk = readPackage('@anthropic-ai/claude-agent-sdk', sdkPackageJson ?? undefined);
+            const claudeCodeVersion = readPackageField('@anthropic-ai/claude-agent-sdk', 'claudeCodeVersion', sdkPackageJson ?? undefined);
+            fp = runtime(executorName, model, 'agent-sdk', {
+                systemPrompt: 'native',
+                costUSD: 'reported',
+                trace: 'native',
+                skillIsolation: 'full',
+            }, {
+                sdk,
+                binary: {
+                    name: 'claude-code',
+                    source: 'bundled',
+                    ...(claudeCodeVersion ? { version: claudeCodeVersion } : {}),
+                    package: sdk,
+                },
+            });
+            break;
+        }
+        case 'codex': {
+            fp = runtime(executorName, model, 'agent-cli', {
+                systemPrompt: 'prepended',
+                costUSD: 'not-reported',
+                trace: 'best-effort',
+                skillIsolation: 'cwd-only',
+            }, { binary: readPathBinary('codex', env) });
+            break;
+        }
+        case 'codex-sdk': {
+            const sdkPackageJson = resolvePackageJson('@openai/codex-sdk');
+            const sdk = readPackage('@openai/codex-sdk', sdkPackageJson ?? undefined);
+            const bundledCodex = readPackage('@openai/codex', sdkPackageJson ?? undefined);
+            fp = runtime(executorName, model, 'agent-sdk', {
+                systemPrompt: 'prepended',
+                costUSD: 'not-reported',
+                trace: 'best-effort',
+                skillIsolation: 'cwd-only',
+            }, {
+                sdk,
+                binary: {
+                    name: 'codex',
+                    source: 'bundled',
+                    ...(bundledCodex.version ? { version: bundledCodex.version } : {}),
+                    package: bundledCodex,
+                },
+            });
+            break;
+        }
+        case 'gemini': {
+            fp = runtime(executorName, model, 'agent-cli', {
+                systemPrompt: 'prepended',
+                costUSD: 'not-reported',
+                trace: 'none',
+                skillIsolation: 'none',
+            }, { binary: readPathBinary('gemini', env) });
+            break;
+        }
+        case 'anthropic-api':
+        case 'openai-api': {
+            fp = runtime(executorName, model, 'api', {
+                systemPrompt: 'native',
+                costUSD: 'not-reported',
+                trace: 'none',
+                skillIsolation: 'none',
+            }, { binary: { name: executorName, source: 'none' } });
+            break;
+        }
+        default: {
+            fp = runtime(executorName, model, 'script', UNKNOWN_CAPABILITIES, {
+                binary: { name: executorName, source: 'unknown' },
+            });
+        }
+    }
+    RUNTIME_CACHE.set(cacheKey, fp);
+    return fp;
+}
+//# sourceMappingURL=runtime-fingerprint.js.map

package/dist/src/executors/runtime-fingerprint.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime-fingerprint.js","sourceRoot":"","sources":["../../../src/executors/runtime-fingerprint.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/script.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../src/executors/script.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AAQ/E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAuEhE"}
+{"version":3,"file":"script.d.ts","sourceRoot":"","sources":["../../../src/executors/script.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,UAAU,EAAiB,MAAM,mBAAmB,CAAC;AAc/E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CA0DhE"}

package/dist/src/executors/script.js

@@ -1,6 +1,5 @@
-import { spawn } from 'node:child_process';
-import { DEFAULT_TIMEOUT_MS } from './shared.js';
-// v0.22 — script executor 由用户自定义,omk 无法保证它实现 skill 隔离。
+import { DEFAULT_TIMEOUT_MS, interruptedExecResult, spawnWithSigintPropagation, timeoutExecResult, } from './shared.js';
+// script executor 由用户自定义,omk 无法保证它实现 skill 隔离。
 // 任何 allowedSkills(包括 [])下都 stderr 一次性 warn,不阻塞执行,
 // 让用户知道 strict-baseline / 显式 allowedSkills 在 script executor 下静默无效。
 let scriptIsolationWarned = false;
@@ -13,60 +12,53 @@ export function createScriptExecutor(command) {
         }
         const input = JSON.stringify({ model, system: system || '', prompt });
         const start = Date.now();
-        return new Promise((resolve) => {
-            const parts = command.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) || [command];
-            const cmd = parts[0].replace(/^["']|["']$/g, '');
-            const args = parts.slice(1).map((a) => a.replace(/^["']|["']$/g, ''));
-            const child = spawn(cmd, args, {
-                stdio: ['pipe', 'pipe', 'pipe'],
-                env: { ...process.env },
-                timeout: timeoutMs,
-                ...(cwd && { cwd }),
-            });
-            let stdout = '';
-            let stderr = '';
-            child.stdout.on('data', (d) => { stdout += d; });
-            child.stderr.on('data', (d) => { stderr += d; });
-            child.on('error', (err) => {
-                resolve({
-                    ok: false, error: `executor command failed: ${err.message}`,
-                    durationMs: Date.now() - start, durationApiMs: 0,
-                    inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0,
-                    costUSD: 0, output: null, stopReason: 'error', numTurns: 0,
-                });
-            });
-            child.on('close', (code) => {
-                const durationMs = Date.now() - start;
-                if (code !== 0) {
-                    resolve({
-                        ok: false, error: stderr.trim() || `executor exited with code ${code}`,
-                        durationMs, durationApiMs: 0,
-                        inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0,
-                        costUSD: 0, output: null, stopReason: 'error', numTurns: 0,
-                    });
-                    return;
-                }
-                try {
-                    const data = JSON.parse(stdout);
-                    resolve({
-                        ok: true, output: data.output || '', durationMs,
-                        durationApiMs: data.durationApiMs || 0,
-                        inputTokens: data.inputTokens || 0, outputTokens: data.outputTokens || 0,
-                        cacheReadTokens: data.cacheReadTokens || 0, cacheCreationTokens: data.cacheCreationTokens || 0,
-                        costUSD: data.costUSD || 0, stopReason: data.stopReason || 'end', numTurns: data.numTurns || 1,
-                    });
-                }
-                catch {
-                    resolve({
-                        ok: true, output: stdout.trim(), durationMs, durationApiMs: 0,
-                        inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0,
-                        costUSD: 0, stopReason: 'end', numTurns: 1,
-                    });
-                }
-            });
-            child.stdin.write(input);
-            child.stdin.end();
+        const parts = command.match(/(?:[^\s"']+|"[^"]*"|'[^']*')+/g) || [command];
+        const cmd = parts[0].replace(/^["']|["']$/g, '');
+        const args = parts.slice(1).map((a) => a.replace(/^["']|["']$/g, ''));
+        const { child, done } = spawnWithSigintPropagation(cmd, args, {
+            env: { ...process.env },
+            timeoutMs,
+            ...(cwd && { cwd }),
         });
+        child.stdin?.write(input);
+        child.stdin?.end();
+        try {
+            const r = await done;
+            const durationMs = Date.now() - start;
+            try {
+                const data = JSON.parse(r.stdout);
+                return {
+                    ok: true, output: data.output || '', durationMs,
+                    durationApiMs: data.durationApiMs || 0,
+                    inputTokens: data.inputTokens || 0, outputTokens: data.outputTokens || 0,
+                    cacheReadTokens: data.cacheReadTokens || 0, cacheCreationTokens: data.cacheCreationTokens || 0,
+                    costUSD: data.costUSD || 0, stopReason: data.stopReason || 'end', numTurns: data.numTurns || 1,
+                };
+            }
+            catch {
+                return {
+                    ok: true, output: r.stdout.trim(), durationMs, durationApiMs: 0,
+                    inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0,
+                    costUSD: 0, stopReason: 'end', numTurns: 1,
+                };
+            }
+        }
+        catch (err) {
+            const durationMs = Date.now() - start;
+            const details = err;
+            if (details.killedByTimeout)
+                return timeoutExecResult(timeoutMs, durationMs);
+            if (details.killedBySignal)
+                return interruptedExecResult(durationMs);
+            const stderr = (details.stderr || '').trim();
+            return {
+                ok: false,
+                error: stderr || details.message || `executor exited with code ${details.code ?? '?'}`,
+                durationMs, durationApiMs: 0,
+                inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0,
+                costUSD: 0, output: null, stopReason: 'error', numTurns: 0,
+            };
+        }
     };
 }
 //# sourceMappingURL=script.js.map

package/dist/src/executors/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/executors/script.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/executors/script.ts"],"names":[],"mappings":"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"}

package/dist/src/executors/shared.d.ts

@@ -1,4 +1,4 @@
-import { execFile } from 'node:child_process';
+import { execFile, type ChildProcess } from 'node:child_process';
 import type { ExecResult } from '../types/index.js';
 export declare const execFileAsync: typeof execFile.__promisify__;
 export declare const DEFAULT_MODEL = "sonnet";
@@ -103,6 +103,44 @@ export interface ClaudeSdkResultMessage extends ClaudeSdkBaseMessage {
 export interface ClaudeSdkModule {
     query: (opts: ClaudeSdkQueryInput) => AsyncIterable<ClaudeSdkBaseMessage>;
 }
+export interface CodexEvent {
+    type?: string;
+    turn_id?: string;
+    usage?: {
+        input_tokens?: number;
+        cached_input_tokens?: number;
+        output_tokens?: number;
+        reasoning_output_tokens?: number;
+    };
+    elapsed_ms?: number;
+    stop_reason?: string;
+    item?: {
+        id?: string;
+        type?: string;
+        text?: string;
+        command?: string;
+        aggregated_output?: string;
+        exit_code?: number | null;
+        status?: string;
+        path?: string;
+        content?: string;
+        query?: string;
+        results?: unknown[];
+        changes?: Array<{
+            path?: string;
+            kind?: string;
+        }>;
+        server?: string;
+        tool?: string;
+        arguments?: unknown;
+        result?: unknown;
+        message?: string;
+    };
+    error?: {
+        message?: string;
+    };
+    ts?: number;
+}
 export interface ExecutorErrorLike {
     message?: string;
     name?: string;
@@ -114,4 +152,43 @@ export declare function errorMessage(err: unknown, fallback?: string): string;
 export declare function parseJson<T>(content: string): T;
 export declare function buildExecEnv(skillDir?: string | null): NodeJS.ProcessEnv;
 export declare function timeoutExecResult(timeoutMs: number, durationMs: number): ExecResult;
+export declare function interruptedExecResult(durationMs: number): ExecResult;
+export declare function __resetSigintRegistryForTest(): void;
+export interface SpawnHelperResult {
+    stdout: string;
+    stderr: string;
+    code: number | null;
+    signal: NodeJS.Signals | null;
+    killedByTimeout: boolean;
+    killedBySignal: NodeJS.Signals | null;
+}
+export interface SpawnHelperError extends Error {
+    stdout?: string;
+    stderr?: string;
+    code?: number | null;
+    signal?: NodeJS.Signals | null;
+    killedByTimeout?: boolean;
+    killedBySignal?: NodeJS.Signals | null;
+}
+export interface SpawnHelperOptions {
+    cwd?: string;
+    env?: NodeJS.ProcessEnv;
+    /** kill child after this many ms; reject with killedByTimeout=true */
+    timeoutMs?: number;
+    /** stdout overflow threshold; reject when累计超限 */
+    maxBuffer?: number;
+    /** external abort signal; abort() 走跟 SIGINT 同一 grace 路径 */
+    abortSignal?: AbortSignal;
+}
+/**
+ * spawn child + 注册到全局 SIGINT registry。返回 { child, done } 让 caller 自己
+ * 操作 stdin(写入 / 关闭),通过 done 等结果。
+ *
+ * 适用:claude / codex / gemini / script CLI 子进程。HTTP executor(*-api)用 fetch +
+ * AbortSignal.timeout,自带 abort,不走这个。claude-sdk in-process 也不走。
+ */
+export declare function spawnWithSigintPropagation(command: string, args: string[], options?: SpawnHelperOptions): {
+    child: ChildProcess;
+    done: Promise<SpawnHelperResult>;
+};
 //# sourceMappingURL=shared.d.ts.map

package/dist/src/executors/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/executors/shared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/executors/shared.ts"],"names":[],"mappings":"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"}