@co-engram/core 0.1.3 → 0.1.5

package/dist/merge/post-merge-hook.js

@@ -159,6 +159,20 @@ export async function runPostMergeCheck(params) {
         };
     }
     const auditLog = new AuditLog(dataRoot);
+    // ─── 索引重建(spec §7.5 关键补丁)──────────────────────────────────
+    // git pull 拉到的 .md 不进入 engram-index.json → "engram_search 找不到"
+    // fail-silent。post-merge 是补全索引的最佳时机:此时工作区已稳定,
+    // 拉到的 .md 全部在磁盘上。runDoctor({ incremental: true }) 增量扫描,
+    // 把新文件纳入索引 + 清理孤儿 entry + 修复 frontmatter,完成"git pull →
+    // 索引同步"的最后一公里。失败不阻塞后续 cross-file check(各 try/catch 独立)。
+    let doctorAutoFixed = 0;
+    try {
+        const doctorReport = repo.runDoctor({ incremental: true });
+        doctorAutoFixed = doctorReport.fixes.length;
+    }
+    catch {
+        // doctor 失败不阻塞 cross-file check,记 0 即可
+    }
     // 复用 driver 的 LLM bootstrap(可选)
     const llmBootstrap = createDriverLlmClient();
     const llmArbiter = llmBootstrap
