driftseal 1.1.1 → 1.1.3

package/README.md

@@ -132,6 +132,7 @@ The v1 server provides:
 | --- | --- |
 | `driftseal_status`, `driftseal_log` | Read the current intent and intent history. |
 | `driftseal_begin`, `driftseal_end` | Open and honestly close a work round. |
+| `driftseal_absorb` | Repair merge collisions or absorb another worktree's logs while remapping colliding IDs. |
 | `driftseal_reclaim`, `driftseal_unreclaim` | Hide meaningless closed records behind append-only markers, or restore them. |
 | `driftseal_decision_list`, `driftseal_decision_show` | Find and read MADR records. |
 | `driftseal_decision_add`, `driftseal_decision_update` | Add selective decisions and reconcile linked ones. |
@@ -139,6 +140,12 @@ The v1 server provides:
 | `driftseal://intents/recent` | Read the ten most recent intents as a JSON resource. |
 | `driftseal://decisions` | Read the decision catalog as a JSON resource. |
 
+`driftseal_absorb` accepts optional incoming intent-log and decision-directory
+paths, an `ours` or `theirs` abandon strategy, and a dry-run mode. Incoming
+paths are read-only sources; all repaired output stays under the repository
+fixed at server startup. The Git merge-driver form remains a CLI-only plumbing
+command.
+
 MCP changes only the execution surface. It does not add policy beyond the
 repository's `AGENTS.md`, and the companion skill remains limited to discovery
 and recovery guidance.

package/README.zh-CN.md

@@ -128,6 +128,7 @@ v1 server 提供：
 | --- | --- |
 | `driftseal_status`, `driftseal_log` | 读取当前 intent 和 intent 历史。 |
 | `driftseal_begin`, `driftseal_end` | 开启并诚实关闭一轮工作。 |
+| `driftseal_absorb` | 修复 merge 撞号，或吸收另一条 worktree 日志并重编号冲突 ID。 |
 | `driftseal_reclaim`, `driftseal_unreclaim` | 用 append-only 标记隐藏已无意义的已关闭记录，或将其恢复。 |
 | `driftseal_decision_list`, `driftseal_decision_show` | 查找并读取 MADR record。 |
 | `driftseal_decision_add`, `driftseal_decision_update` | 克制地增加 decision，并 reconcile 已关联的 decision。 |
@@ -135,6 +136,10 @@ v1 server 提供：
 | `driftseal://intents/recent` | 以 JSON resource 读取最近十条 intent。 |
 | `driftseal://decisions` | 以 JSON resource 读取 decision catalog。 |
 
+`driftseal_absorb` 可以接收另一份 intent log、decision 目录、`ours` 或 `theirs`
+放弃策略，以及 dry-run 模式。传入的路径只作为只读来源；修复后的内容仍只会写入
+server 启动时固定的 repository。Git merge driver 形式仍是 CLI 专用的底层命令。
+
 MCP 只替换执行入口，不会在 repository 的 `AGENTS.md` 之外增加 policy；
 配套 skill 也仍只负责发现与恢复工作流。
 

package/bin/driftseal-mcp.js

@@ -88,6 +88,19 @@ function registerTools(server, api, z) {
     file: z.string(),
   });
   const decisionWithContent = decisionRecord.extend({ content: z.string() });
+  const absorbResult = z.object({
+    mappings: z.array(
+      z.object({
+        kind: z.enum(['intent', 'decision']),
+        from: z.string(),
+        to: z.string(),
+      })
+    ),
+    abandoned: z.string().nullable(),
+    copies: z.array(z.string()),
+    outputFile: z.string(),
+    exitCode: z.number().int(),
+  });
   const closedStatus = z.enum(END_STATUSES);
   const decisionStatus = z.enum(DECISION_STATUSES);
   const decisionId = z.string().regex(/^\d+$/, 'decision id must contain only digits');
@@ -181,6 +194,41 @@ function registerTools(server, api, z) {
       })
   );
 
