@co-engram/core 0.1.0 → 0.1.1

package/dist/merge/frontmatter-rules.js

@@ -0,0 +1,77 @@
+/**
+ * Frontmatter 字段分类 + 单字段合并规则
+ *
+ * 字段语义分类见 spec §4.2。每种分类有独立的合并规则。
+ * updatedAt_arbitrated 字段不在此处处理(由 arbitration.ts 接管)。
+ *
+ * @module @co-engram/core/merge
+ */
+const IMMUTABLE_FIELDS = new Set(["id", "createdAt", "createdBy"]);
+const ADDITIVE_FIELDS = new Set([
+    "retrievalCount",
+    "effectiveRetrievals",
+    "failedUses",
+    "reinforcementScore",
+    "evidenceCount",
+]);
+const MAX_FIELDS = new Set([
+    "updatedAt",
+    "lastRetrievedAt",
+    "lastEffectiveAt",
+    "version",
+]);
+const RECOMPUTED_FIELDS = new Set(["contentHash", "contentSize"]);
+const LEGACY_DERIVED_FIELDS = new Set([
+    "outgoingSynapseCount",
+    "incomingSynapseCount",
+    "activeContradictionCount",
+]);
+export function classifyField(fieldName) {
+    if (IMMUTABLE_FIELDS.has(fieldName))
+        return "immutable";
+    if (ADDITIVE_FIELDS.has(fieldName))
+        return "additive";
+    if (MAX_FIELDS.has(fieldName))
+        return "max";
+    if (RECOMPUTED_FIELDS.has(fieldName))
+        return "recomputed";
+    if (LEGACY_DERIVED_FIELDS.has(fieldName))
+        return "legacy_derived";
+    return "updatedAt_arbitrated";
+}
+export class ImmutableViolationError extends Error {
+    fieldName;
+    base;
+    ours;
+    theirs;
+    constructor(fieldName, base, ours, theirs) {
+        super(`Immutable field "${fieldName}" was modified (base=${JSON.stringify(base)}, ours=${JSON.stringify(ours)}, theirs=${JSON.stringify(theirs)})`);
+        this.fieldName = fieldName;
+        this.base = base;
+        this.ours = ours;
+        this.theirs = theirs;
+        this.name = "ImmutableViolationError";
+    }
+}
+export function mergeImmutableField(params) {
+    const { base, ours, theirs, fieldName } = params;
+    if (ours !== base || theirs !== base) {
+        throw new ImmutableViolationError(fieldName, base, ours, theirs);
+    }
+    return { value: base, changed: false };
+}
+export function mergeAdditiveField(params) {
+    const base = params.base ?? 0;
+    const ours = params.ours ?? 0;
+    const theirs = params.theirs ?? 0;
+    const value = ours + theirs - base;
+    const changed = ours !== base || theirs !== base;
+    return { value, changed };
+}
+export function mergeMaxField(params) {
+    const { base, ours, theirs } = params;
+    const value = ours > theirs ? ours : theirs;
+    const changed = value !== base;
+    return { value, changed };
+}
+//# sourceMappingURL=frontmatter-rules.js.map

package/dist/merge/frontmatter-rules.js.map

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

package/dist/merge/frontmatter.d.ts