@@ -177,7 +191,7 @@ export async function runPostMergeCheck(params) {
         return {
             dataRoot,
             inconsistencies: report.inconsistencies.length,
-            autoFixed: report.autoFixedCount,
+            autoFixed: report.autoFixedCount + doctorAutoFixed,
             escalated: report.llmEscalatedCount,
             durationMs: Date.now() - startedAt,
         };
@@ -186,7 +200,7 @@ export async function runPostMergeCheck(params) {
         return {
             dataRoot,
             inconsistencies: 0,
-            autoFixed: 0,
+            autoFixed: doctorAutoFixed,
             escalated: 0,
             durationMs: Date.now() - startedAt,
             error: e instanceof Error ? e.message : String(e),

package/dist/merge/post-merge-hook.js.map

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

package/dist/merge-driver.cjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// co-engram-merge-driver v0.1.3
+// co-engram-merge-driver v0.1.5
 // Auto-generated by pnpm build:merge-driver. Do not edit by hand.
 "use strict";
 var __create = Object.create;

package/dist/observability/proposal-engine.d.ts

@@ -41,9 +41,39 @@ export interface TopicCluster {
     /** 最后见到时间 */
     readonly lastSeenAt: string;
 }
+/** Proposal 来源:对话流聚类 / Claude Code auto-memory 文件 / 外部 .md 检测 */
+export type ProposalSource = "conversation" | "auto-memory" | "external-markdown";
+/**
+ * 预填的 engram 字段(auto-memory 与 external-markdown 来源共用)
+ *
+ * 对话流聚类的 proposal 不携带 payload —— 仅有 sampleQuotes/centroidExcerpt
+ * 片段,LLM 在 accept 时需自行具象化 title/content。
+ *
+ * auto-memory / external-markdown 来源的 proposal 携带完整 payload —— 文件
+ * 本身已是完整内容,accept 时可直接用 payload 创建 engram,LLM 无需重复填表。
+ *
+ * external-markdown 来源额外携带 `sourcePath`(原始 .md 在 dataRoot 中的相对
+ * 路径,用于 accept 时移动/重写文件)。
+ */
+export interface ProposalPayload {
+    readonly title: string;
+    readonly content: string;
+    readonly summary?: string;
+    readonly domainTags: readonly string[];
+    readonly contextTags?: readonly string[];
+    readonly kind: EngramCreateInput["kind"];
+    readonly createdBy?: string;
+    readonly sourceType?: EngramCreateInput["sourceType"];
+    readonly importance?: number;
+    readonly visibility?: EngramCreateInput["visibility"];
+    readonly decayHalfLifeDays?: number | null;
+    readonly encodingContext?: string;
+    /** external-markdown 专用:文件在 dataRoot 内的相对路径 */
+    readonly sourcePath?: string;
+}
 /** 候选提案 */
 export interface Proposal {
-    /** 关联的 cluster id */
+    /** 关联的 cluster id / `am:<slug>`(auto-memory) / `ext:<relpath-hash>`(external-markdown) */
     readonly entityId: string;
     /** 出现次数(snapshot) */
     readonly occurrences: number;
@@ -71,7 +101,33 @@ export interface Proposal {
     readonly necessityRule?: string;
     /** LLM 建议的标题(可作审批草稿) */
     readonly suggestedTitle?: string;
+    /** 来源标识:对话流聚类(默认,向前兼容)/ auto-memory 文件 / 外部 .md 检测 */
+    readonly source?: ProposalSource;
+    /** auto-memory 来源时的可读 slug(用于 list/audit 展示) */
+    readonly slug?: string;
+    /** external-markdown 来源时的相对路径(用于 list/audit 展示) */
+    readonly sourcePath?: string;
+    /** 预填的 engram 字段(auto-memory / external-markdown 来源专用;conversation 来源恒为 undefined) */
+    readonly payload?: ProposalPayload;
 }
+/** auto-memory proposal 的 entityId 前缀(命名空间隔离,永不与对话聚类 `c<dim>-<hash>` 冲突) */
+export declare const AUTO_MEMORY_PROPOSAL_PREFIX = "am:";
+/** external-markdown proposal 的 entityId 前缀(命名空间隔离,永不与其他来源冲突) */
+export declare const EXTERNAL_MARKDOWN_PROPOSAL_PREFIX = "ext:";
+/** 由 slug 构造 auto-memory proposal 的 entityId */
+export declare function autoMemoryEntityId(slug: string): string;
+/** 判断 entityId 是否来自 auto-memory */
+export declare function isAutoMemoryProposal(entityId: string): boolean;
+/**
+ * 由 dataRoot 内相对路径构造 external-markdown proposal 的 entityId。
+ *
+ * 使用短 hash(SHA-256 前 16 字符)而非原路径,因为路径可能含 `/` 等不友好字符,
+ * 且 entityId 在 audit log / proposals.json 中作为 key 频繁出现,短 hash 更紧凑。
+ * 同一文件反复触发 watcher → 同一 entityId → proposeExternalMarkdown 幂等去重。
+ */
+export declare function externalMarkdownEntityId(relativePath: string): string;
+/** 判断 entityId 是否来自 external-markdown */
+export declare function isExternalMarkdownProposal(entityId: string): boolean;
 /** Proposal Engine 配置 */
 export interface ProposalEngineConfig {
     /** 触发阈值(默认 3) */
@@ -140,21 +196,125 @@ export declare class ProposalEngine {
     /**
      * 接受提案 → 创建 engram
      *
+     * 当 proposal 自带 payload(auto-memory 来源)且调用方未传 title/content/domainTags/kind 时,
+     * 从 payload 兜底 —— 这让 LLM 可直接 `accept(entityId)` 而无需重复填表。
+     * conversation 来源的 proposal(payload=undefined)仍要求调用方显式传 title/content。
+     *
      * @returns 新建的 engram id
      */
     accept(entityId: string, input: {
+        readonly title?: string;
+        readonly content?: string;
+        readonly domainTags?: readonly string[];
+        readonly createdBy?: string;
+        readonly kind?: EngramCreateInput["kind"];
+    }): string;
+    /**
+     * 把 Claude Code auto-memory 文件作为 pending proposal 写入仓库
+     *
+     * 与 `observe()`(对话流聚类)不同的地方:
+     *   - 不走 embedder/cluster/necessity-evaluator 路径
+     *   - 文件本身已是完整内容,直接作为 payload 携带
+     *   - entityId 用 `am:<slug>` 命名空间,永不与对话聚类的 `c<dim>-<hash>` 冲突
+     *
+     * 幂等行为:
+     *   - 已 accepted → 跳过(避免重开已审批项;源文件变化不影响已落库的 engram)
+     *   - 已 pending 且 payload fingerprint 相同 → 跳过(no-change)
+     *   - 已 pending 且 payload 变化 → upsert(payload + lastSeenAt 更新)
+     *   - 不存在 → 创建 pending proposal
+     *
+     * @returns 写入动作(用于上层日志统计)
+     */
+    proposeAutoMemory(input: {
+        readonly slug: string;
         readonly title: string;
         readonly content: string;
+        readonly summary?: string;
         readonly domainTags: readonly string[];
+        readonly contextTags?: readonly string[];
+        readonly kind: EngramCreateInput["kind"];
         readonly createdBy?: string;
-        readonly kind?: EngramCreateInput["kind"];
-    }): string;
+        readonly sourceType?: EngramCreateInput["sourceType"];
+        readonly importance?: number;
+        readonly visibility?: EngramCreateInput["visibility"];
+        readonly decayHalfLifeDays?: number | null;
+        readonly encodingContext?: string;
+        readonly at?: string;
+    }): "proposed" | "updated" | "no-change";
+    /**
+     * 外部 .md 检测入口:由 EngramRepository.scanForExternalMarkdown 通过
+     * host 适配层的钩子调用,把 dataRoot 下未追踪的 .md 转成待审批 proposal。
+     *
+     * 与 `proposeAutoMemory` 的差异:
+     *   - entityId 用 `ext:<relpath-hash>` 命名空间,与 am: / 对话聚类永不冲突
+     *   - 必须携带 sourcePath(accept 时用它定位原始 .md 做移动/重命名)
+     *   - 来源标识为 `external-markdown`(用于 viewer / audit 区分)
+     *
+     * 信任语义(关键):
+     *   - auto-memory:Claude Code 写的 .claude/projects/.../memory/ 文件,
+     *     半信任(已是 Claude 的输出),accept 时复制内容到 dataRoot
+     *   - external-markdown:用户拷贝/IDE 写入/rsync 等无明确来源的 .md,
+     *     **不信任**,accept 时由 host 决定如何处理(典型:移动到 canonical 路径)
+     *
+     * 幂等行为(与 proposeAutoMemory 一致):
+     *   - 已 accepted → 跳过(避免重开已审批项)
+     *   - 已 pending 且 payload fingerprint 相同 → 跳过(no-change)
+     *   - 已 pending 且 payload 变化 → upsert
+     *   - 已 dismissed → 跳过(永久驳回)
+     *   - 不存在 → 创建 pending proposal
+     *
+     * @returns 写入动作(用于上层日志统计)
+     */
+    proposeExternalMarkdown(input: {
+        readonly sourcePath: string;
+        readonly title: string;
+        readonly content: string;
+        readonly summary?: string;
+        readonly domainTags: readonly string[];
+        readonly contextTags?: readonly string[];
+        readonly kind: EngramCreateInput["kind"];
+        readonly createdBy?: string;
+        readonly sourceType?: EngramCreateInput["sourceType"];
+        readonly importance?: number;
+        readonly visibility?: EngramCreateInput["visibility"];
+        readonly decayHalfLifeDays?: number | null;
+        readonly encodingContext?: string;
+        readonly at?: string;
+    }): "proposed" | "updated" | "no-change";
+    /**
+     * 把"watcher 发现的外部 .md"转成 proposeExternalMarkdown 调用的工厂。
+     *
+     * 供 host 适配层(claude-code-mcp / openclaw-plugin)使用,确保两宿主用
+     * 同一份字段映射逻辑(避免漂移)。
+     *
+     * 行为:
+     *   - parsed 为 null → noop(裸 .md,不进入提案流程)
+     *   - frontmatter 缺 title 或 kind → noop(无法构成最小 engram)
+     *   - domainTags 缺失 → 默认 `["imported"]`,accept 时用户可调整
+     *   - createdBy 缺失 → 不传(由 engram_create 走 defaultCreatedBy 兜底)
+     *
+     * @returns 符合 EngramRepository.setExternalMarkdownHook 签名的回调
+     */
+    createExternalMarkdownHook(): (params: {
+        readonly absPath: string;
+        readonly relPath: string;
+        readonly raw: string;
+        readonly parsed: {
+            readonly frontmatter: {
+                readonly [key: string]: unknown;
+            };
+        } | null;
+    }) => void;
     /**
      * 拒绝提案
      *
+     * 默认**永久驳回**(dismissedUntil = undefined),不再自动重新浮出。
+     * 若调用方显式传 dismissDays > 0,则 N 天后该 proposal 可被 proposeAutoMemory/
+     * proposeExternalMarkdown/observe 流程重新激活(向后兼容旧行为)。
+     *
      * @param entityId 簇 id
      * @param reason 拒绝原因(可选,便于元学习)
-     * @param dismissDays 多少天内不再提示(默认 30)
+     * @param dismissDays N 天后可重新激活;0 / undefined = 永久
      */
     dismiss(entityId: string, reason?: string, dismissDays?: number): void;
     /** 清理过期/已处理数据(测试用) */

package/dist/observability/proposal-engine.d.ts.map

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