+  server.registerTool(
+    'driftseal_absorb',
+    {
+      title: 'Absorb another DriftSeal lineage',
+      description:
+        'Repair the fixed repository after a merge collision or absorb another worktree\'s intent and decision logs, remapping colliding IDs. Omit otherLog to repair the current repository. This rewrites only the fixed repository; incoming paths are read-only sources.',
+      inputSchema: {
+        otherLog: z
+          .string()
+          .optional()
+          .describe('Incoming events.jsonl path. Relative paths resolve from the fixed repository.'),
+        otherDecisions: z
+          .string()
+          .optional()
+          .describe('Incoming decision directory. Relative paths resolve from the fixed repository.'),
+        abandon: z
+          .enum(['ours', 'theirs'])
+          .optional()
+          .describe('Side whose open intent to abandon when both lineages have one in progress.'),
+        dryRun: z.boolean().default(false),
+      },
+      outputSchema: { root: z.string(), result: absorbResult },
+      annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: false },
+    },
+    async (input) =>
+      guarded(() => {
+        const result = api.absorb(input);
+        const action = input.dryRun ? 'Absorb dry run' : 'Absorb';
+        return success(
+          { root: api.root, result },
+          `${action} completed with ${result.mappings.length} ID remapping(s).`
+        );
+      })
+  );
+
   server.registerTool(
     'driftseal_reclaim',
     {

package/bin/driftseal.js

@@ -1686,7 +1686,7 @@ function directoryDigest(directory) {
   function visit(current, relative) {
     const stat = fs.lstatSync(current);
     if (stat.isDirectory()) {
-      digest.update(`directory\0${relative}\0${stat.mode & 0o777}\0`);
+      digest.update(`directory\0${relative}\0`);
       for (const name of fs.readdirSync(current).sort()) {
         visit(path.join(current, name), relative ? path.join(relative, name) : name);
       }
@@ -1709,6 +1709,19 @@ function directoryDigest(directory) {
   return digest.digest('hex');
 }
 
+function preserveRegularFileModes(source, destination) {
+  for (const name of fs.readdirSync(source)) {
+    const sourcePath = path.join(source, name);
+    const destinationPath = path.join(destination, name);
+    const stat = fs.lstatSync(sourcePath);
+    if (stat.isDirectory()) {
+      preserveRegularFileModes(sourcePath, destinationPath);
+    } else if (stat.isFile()) {
+      fs.chmodSync(destinationPath, stat.mode & 0o777);
+    }
+  }
+}
+
 function installSkill(request) {
   const { force, root, scope, skillDir, skillsDir, target, targetLabel } = request;
   const sourceDir = path.join(__dirname, '..', 'skills', SKILL_NAME);
@@ -1736,6 +1749,7 @@ function installSkill(request) {
   let movedExisting = false;
   try {
     fs.cpSync(sourceDir, temporary, { recursive: true, errorOnExist: true });
+    preserveRegularFileModes(sourceDir, temporary);
     if (existingDigest !== null) {
       fs.renameSync(skillDir, backup);
       movedExisting = true;
@@ -2301,6 +2315,7 @@ function planDecisionAbsorb({ oursEntries, theirsEntries, baseEntries = [], base
   const mappings = [];
   const copies = [];
   const decisionMap = new Map();
+  const hashMap = new Map();
   const usedIds = new Set(oursEntries.map((entry) => entry.id));
   const oursById = new Map();
   const baseById = new Map();
@@ -2377,17 +2392,21 @@ function planDecisionAbsorb({ oursEntries, theirsEntries, baseEntries = [], base
     usedIds.add(newId);
     decisionMap.set(entry.id, newId);
     mappings.push({ kind: 'decision', from: entry.id, to: newId });
+    const rewritten = rewriteDecisionId(theirsContent, newId);
+    const originalHash = contentHash(theirsContent);
+    const rewrittenHash = contentHash(rewritten);
+    if (originalHash !== rewrittenHash) hashMap.set(originalHash, rewrittenHash);
     copies.push({
       fromFile: entry.file,
       toFile: `${newId}-${decisionSlugFromFile(entry.file)}.md`,
-      content: rewriteDecisionId(theirsContent, newId),
+      content: rewritten,
       removeFile: entry.file !== ours.file ? entry.file : null,
     });
   }
-  return { decisionMap, mappings, copies };
+  return { decisionMap, hashMap, mappings, copies };
 }
 
-function remapEvent(event, intentMap, decisionMap) {
+function remapEvent(event, intentMap, decisionMap, hashMap = new Map()) {
   const next = { ...event };
   if (intentMap.has(event.id)) next.id = intentMap.get(event.id);
   if (Array.isArray(next.decisions) && next.decisions.length > 0) {
@@ -2400,10 +2419,15 @@ function remapEvent(event, intentMap, decisionMap) {
     const normalized = normalizeDecisionId(next.decisionId);
     if (decisionMap.has(normalized)) next.decisionId = decisionMap.get(normalized);
   }
+  for (const field of ['oldHash', 'newHash', 'fileHash']) {
+    if (typeof next[field] === 'string' && hashMap.has(next[field])) {
+      next[field] = hashMap.get(next[field]);
+    }
+  }
   return next;
 }
 
-function remapTheirsRecords(theirsNew, oursUsedEvents, decisionMap) {
+function remapTheirsRecords(theirsNew, oursUsedEvents, decisionMap, hashMap = new Map()) {
   const intentMap = new Map();
   const mappings = [];
   const used = [...oursUsedEvents];
@@ -2415,14 +2439,14 @@ function remapTheirsRecords(theirsNew, oursUsedEvents, decisionMap) {
       intentMap.set(event.id, newId);
       mappings.push({ kind: 'intent', from: event.id, to: newId });
     }
-    event = remapEvent(event, intentMap, decisionMap);
+    event = remapEvent(event, intentMap, decisionMap, hashMap);
     used.push(event);
     return { event };
   });
   return { records, mappings };
 }
 
-function repairDuplicateIntentRecords(records, decisionMap) {
+function repairDuplicateIntentRecords(records, decisionMap, hashMap = new Map()) {
   const seenBegins = new Set();
   const intentMap = new Map();
   const used = [];
@@ -2440,7 +2464,12 @@ function repairDuplicateIntentRecords(records, decisionMap) {
     } else if (event.type === 'begin') {
       seenBegins.add(event.id);
     }
-    const remapped = remapEvent(event, intentMap, incomingSide ? decisionMap : new Map());
+    const remapped = remapEvent(
+      event,
+      intentMap,
+      incomingSide ? decisionMap : new Map(),
+      incomingSide ? hashMap : new Map()
+    );
     const changed = remapped !== event && JSON.stringify(remapped) !== JSON.stringify(event);
     result.push(changed ? { event: remapped } : record);
     used.push(result.at(-1).event);
@@ -2658,7 +2687,8 @@ function absorbFromStreams(ours, theirs, baseRecords, options) {
   const remapped = remapTheirsRecords(
     streams.theirsNew,
     [...streams.base, ...streams.oursNew].map((record) => record.event),
-    decisionPlan.decisionMap
+    decisionPlan.decisionMap,
+    decisionPlan.hashMap
   );
   const result = [...streams.base, ...streams.oursNew, ...remapped.records];
   return finishAbsorb({
@@ -2755,7 +2785,11 @@ function absorbLogs(otherFile, otherDecisions, { abandon, dryRun }) {
       baseEntries: gitBase ? gitDecisionEntries(gitBase) : [],
       baseIds: gitBase ? gitDecisionIds(gitBase) : new Set(),
     });
-    const repaired = repairDuplicateIntentRecords(loaded.records, decisionPlan.decisionMap);
+    const repaired = repairDuplicateIntentRecords(
+      loaded.records,
+      decisionPlan.decisionMap,
+      decisionPlan.hashMap
+    );
     if (decisionPlan.mappings.length > 0 && !repaired.incomingSide) {
       fail(
         'cannot determine which intent records own the duplicate decision; ' +
@@ -3568,6 +3602,17 @@ function createApi({ root = process.cwd(), isolateStorage = false } = {}) {
       if (all) argv.push('--all');
       return call(argv);
     },
+    absorb({ otherLog, otherDecisions, abandon, dryRun = false } = {}) {
+      if (abandon && !['ours', 'theirs'].includes(abandon)) {
+        fail('absorb abandon must be "ours" or "theirs"');
+      }
+      const argv = ['absorb'];
+      if (otherLog) argv.push(String(otherLog));
+      appendFlag(argv, '--decisions', otherDecisions);
+      if (abandon) argv.push(`--abandon-${abandon}`);
+      if (dryRun) argv.push('--dry-run');
+      return call(argv);
+    },
     reclaim({ ids = [], reason, olderThan, force = false, dryRun = false }) {
       const argv = ['reclaim', ...ids.map(String), '--reason', reason];
       appendFlag(argv, '--older-than', olderThan);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "driftseal",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Seal intent, verification, and decisions into an auditable workflow for agentic coding",
   "keywords": [
     "driftseal",