engineering-memory 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engineering-memory",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Installs the Engineering Memory skill and its local MCP bridge. Sign in after installing; your organization and project are resolved from your account.",
   "license": "UNLICENSED",
   "type": "module",

package/runtime/dist/src/runtime/bridge-service.js

@@ -312,13 +312,19 @@ export class BridgeService {
                 resumeIdentityMatches &&
                 conflicts.every(isOfflineDevelopmentWarning) &&
                 isOfflineLeaseUsable(resumedLease, sessionId, pointer?.changeBaseline?.leasePaths ?? [], pointer?.changeBaseline?.diffHash);
-            const resumedBaseline = pointer?.taskId === backendTask.id &&
-                pointer.sessionId === sessionId &&
-                pointer.changeBaseline &&
-                (resumedLease?.baselineDiffHash === pointer.changeBaseline.diffHash ||
-                    objectValue(backend.verificationRecovery)?.diffHash === repository.git.diffHash)
+            const localBaseline = pointer?.taskId === backendTask.id && pointer.sessionId === sessionId
                 ? pointer.changeBaseline
                 : undefined;
+            const recordedBaselineDiffHash = typeof backend.changeBaselineDiffHash === 'string'
+                ? backend.changeBaselineDiffHash
+                : undefined;
+            const repairedBaseline = repairChangeBaseline(localBaseline, recordedBaselineDiffHash, repository.git.head);
+            const resumedBaseline = repairedBaseline ?? localBaseline;
+            if (recordedBaselineDiffHash &&
+                resumedBaseline &&
+                resumedBaseline.diffHash !== recordedBaselineDiffHash) {
+                conflicts.push('task_change_baseline_recaptured');
+            }
             const resumedLastSequence = responseSource === 'stale_cache' && pointer
                 ? Math.max(pointer.lastSequence, numericSequence(backendTask.lastSequence), localJournal.projection?.appliedEventIds.length ?? 0)
                 : numericSequence(backendTask.lastSequence);
@@ -2372,6 +2378,20 @@ function isOfflineLeaseUsable(lease, sessionId, changedPaths, baselineDiffHash)
         return false;
     }
 }
+function repairChangeBaseline(local, recordedDiffHash, head) {
+    if (!recordedDiffHash || local?.diffHash === recordedDiffHash)
+        return undefined;
+    if (sha256(`${head ?? '<unborn>'}
+${stableStringify([])}
+`) !== recordedDiffHash) {
+        return undefined;
+    }
+    return {
+        diffHash: recordedDiffHash,
+        changedPaths: [],
+        leasePaths: local?.leasePaths ?? [],
+    };
+}
 function isOfflineDevelopmentWarning(value) {
     return (value === 'backend_resume_is_stale' ||
         value === 'pending_outbox_delivery' ||

package/skill/references/lifecycle.md

@@ -95,6 +95,22 @@ Where the same product has a client and a backend, they are two projects. Adopt
 then link them with `project.link` once both exist, and ask before linking rather than inferring it
 from the names.
 
+## The Task Baseline
+
+A write task's baseline is the tree it started from, and every changed path it reports is the
+difference between that tree and the current one. It is captured once, at the first change
+preparation, and it is never re-captured — a baseline taken again halfway through a task equals the
+finished work, and from then on the task reports the two or three files touched since instead of
+everything it did. Verification then refuses the true path list, and reporting the short one would
+record a task that did something it did not do.
+
+`session.resume` therefore carries the baseline through a lease going stale, expiring, or being
+replaced, and repairs one that has already drifted when the backend's record of the original can be
+proved against the current commit. When it cannot prove it, resume reports
+`task_change_baseline_recaptured`. Do not work around that conflict by reporting a shorter path
+list, and do not edit the pointer file: say what happened, and let the user decide between
+reopening the task and abandoning it.
+
 ## Change Preparation
 
 Skip change preparation for a read-only task. Do not request an edit lease, send changed paths, record `pre_edit`, or reconcile code resources in that mode. If the user later authorizes a change, call `context.prepare_change` with `transitionToWrite: true`, the bridge-owned current task version, intended paths, and current baseline diff. Continue only after the bridge returns the updated write task and lease.