@@ -0,0 +1,52 @@
+/**
+ * Frontmatter 整体合并入口
+ *
+ * 遍历 base/ours/theirs 的所有字段 key,按 classifyField 分发到对应规则。
+ * updatedAt_arbitrated 字段在双方都改时调 arbitrateByUpdatedAt;
+ * 返回 'escalate' 时把字段名记入 escalatedFields(调用方应该 leave markers)。
+ *
+ * `mergeFrontmatter` 是 sync 版本,只走 Layer A(机械规则)。
+ * `mergeFrontmatterAsync` 在 Layer A escalate 后,对每个 escalate 字段
+ * 追加 Layer B(LLM)调用,失败的留下 escalatedFields。
+ *
+ * contentHash / contentSize 不在此处算,由 mergeEngram 在 content 合并后回填。
+ *
+ * @module @co-engram/core/merge
+ */
+import type { EngramFrontmatter } from "../storage/engram-store.js";
+import type { LlmArbiter } from "./llm-arbiter.js";
+import type { LlmMergeInput } from "./llm-contract.js";
+export interface FrontmatterMergeOutcome {
+    readonly merged: Record<string, unknown>;
+    readonly strategy: string;
+    readonly escalatedFields: readonly string[];
+    readonly arbitratedWinner: "ours" | "theirs" | null;
+}
+export declare function mergeFrontmatter(params: {
+    base: EngramFrontmatter;
+    ours: EngramFrontmatter;
+    theirs: EngramFrontmatter;
+}): FrontmatterMergeOutcome;
+/**
+ * Async 版 frontmatter 合并,在 Layer A escalate 后追加 Layer B(LLM)兜底。
+ *
+ * 流程(spec §5.6 三层仲裁):
+ *   1. 调 sync `mergeFrontmatter` 拿到 Layer A 结果
+ *   2. 对每个 escalatedField 单独构造 LlmMergeInput(engram_frontmatter 类型)
+ *   3. 调 LlmArbiter.arbitrate → resolved 则替换字段值,从 escalatedFields 移除
+ *   4. 仍然 escalate 的字段保留在 escalatedFields,driver 写 marker
+ *
+ * 调用方需提供:
+ *   - arbiter:已配置好的 LlmArbiter
+ *   - path/relPath:engram 相对路径(写 audit + LLM prompt 用)
+ *   - meta:双边的 updatedBy/updatedAt(LLM prompt 用)
+ */
+export declare function mergeFrontmatterAsync(params: {
+    base: EngramFrontmatter;
+    ours: EngramFrontmatter;
+    theirs: EngramFrontmatter;
+    arbiter: LlmArbiter;
+    path: string;
+    meta: LlmMergeInput["meta"];
+}): Promise<FrontmatterMergeOutcome>;
+//# sourceMappingURL=frontmatter.d.ts.map

package/dist/merge/frontmatter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../src/merge/frontmatter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AASpE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC;CACrD;AAYD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE;IACvC,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,MAAM,EAAE,iBAAiB,CAAC;CAC3B,GAAG,uBAAuB,CAyH1B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,OAAO,EAAE,UAAU,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CAC7B,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA+DnC"}

package/dist/merge/frontmatter.js

