dsh-sessions-manager 3.7.1 → 3.7.2

package/lib/index.js

@@ -1750,6 +1750,25 @@ function conflictError(message) {
 function failureText(e) {
   return `${e && e.name || ""} ${e && e.message || e}`;
 }
+function requiredFormatVersionFromError(e) {
+  const m = /requires Session format v(\d+)/.exec(String(e && e.message || ""));
+  return m ? Number(m[1]) : null;
+}
+var OFFICIAL_HEADER_FIELDS = ["id", "createdAt", "cwd", "isSeeded", "delegationDepth", "parentSession", "origin", "agentPreset"];
+async function createWithCompatibleHeader(sp, header, createOptions) {
+  try {
+    return await sp.create(header, createOptions);
+  } catch (e) {
+    const required = requiredFormatVersionFromError(e);
+    if (required === null || header.version === required) throw e;
+    const normalized = {};
+    for (const key of OFFICIAL_HEADER_FIELDS) {
+      if (Object.hasOwn(header, key)) normalized[key] = header[key];
+    }
+    normalized.version = required;
+    return await sp.create(normalized, createOptions);
+  }
+}
 function isAlreadyOwned(e) {
   return /already owned/i.test(failureText(e));
 }
@@ -1867,7 +1886,17 @@ async function moveSessionToCwd({ sp, sid, header, canonical, events = [], inher
     error.code = "DSM_SESSION_DUP_LOG";
     throw error;
   }
-  const newHeader = Object.assign({}, header, { cwd: canonical });
+  const newHeaderBase = Object.assign({}, header, { cwd: canonical });
+  let createHeader = newHeaderBase;
+  if (typeof sp.stat === "function") {
+    try {
+      const fresh = await sp.stat(sid);
+      if (fresh && fresh.header && fresh.header.id === sid) {
+        createHeader = Object.assign({}, fresh.header, { cwd: canonical });
+      }
+    } catch (e) {
+    }
+  }
   const firstSeq = events.length ? Number(events[0].seq) : 0;
   const replay = firstSeq !== 0 ? events.map((event, index) => ({ ...event, seq: index })) : events;
   const createOptions = header.isSeeded && Number.isSafeInteger(inheritedEventCount) && inheritedEventCount > 0 ? { inheritedEventCount } : void 0;
@@ -1879,7 +1908,7 @@ async function moveSessionToCwd({ sp, sid, header, canonical, events = [], inher
   let writer = null;
   try {
     try {
-      writer = await sp.create(newHeader, createOptions);
+      writer = await createWithCompatibleHeader(sp, createHeader, createOptions);
       for (let i = 0; i < replay.length; i += MOVE_BATCH) {
         await writer.append(replay.slice(i, i + MOVE_BATCH));
       }
@@ -1956,7 +1985,7 @@ function emptyScanCandidate(sizeBytes) {
 }
 
 // src/index.js
-var BUILD_STAMP = true ? "3.7.1+1277c4b2" : "dev";
+var BUILD_STAMP = true ? "3.7.2+71b956b8" : "dev";
 var name = "dsh-sessions-manager";
 var inject = ["webServer", "workspaceRegistry", "sessionPersistence", "sessionQuery", "storageDomain"];
 var MAX_TITLE = 80;