mancode 0.3.17 → 0.3.18

package/README.en.md

@@ -17,7 +17,7 @@
 <p align="center">
   <a href="./LICENSE"><img src="https://img.shields.io/badge/License-AGPL--3.0-blue.svg?style=flat-square" alt="License: AGPL-3.0" /></a>
   <a href="https://www.npmjs.com/package/mancode"><img src="https://img.shields.io/npm/v/mancode?style=flat-square" alt="npm version" /></a>
-  <img src="https://img.shields.io/badge/status-Continuity%20v0.3.17-2f855a?style=flat-square" alt="Status: mancode Continuity v0.3.17" />
+  <img src="https://img.shields.io/badge/status-Continuity%20v0.3.18-2f855a?style=flat-square" alt="Status: mancode Continuity v0.3.18" />
   <img src="https://img.shields.io/badge/platforms-Claude%20Code%20%7C%20Cursor%20%7C%20Codex%20%7C%20Copilot%20%7C%20ZCode-5865F2?style=flat-square" alt="Platforms: Claude Code, Cursor, Codex in ChatGPT desktop and CLI, GitHub Copilot, ZCode" />
 </p>
 
@@ -353,7 +353,7 @@ it should behave, and why previous decisions were made.
 
 ## Installation
 
-**Status**: mancode Continuity v0.3.17. Claude Code, Cursor, Codex in the ChatGPT
+**Status**: mancode Continuity v0.3.18. Claude Code, Cursor, Codex in the ChatGPT
 desktop app and CLI, GitHub Copilot, and ZCode adapters are included.
 
 Requires Node.js 20 or newer. macOS, Linux, Windows CMD, PowerShell, and Git Bash
@@ -452,7 +452,7 @@ mancode version
 Simplified output:
 
 ```text
-mancode v0.3.17
+mancode v0.3.18
 
 Project:     my-app
 Runtime:     ready

package/README.md

@@ -17,7 +17,7 @@
 <p align="center">
   <a href="./LICENSE"><img src="https://img.shields.io/badge/License-AGPL--3.0-blue.svg?style=flat-square" alt="许可证：AGPL-3.0" /></a>
   <a href="https://www.npmjs.com/package/mancode"><img src="https://img.shields.io/npm/v/mancode?style=flat-square" alt="npm 版本" /></a>
-  <img src="https://img.shields.io/badge/status-Continuity%20v0.3.17-2f855a?style=flat-square" alt="状态：mancode Continuity v0.3.17" />
+  <img src="https://img.shields.io/badge/status-Continuity%20v0.3.18-2f855a?style=flat-square" alt="状态：mancode Continuity v0.3.18" />
   <img src="https://img.shields.io/badge/platforms-Claude%20Code%20%7C%20Cursor%20%7C%20Codex%20%7C%20Copilot%20%7C%20ZCode-5865F2?style=flat-square" alt="平台：Claude Code、Cursor、ChatGPT 桌面端 Codex、Codex CLI、GitHub Copilot、ZCode" />
 </p>
 
@@ -307,7 +307,7 @@ src/components/
 
 ## 安装
 
-**状态**：mancode Continuity v0.3.17。Claude Code、Cursor、ChatGPT 桌面端中的
+**状态**：mancode Continuity v0.3.18。Claude Code、Cursor、ChatGPT 桌面端中的
 Codex、Codex CLI、GitHub Copilot 和 ZCode adapter 均已接入。
 
 需要 Node.js 20 或更高版本。原生支持 macOS、Linux、Windows CMD、
@@ -404,7 +404,7 @@ mancode version
 以下是简化输出示例：
 
 ```text
-mancode v0.3.17
+mancode v0.3.18
 
 Project:     my-app
 Runtime:     ready

package/dist/cli.js

@@ -18954,10 +18954,10 @@ async function materializeGitRefTaskBundle(input) {
   const store = resolveCoordinationEntityHomeStore(
     runtime.entityHomeStoreContext
   );
-  const locks = await acquireEntityLocks(
+  const locks = input.taskLockHeld ? [] : await acquireEntityLocks(
     store,
     operationId,
-    [`remote_task:${bundle.taskRef.taskId}`],
+    [taskEntityKey(bundle.taskRef)],
     { now }
   );
   try {
@@ -18993,6 +18993,16 @@ async function materializeGitRefTaskBundle(input) {
       throw new Error("MANCODE_SPLIT_BRAIN");
     }
     const materializedPredecessor = status2 === "created" ? null : effectivePredecessor;
+    if (status2 === "unchanged" && currentFence !== null && taskHeadFenceMatchesTarget({
+      currentFence,
+      runtime,
+      remoteRevision,
+      ownershipFence,
+      bundle
+    })) {
+      await recordGitRefTaskRemoteBase(projectRoot, remoteRevision, bundle);
+      return result(status2, bundle, null, currentFence);
+    }
     const targetFence = buildTargetFence({
       runtime,
       remoteRevision,
@@ -19003,7 +19013,12 @@ async function materializeGitRefTaskBundle(input) {
       now
     });
     if (status2 === "unchanged") {
-      await writeTargetFence(store, currentFence, targetFence, predecessor);
+      await writeTargetFence(
+        store,
+        currentFence,
+        targetFence,
+        materializedPredecessor
+      );
       await recordGitRefTaskRemoteBase(projectRoot, remoteRevision, bundle);
       return result(status2, bundle, null, targetFence);
     }
@@ -19168,6 +19183,9 @@ function buildTargetFence(input) {
     updatedAt: input.now.toISOString()
   });
 }
+function taskHeadFenceMatchesTarget(input) {
+  return input.currentFence.workspaceId === input.runtime.workspaceId && sameTaskRef(input.currentFence.taskRef, input.bundle.taskRef) && input.currentFence.taskRevision === input.bundle.taskRevision && input.currentFence.aggregateDigest === input.bundle.aggregateDigest && input.currentFence.ownershipEpoch === input.bundle.ownershipEpoch && input.currentFence.codeRef.head === input.bundle.codeRef.head && input.currentFence.checkoutId === input.runtime.checkoutId && input.currentFence.remoteRevision === input.remoteRevision && input.currentFence.lastOperationId === input.ownershipFence.lastOperationId;
+}
 async function writeTargetFence(store, current, target, predecessor) {
   if (current !== null && digestCanonicalJson(current) === digestCanonicalJson(target)) {
     return;
@@ -19598,6 +19616,7 @@ async function recoverGitRefWorkflowRepair(projectRoot, operationId, transportRe
       bundle: targetBundle,
       predecessorBundle: journal.prepared.predecessorBundle,
       pendingMetadata: journal.pendingMetadata,
+      taskLockHeld: true,
       operationId: createUlid()
     });
     journal = await transitionJournal(
@@ -32861,6 +32880,7 @@ async function recoverGitRefHandoffRepair(projectRoot, operationId, transportRec
       bundle: journal.prepared.targetBundle,
       predecessorBundle: journal.prepared.predecessorBundle,
       pendingMetadata: journal.pendingMetadata,
+      taskLockHeld: true,
       operationId: createUlid()
     });
     journal = await transitionJournal2(