@@ -0,0 +1,211 @@
+/**
+ * Frontmatter 整体合并入口
+ *
+ * 遍历 base/ours/theirs 的所有字段 key,按 classifyField 分发到对应规则。
+ * updatedAt_arbitrated 字段在双方都改时调 arbitrateByUpdatedAt;
+ * 返回 'escalate' 时把字段名记入 escalatedFields(调用方应该 leave markers)。
+ *
+ * `mergeFrontmatter` 是 sync 版本,只走 Layer A(机械规则)。
+ * `mergeFrontmatterAsync` 在 Layer A escalate 后,对每个 escalate 字段
+ * 追加 Layer B(LLM)调用,失败的留下 escalatedFields。
+ *
+ * contentHash / contentSize 不在此处算,由 mergeEngram 在 content 合并后回填。
+ *
+ * @module @co-engram/core/merge
+ */
+import { classifyField, mergeImmutableField, mergeAdditiveField, mergeMaxField, ImmutableViolationError, } from "./frontmatter-rules.js";
+import { arbitrateByUpdatedAt } from "./arbitration.js";
+function toRecord(fm) {
+    return fm;
+}
+function fieldChanged(base, side, key) {
+    return JSON.stringify(side[key]) !== JSON.stringify(base[key]);
+}
+export function mergeFrontmatter(params) {
+    const base = toRecord(params.base);
+    const ours = toRecord(params.ours);
+    const theirs = toRecord(params.theirs);
+    const allKeys = new Set([
+        ...Object.keys(base),
+        ...Object.keys(ours),
+        ...Object.keys(theirs),
+    ]);
+    const merged = {};
+    const escalatedFields = [];
+    let nAdditive = 0;
+    let nMax = 0;
+    let nArbitrated = 0;
+    let arbitratedWinner = null;
+    for (const key of allKeys) {
+        const cls = classifyField(key);
+        const baseV = base[key];
+        const oursV = ours[key];
+        const theirsV = theirs[key];
+        if (cls === "legacy_derived")
+            continue;
+        if (cls === "recomputed")
+            continue; // filled after content merge
+        if (cls === "immutable") {
+            try {
+                const r = mergeImmutableField({
+                    base: baseV,
+                    ours: oursV,
+                    theirs: theirsV,
+                    fieldName: key,
+                });
+                merged[key] = r.value;
+            }
+            catch (e) {
+                if (e instanceof ImmutableViolationError) {
+                    escalatedFields.push(key);
+                    merged[key] = baseV; // preserve base; driver will leave markers
+                }
+                else {
+                    throw e;
+                }
+            }
+            continue;
+        }
+        if (cls === "additive") {
+            const r = mergeAdditiveField({
+                base: baseV,
+                ours: oursV,
+                theirs: theirsV,
+            });
+            merged[key] = r.value;
+            nAdditive++;
+            continue;
+        }
+        if (cls === "max") {
+            const r = mergeMaxField({
+                base: baseV,
+                ours: oursV,
+                theirs: theirsV,
+            });
+            merged[key] = r.value;
+            nMax++;
+            continue;
+        }
+        // updatedAt_arbitrated
+        const oursChanged = fieldChanged(base, ours, key);
+        const theirsChanged = fieldChanged(base, theirs, key);
+        if (!oursChanged && !theirsChanged) {
+            merged[key] = baseV;
+            continue;
+        }
+        if (oursChanged && !theirsChanged) {
+            merged[key] = oursV;
+            nArbitrated++;
+            arbitratedWinner = "ours";
+            continue;
+        }
+        if (theirsChanged && !oursChanged) {
+            merged[key] = theirsV;
+            nArbitrated++;
+            arbitratedWinner = "theirs";
+            continue;
+        }
+        // both changed → arbitrate
+        const verdict = arbitrateByUpdatedAt({
+            oursUpdatedAt: ours.updatedAt,
+            theirsUpdatedAt: theirs.updatedAt,
+            baseContentHash: base.contentHash,
+            oursContentHash: ours.contentHash,
+            theirsContentHash: theirs.contentHash,
+        });
+        nArbitrated++;
+        if (verdict === "escalate") {
+            escalatedFields.push(key);
+            merged[key] = oursV; // placeholder; driver will leave markers
+            // Don't update arbitratedWinner on escalate; outcome tracks winner only on resolution
+        }
+        else {
+            merged[key] = verdict === "ours" ? oursV : theirsV;
+            arbitratedWinner = verdict;
+        }
+    }
+    const winnerLabel = escalatedFields.length > 0 && nArbitrated > 0 && arbitratedWinner === null
+        ? "escalated"
+        : (arbitratedWinner ?? "none");
+    const strategy = `frontmatter: ${nAdditive} additive + ${nMax} max + ${nArbitrated} arbitrated(${winnerLabel})`;
+    return {
+        merged,
+        strategy,
+        escalatedFields,
+        arbitratedWinner: escalatedFields.length > 0 ? null : arbitratedWinner,
+    };
+}
+/**
+ * Async 版 frontmatter 合并,在 Layer A escalate 后追加 Layer B(LLM)兜底。
+ *
+ * 流程(spec §5.6 三层仲裁):
+ *   1. 调 sync `mergeFrontmatter` 拿到 Layer A 结果
+ *   2. 对每个 escalatedField 单独构造 LlmMergeInput(engram_frontmatter 类型)
+ *   3. 调 LlmArbiter.arbitrate → resolved 则替换字段值,从 escalatedFields 移除
+ *   4. 仍然 escalate 的字段保留在 escalatedFields,driver 写 marker
+ *
+ * 调用方需提供:
+ *   - arbiter:已配置好的 LlmArbiter
+ *   - path/relPath:engram 相对路径(写 audit + LLM prompt 用)
+ *   - meta:双边的 updatedBy/updatedAt(LLM prompt 用)
+ */
+export async function mergeFrontmatterAsync(params) {
+    const { base, ours, theirs, arbiter, path, meta } = params;
+    // Step 1: Layer A (sync)
+    const layerA = mergeFrontmatter({ base, ours, theirs });
+    if (layerA.escalatedFields.length === 0) {
+        return layerA;
+    }
+    // Step 2: Layer B (LLM) — 对每个 escalate 字段尝试仲裁
+    const merged = { ...layerA.merged };
+    const stillEscalated = [];
+    const baseRec = base;
+    const oursRec = ours;
+    const theirsRec = theirs;
+    for (const fieldName of layerA.escalatedFields) {
+        const llmInput = {
+            conflictType: "engram_frontmatter",
+            path,
+            fieldName,
+            base: baseRec[fieldName],
+            ours: oursRec[fieldName],
+            theirs: theirsRec[fieldName],
+            meta,
+        };
+        const result = await arbiter.arbitrate(llmInput);
+        if (result.verdict.kind === "resolved") {
+            const output = result.verdict.output;
+            if (output.verdict === "merge" && "mergedValue" in output) {
+                merged[fieldName] = output.mergedValue;
+            }
+            else if (output.verdict === "ours") {
+                merged[fieldName] = oursRec[fieldName];
+            }
+            else if (output.verdict === "theirs") {
+                merged[fieldName] = theirsRec[fieldName];
+            }
+            // LLM resolved; field leaves escalated set
+        }
+        else {
+            // LLM escalate — preserve placeholder, leave in escalated set
+            stillEscalated.push(fieldName);
+        }
+    }
+    if (stillEscalated.length === layerA.escalatedFields.length) {
+        // LLM couldn't resolve any — return Layer A outcome unchanged
+        return layerA;
+    }
+    // Recompute strategy + arbitratedWinner
+    const resolvedCount = layerA.escalatedFields.length - stillEscalated.length;
+    const winnerLabel = stillEscalated.length > 0 ? "partial-llm" : "llm-resolved";
+    const strategy = `${layerA.strategy} + llm:${resolvedCount} resolved, ${stillEscalated.length} escalated`;
+    return {
+        merged,
+        strategy,
+        escalatedFields: stillEscalated,
+        arbitratedWinner: stillEscalated.length > 0 ? null : "ours",
+        // Note: 当 LLM 完全解决时设 arbitratedWinner=ours 仅表示 "已解决";
+        // 真正的双边 winner 语义由 mergeEngramFile 整合时给 content merge 决定。
+    };
+}
+//# sourceMappingURL=frontmatter.js.map

package/dist/merge/frontmatter.js.map

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

package/dist/merge/index.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @module @co-engram/core/merge
+ *
+ * Public exports for the git merge driver subsystem.
+ * Host packages (openclaw-plugin, claude-code-mcp) consume via this barrel
+ * in Phase 2 when wiring auto-onboard.
+ */
+export * from "./version.js";
+export * from "./backup.js";
+export * from "./frontmatter-rules.js";
+export * from "./arbitration.js";
+export * from "./frontmatter.js";
+export * from "./content.js";
+export * from "./merge-engram.js";
+export * from "./synapse-rules.js";
+export * from "./evidence-union.js";
+export * from "./resolution-state.js";
+export * from "./synapse-merger.js";
+export * from "./data-root.js";
+export * from "./driver-main.js";
+export * from "./onboard.js";
+export * from "./auto-onboard.js";
+export * from "./llm-contract.js";
+export * from "./llm-prompt.js";
+export * from "./llm-arbiter.js";
+export * from "./driver-llm.js";
+export * from "./cross-file-coordinator.js";
+export * from "./post-merge-hook.js";
+export * from "./merge-stats.js";
+export * from "./anomaly-detector.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/merge/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/dist/merge/index.js

@@ -0,0 +1,31 @@
+/**
+ * @module @co-engram/core/merge
+ *
+ * Public exports for the git merge driver subsystem.
+ * Host packages (openclaw-plugin, claude-code-mcp) consume via this barrel
+ * in Phase 2 when wiring auto-onboard.
+ */
+export * from "./version.js";
+export * from "./backup.js";
+export * from "./frontmatter-rules.js";
+export * from "./arbitration.js";
+export * from "./frontmatter.js";
+export * from "./content.js";
+export * from "./merge-engram.js";
+export * from "./synapse-rules.js";
+export * from "./evidence-union.js";
+export * from "./resolution-state.js";
+export * from "./synapse-merger.js";
+export * from "./data-root.js";
+export * from "./driver-main.js";
+export * from "./onboard.js";
+export * from "./auto-onboard.js";
+export * from "./llm-contract.js";
+export * from "./llm-prompt.js";
+export * from "./llm-arbiter.js";
+export * from "./driver-llm.js";
+export * from "./cross-file-coordinator.js";
+export * from "./post-merge-hook.js";
+export * from "./merge-stats.js";
+export * from "./anomaly-detector.js";
+//# sourceMappingURL=index.js.map

package/dist/merge/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/merge/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC"}

package/dist/merge/llm-arbiter.d.ts

@@ -0,0 +1,85 @@
+/**
+ * LLM merge arbitrator (spec §5).
+ *
+ * 接受 LlmClient + confidence threshold,把 LlmMergeInput 翻译成一次 LLM 调用,
+ * 解析输出,应用置信度阈值,失败一律降级到 escalate(留 marker)。
+ *
+ * 不重试(spec §5.5):失败就降级,backup + audit 兜底。
+ *
+ * @module @co-engram/core/merge
+ */
+import type { LlmClient } from "../observability/necessity-evaluator.js";
+import type { AuditLog } from "../observability/audit-log.js";
+import { type LlmMergeInput, type LlmMergeOutput, type LlmOutputParseFailure } from "./llm-contract.js";
+/**
+ * 默认置信度阈值(spec §5.5)。
+ *
+ * 低于此值的输出按 escalate 处理 —— 调用方应保留 marker,留给人工解决。
+ */
+export declare const DEFAULT_LLM_CONFIDENCE_THRESHOLD = 0.7;
+/**
+ * 默认超时(spec §5.5):15s,merge driver 必须 block 但不能拖死 git pull。
+ */
+export declare const DEFAULT_LLM_TIMEOUT_MS = 15000;
+/**
+ * 默认 token 预算(spec §5.5):input < 1000, output < 200。
+ */
+export declare const DEFAULT_LLM_MAX_OUTPUT_TOKENS = 200;
+export type LlmArbiterVerdict = {
+    readonly kind: "resolved";
+    readonly output: LlmMergeOutput;
+} | {
+    readonly kind: "escalated";
+    readonly reason: EscalationReason;
+};
+export type EscalationReason = "llm_call_failed" | "parse_failed" | "low_confidence" | "verdict_escalate";
+export interface LlmArbiterResult {
+    /** 最终裁决(resolved=可执行,escalated=留 marker) */
+    readonly verdict: LlmArbiterVerdict;
+    /** 实际耗时(ms) */
+    readonly latencyMs: number;
+    /** LLM 原始返回(诊断用;escalated 时也可能有值) */
+    readonly rawResponse?: string;
+    /** 解析错误(parse_failed 时填) */
+    readonly parseFailure?: LlmOutputParseFailure;
+    /** prompt 哈希(短 SHA256,前 12 hex)—— 落 audit 用于 prompt drift 检测 */
+    readonly promptHash: string;
+}
+export interface LlmArbiterConfig {
+    readonly client: LlmClient;
+    readonly confidenceThreshold?: number;
+    readonly timeoutMs?: number;
+    readonly maxOutputTokens?: number;
+    readonly temperature?: number;
+    readonly auditLog?: AuditLog;
+    /** 用于 audit 记录的 provider 名(如 'anthropic' / 'openai-compatible') */
+    readonly providerName?: string;
+}
+/**
+ * LLM 仲裁器 —— 把机械规则解决不了的冲突交给 LLM。
+ *
+ * 调用方:
+ * ```ts
+ * const arbiter = new LlmArbiter({ client, auditLog, providerName: 'anthropic' });
+ * const result = await arbiter.arbitrate(input);
+ * if (result.verdict.kind === 'resolved') {
+ *   applyMerge(result.verdict.output);
+ * } else {
+ *   writeConflictMarkers();
+ * }
+ * ```
+ */
+export declare class LlmArbiter {
+    private readonly client;
+    private readonly confidenceThreshold;
+    private readonly timeoutMs;
+    private readonly maxOutputTokens;
+    private readonly temperature;
+    private readonly auditLog?;
+    private readonly providerName?;
+    constructor(config: LlmArbiterConfig);
+    arbitrate(input: LlmMergeInput): Promise<LlmArbiterResult>;
+    private auditSuccess;
+    private auditFailure;
+}
+//# sourceMappingURL=llm-arbiter.d.ts.map

package/dist/merge/llm-arbiter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"llm-arbiter.d.ts","sourceRoot":"","sources":["../../src/merge/llm-arbiter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC3B,MAAM,mBAAmB,CAAC;AAM3B;;;;GAIG;AACH,eAAO,MAAM,gCAAgC,MAAM,CAAC;AAEpD;;GAEG;AACH,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C;;GAEG;AACH,eAAO,MAAM,6BAA6B,MAAM,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;CAAE,GAC9D;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAEtE,MAAM,MAAM,gBAAgB,GACxB,iBAAiB,GACjB,cAAc,GACd,gBAAgB,GAChB,kBAAkB,CAAC;AAEvB,MAAM,WAAW,gBAAgB;IAC/B,4CAA4C;IAC5C,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,eAAe;IACf,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,4BAA4B;IAC5B,QAAQ,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC;IAC9C,gEAAgE;IAChE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAC3B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,mEAAmE;IACnE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAY;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAS;gBAE3B,MAAM,EAAE,gBAAgB;IAY9B,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4EhE,OAAO,CAAC,YAAY;IA8BpB,OAAO,CAAC,YAAY;CAyBrB"}