@ibgib/space-gib 0.0.3 → 0.0.4

package/dist/server/server.mjs

@@ -7261,7 +7261,7 @@ async function getGraphProjection_Live({ ibGibs, ibGibAddrs, gotten, tjpAddrsAlr
         rel8nNames.forEach((rel8nName) => {
           const rel8dAddrs = rel8ns[rel8nName] ?? [];
           rel8dAddrs.forEach((rel8dAddr) => {
-            if (!rel8dAddrsNotYetGotten.includes(rel8dAddr) && !ibGibs.some((x) => getIbGibAddr({ ibGib: x }) === rel8dAddr)) {
+            if (!rel8dAddrsNotYetGotten.includes(rel8dAddr) && !ibGibs.some((x) => getIbGibAddr({ ibGib: x }) === rel8dAddr) && !isPrimitive({ gib: getIbAndGib({ ibGibAddr: rel8dAddr }).gib })) {
               rel8dAddrsNotYetGotten.push(rel8dAddr);
             }
           });
@@ -17650,6 +17650,8 @@ var KEYSTONE_REPLENISH_STRATEGY_VALID_VALUES = Object.values(KeystoneReplenishSt
 var KEYSTONE_ATOM = "keystone";
 var KEYSTONE_POOL_ID_REGEXP = /^\w[\w\-.]*$/;
 var KEYSTONE_SALT_REGEXP = /^[a-zA-Z0-9\-_]{1,64}$/;
+var KEYSTONE_USERNAME_REGEXP = /^[a-zA-Z0-9_\-.]{1,63}$/;
+var KEYSTONE_DESCRIPTION_REGEXP = /^[a-zA-Z0-9\s.,!?:;'"\-()[\]_+=@#$%&*\/]{0,128}$/;
 var KEYSTONE_HASH_MAX_ROUNDS = 1e3;
 var KEYSTONE_VERB_REVOKE = "revoke";
 var KEYSTONE_VERB_MANAGE = "manage";
@@ -17938,7 +17940,7 @@ async function parseKeystoneIb({ ib }) {
     }
   }
 }
-function getDeterministicRequirements({ pool, requiredChallengeIds, targetAddr }) {
+async function getDeterministicRequirements({ pool, requiredChallengeIds, targetAddr }) {
   const behavior = pool.config.behavior;
   const mandatory = /* @__PURE__ */ new Set();
   let available = Object.keys(pool.challenges);
@@ -17954,19 +17956,20 @@ function getDeterministicRequirements({ pool, requiredChallengeIds, targetAddr }
     }
     available = available.filter((id) => !mandatory.has(id));
   }
-  if (behavior.targetBindingChars > 0 && targetAddr) {
-    const { gib } = getIbAndGib({ ibGibAddr: targetAddr });
-    if (gib) {
-      const prefixes = gib !== GIB ? gib.substring(0, behavior.targetBindingChars).toLowerCase() : "abc";
-      for (const char of prefixes) {
-        const bucket = pool.bindingMap[char] || [];
-        const match = bucket.find((id) => available.includes(id));
-        if (!match) {
-          throw new Error(`Entropy Exhaustion. Cannot satisfy binding for char '${char}'. (E: 341b95dc3a58be3e083d1d9c4a0c4925)`);
-        }
-        mandatory.add(match);
-        available = available.filter((id) => id !== match);
+  if (behavior.targetBindingCount > 0 && targetAddr) {
+    let sortedAvailable = [...available].sort();
+    let currentHash = await hash({ s: targetAddr });
+    for (let i = 0; i < behavior.targetBindingCount; i++) {
+      if (sortedAvailable.length === 0) {
+        throw new Error(`Entropy Exhaustion. Cannot satisfy target binding. Sorted available pool is empty. (E: 341b95dc3a58be3e083d1d9c4a0c4925)`);
       }
+      const hashBigInt = BigInt("0x" + currentHash);
+      const index = Number(hashBigInt % BigInt(sortedAvailable.length));
+      const selectedId = sortedAvailable[index];
+      mandatory.add(selectedId);
+      sortedAvailable.splice(index, 1);
+      available = available.filter((id) => id !== selectedId);
+      currentHash = await hash({ s: currentHash });
     }
   }
   if (behavior.selectSequentially > 0) {
@@ -17980,22 +17983,6 @@ function getDeterministicRequirements({ pool, requiredChallengeIds, targetAddr }
   }
   return { mandatoryIds: mandatory, availableIds: available };
 }
-function addToBindingMap(map, challengeId) {
-  const firstChar = challengeId.charAt(0).toLowerCase();
-  if (/[0-9a-f]/.test(firstChar)) {
-    if (!map[firstChar]) {
-      map[firstChar] = [];
-    }
-    map[firstChar].push(challengeId);
-  } else {
-    throw new Error(`invalid challengeId (${challengeId}). Must start with a hex character. (E: c96ed8460de89e28c801370a0f07f826)`);
-  }
-}
-function removeFromBindingMap(map, challengeId) {
-  for (const key of Object.keys(map)) {
-    map[key] = map[key].filter((id) => id !== challengeId);
-  }
-}
 function resolveTargetPool({ pools, poolId, poolFilter, verb }) {
   const lc2 = `[resolveTargetPool]`;
   try {
@@ -18034,10 +18021,10 @@ function resolveTargetPool({ pools, poolId, poolFilter, verb }) {
     throw error;
   }
 }
-function selectChallengeIds({ pool, targetAddr, requiredChallengeIds }) {
+async function selectChallengeIds({ pool, targetAddr, requiredChallengeIds }) {
   const lc2 = `[selectChallengeIds]`;
   try {
-    const { mandatoryIds, availableIds } = getDeterministicRequirements({
+    const { mandatoryIds, availableIds } = await getDeterministicRequirements({
       pool,
       requiredChallengeIds,
       targetAddr
@@ -18073,11 +18060,6 @@ async function applyReplenishmentStrategy({ prevPools, targetPoolId, consumedIds
     const poolSecret = await strategy.derivePoolSecret({ masterSecret });
     const timestamp = Date.now().toString();
     const strategyType = config.behavior.replenish;
-    consumedIds.forEach((id) => {
-      if (pool.bindingMap) {
-        removeFromBindingMap(pool.bindingMap, id);
-      }
-    });
     if (strategyType === KeystoneReplenishStrategy.topUp) {
       consumedIds.forEach((id) => delete pool.challenges[id]);
       for (let i = 0; i < consumedIds.length; i++) {
@@ -18092,14 +18074,9 @@ async function applyReplenishmentStrategy({ prevPools, targetPoolId, consumedIds
           challengeId: newId
         });
         pool.challenges[newId] = await strategy.generateChallenge({ solution });
-        if (!pool.bindingMap) {
-          pool.bindingMap = {};
-        }
-        addToBindingMap(pool.bindingMap, newId);
       }
     } else if (strategyType === KeystoneReplenishStrategy.replaceAll) {
       pool.challenges = {};
-      pool.bindingMap = {};
       for (let i = 0; i < config.behavior.size; i++) {
         const newId = await generateOpaqueChallengeId({
           salt: config.salt,
@@ -18112,13 +18089,11 @@ async function applyReplenishmentStrategy({ prevPools, targetPoolId, consumedIds
           challengeId: newId
         });
         pool.challenges[newId] = await strategy.generateChallenge({ solution });
-        addToBindingMap(pool.bindingMap, newId);
       }
     } else if (strategyType === KeystoneReplenishStrategy.consume) {
       consumedIds.forEach((id) => delete pool.challenges[id]);
     } else if (strategyType === KeystoneReplenishStrategy.deleteAll) {
       pool.challenges = {};
-      pool.bindingMap = {};
     } else {
       throw new Error(`Unknown replenish strategy: ${strategyType}. Valid list: ${pretty(KEYSTONE_REPLENISH_STRATEGY_VALID_VALUES)} (E: 0acf56f1e1486240080e11e8046d0825)`);
     }
@@ -18230,10 +18205,14 @@ async function validateChallengePool({ pool }) {
         errors.push(`${lc2} pool.config.id falsy (E: 31d7943d95f877326d5f4ea14463d626)`);
       }
       if (pool.config.behavior) {
-        const { size } = pool.config.behavior;
+        const { size, selectSequentially, selectRandomly, targetBindingCount } = pool.config.behavior;
         if (!size || size === 0) {
           errors.push(`${lc2} invalid pool.config.behavior.size (${size}). Must be positive integer. (E: b221e36ec102bdc944552248ce8fe626)`);
         }
+        const totalRequested = (selectSequentially || 0) + (selectRandomly || 0) + (targetBindingCount || 0);
+        if (totalRequested >= size) {
+          errors.push(`${lc2} Total requested challenges (${totalRequested}) cannot equal or exceed pool size (${size}) to prevent full pool exposure and selection exhaustion. (E: 81cb834f826315264bca81c15fca58f1)`);
+        }
       } else {
         errors.push(`${lc2} pool.config.behavior falsy (E: bede081c066c39732eefe2f92e296326)`);
       }
@@ -18259,6 +18238,27 @@ async function validateChallengePool({ pool }) {
     }
   }
 }
+function validateKeystoneMetadata({ data }) {
+  const lc2 = `[validateKeystoneMetadata]`;
+  const errors = [];
+  const checkDetails = (details, source) => {
+    if (!details)
+      return;
+    if (details.username !== void 0) {
+      if (typeof details.username !== "string" || !KEYSTONE_USERNAME_REGEXP.test(details.username)) {
+        errors.push(`${lc2} invalid username in ${source} (${details.username}). Must match ${KEYSTONE_USERNAME_REGEXP}`);
+      }
+    }
+    if (details.description !== void 0) {
+      if (typeof details.description !== "string" || !KEYSTONE_DESCRIPTION_REGEXP.test(details.description)) {
+        errors.push(`${lc2} invalid description in ${source} (${details.description}). Must match ${KEYSTONE_DESCRIPTION_REGEXP}`);
+      }
+    }
+  };
+  checkDetails(data.frameDetails, "frameDetails");
+  checkDetails(data.checkpointDetails, "checkpointDetails");
+  return errors;
+}
 async function validateGenesisKeystone({ keystoneIbGib }) {
   const lc2 = `[${validateGenesisKeystone.name}]`;
   try {
@@ -18267,6 +18267,8 @@ async function validateGenesisKeystone({ keystoneIbGib }) {
     }
     const errors = [];
     const { data, rel8ns } = keystoneIbGib;
+    const metadataErrors = validateKeystoneMetadata({ data });
+    metadataErrors.forEach((x) => errors.push(x));
     if (data.proofs && data.proofs.length > 0) {
       errors.push(`${lc2} proofs already exist on genesis keystone. (E: 7a5e15f20918f1bbd8ffb62857dcd526)`);
     }
@@ -18306,6 +18308,8 @@ async function validateKeystoneTransition({ currentIbGib, prevIbGib }) {
     }
     const currData = currentIbGib.data;
     const prevData = prevIbGib.data;
+    const metadataErrors = validateKeystoneMetadata({ data: currData });
+    metadataErrors.forEach((x) => errors.push(x));
     const currDataN = currData.n ?? -2;
     const prevDataN = prevData.n ?? -2;
     if (currDataN < 0) {
@@ -18359,7 +18363,7 @@ async function verifyProofAgainstPool({ proof, pool, errors }) {
         errors.push(`Policy Violation: Pool ${pool.id} used for unauthorized verb ${proof.claim.verb}`);
       }
     }
-    const { mandatoryIds, availableIds } = getDeterministicRequirements({
+    const { mandatoryIds, availableIds } = await getDeterministicRequirements({
       pool,
       requiredChallengeIds: proof.requiredChallengeIds,
       targetAddr: proof.claim.target
@@ -18641,7 +18645,6 @@ var KeystoneService_V1 = class _KeystoneService_V1 {
         const strategy = KeystoneStrategyFactory.create({ config });
         const poolSecret = await strategy.derivePoolSecret({ masterSecret });
         const challenges = {};
-        const bindingMap = {};
         const targetSize = config.behavior.size;
         const timestamp = Date.now().toString();
         for (let i = 0; i < targetSize; i++) {
@@ -18657,13 +18660,11 @@ var KeystoneService_V1 = class _KeystoneService_V1 {
           });
           const challenge = await strategy.generateChallenge({ solution });
           challenges[challengeId] = challenge;
-          addToBindingMap(bindingMap, challengeId);
         }
         challengePools.push({
           id: config.id,
           config,
-          challenges,
-          bindingMap
+          challenges
         });
       }
       if (challengePools.length === 0) {
@@ -18712,7 +18713,7 @@ var KeystoneService_V1 = class _KeystoneService_V1 {
       if (logalot41) {
         console.log(`${lc2} Selected pool: ${pool.id} (size: ${Object.keys(pool.challenges).length}) (I: 6b26d6f4aad18380f2b3a0989b592826)`);
       }
-      const idsToSolve = selectChallengeIds({
+      const idsToSolve = await selectChallengeIds({
         pool,
         targetAddr: claim.target,
         requiredChallengeIds
@@ -18870,7 +18871,7 @@ var KeystoneService_V1 = class _KeystoneService_V1 {
         verb: KEYSTONE_VERB_REVOKE,
         target: getIbGibAddr({ ibGib: latestKeystone })
       };
-      const idsToSolve = selectChallengeIds({
+      const idsToSolve = await selectChallengeIds({
         pool,
         targetAddr: claim.target,
         requiredChallengeIds: []
@@ -18966,7 +18967,7 @@ var KeystoneService_V1 = class _KeystoneService_V1 {
         // Scope creates a cryptographic commitment to WHICH pools are being added
         scope: JSON.stringify({ add: newPools.map((p) => p.id) })
       };
-      const idsToSolve = selectChallengeIds({
+      const idsToSolve = await selectChallengeIds({
         pool: adminPool,
         targetAddr: target
       });
@@ -19080,7 +19081,7 @@ var SESSION_KEYSTONE_POLICY = {
     SIZE: 10,
     SELECT_SEQUENTIALLY: 2,
     SELECT_RANDOMLY: 2,
-    TARGET_BINDING_CHARS: 0,
+    TARGET_BINDING_COUNT: 0,
     SERVER_DEMAND_COUNT: 3
   }
 };
@@ -19245,8 +19246,10 @@ async function validateAndRegisterEvolveKeystone({ domainAddr, keystoneIbGib, re
     if (intrinsicErrors && intrinsicErrors.length > 0) {
       throw new Error(`Intrinsic keystone validation failed: ${intrinsicErrors.join(", ")} (E: 38ea984585edc6ee88d2a698c7895826)`);
     }
-    const { tjpGib } = getGibInfo({ ibGibAddr: addr });
-    const expectedTjpGib = getGibInfo({ ibGibAddr: domainAddr }).punctiliarHash;
+    const infoAddr = getGibInfo({ ibGibAddr: addr });
+    const tjpGib = infoAddr.tjpGib ?? infoAddr.punctiliarHash;
+    const infoDomain = getGibInfo({ ibGibAddr: domainAddr });
+    const expectedTjpGib = infoDomain.tjpGib ?? infoDomain.punctiliarHash;
     if (tjpGib !== expectedTjpGib) {
       throw new Error(`Keystone tjpGib (${tjpGib}) does not match URL domainAddr tjpGib (${expectedTjpGib})`);
     }
@@ -19579,9 +19582,6 @@ var KeystoneGenesisHandler = class _KeystoneGenesisHandler extends ServeGibHandl
       await metaspace.put({ ibGibs: [keystoneIbGib], space });
       await metaspace.registerNewIbGib({ ibGib: keystoneIbGib, space });
       console.log(`${lc2} domain created and keystone persisted: ${addr}`);
-      if (logalot45) {
-        console.log(`${lc2} keystoneIbGib: ${pretty(keystoneIbGib)} (I: d598c6ff7a48997d585b84c19c464826)`);
-      }
       return this.ok({ success: true, addr }, 201);
     } catch (error) {
       const emsg = extractErrorMsg(error);
@@ -19820,64 +19820,82 @@ function performConnect(req, socket) {
 }
 var WebSocketFrameDecoder = class {
   buffer = Buffer.alloc(0);
+  fragments = [];
   /** Adds new data chunk from TCP socket. */
   addChunk(chunk) {
     this.buffer = Buffer.concat([this.buffer, chunk]);
   }
   /**
-   * Parses the next complete text frame from the accumulated buffer.
+   * Parses the next complete text message, assembling fragments if necessary.
    * Returns:
-   * - `string` if a complete text frame was decoded successfully (and consumes those bytes).
+   * - `string` if a complete text message was assembled/decoded (and consumes those bytes).
    * - `null` if the buffer is incomplete or we need more data.
    * - `throws Error` on protocol errors or close frames.
    */
   nextFrame() {
-    if (this.buffer.length < 2) {
-      return null;
-    }
-    const opcode = this.buffer[0] & 15;
-    if (opcode === 8) {
-      throw new Error("Close frame received");
-    }
-    if (opcode !== 1) {
-      throw new Error(`Unsupported WebSocket opcode: 0x${opcode.toString(16)}`);
-    }
-    const secondByte = this.buffer[1];
-    const masked = (secondByte & 128) !== 0;
-    let payloadLen = secondByte & 127;
-    let headerLen = 2;
-    if (payloadLen === 126) {
-      if (this.buffer.length < 4) {
+    while (true) {
+      if (this.buffer.length < 2) {
         return null;
       }
-      payloadLen = this.buffer.readUInt16BE(2);
-      headerLen = 4;
-    } else if (payloadLen === 127) {
-      if (this.buffer.length < 10) {
+      const firstByte = this.buffer[0];
+      const fin = (firstByte & 128) !== 0;
+      const opcode = firstByte & 15;
+      if (opcode === 8) {
+        throw new Error("Close frame received");
+      }
+      const isContinuation = opcode === 0;
+      const isText = opcode === 1;
+      if (!isContinuation && !isText) {
+        throw new Error(`Unsupported WebSocket opcode: 0x${opcode.toString(16)}`);
+      }
+      if (isContinuation && this.fragments.length === 0) {
+        throw new Error("Continuation frame received without an active message.");
+      }
+      if (isText && this.fragments.length > 0) {
+        throw new Error("New message frame received before previous one completed.");
+      }
+      const secondByte = this.buffer[1];
+      const masked = (secondByte & 128) !== 0;
+      let payloadLen = secondByte & 127;
+      let headerLen = 2;
+      if (payloadLen === 126) {
+        if (this.buffer.length < 4) {
+          return null;
+        }
+        payloadLen = this.buffer.readUInt16BE(2);
+        headerLen = 4;
+      } else if (payloadLen === 127) {
+        if (this.buffer.length < 10) {
+          return null;
+        }
+        payloadLen = Number(this.buffer.readBigUInt64BE(2));
+        headerLen = 10;
+      }
+      const maskLen = masked ? 4 : 0;
+      const totalFrameLen = headerLen + maskLen + payloadLen;
+      if (this.buffer.length < totalFrameLen) {
         return null;
       }
-      payloadLen = Number(this.buffer.readBigUInt64BE(2));
-      headerLen = 10;
-    }
-    const maskLen = masked ? 4 : 0;
-    const totalFrameLen = headerLen + maskLen + payloadLen;
-    if (this.buffer.length < totalFrameLen) {
-      return null;
-    }
-    const frameData = this.buffer.subarray(0, totalFrameLen);
-    this.buffer = this.buffer.subarray(totalFrameLen);
-    let payloadStart = headerLen;
-    if (masked) {
-      const mask = frameData.subarray(payloadStart, payloadStart + 4);
-      payloadStart += 4;
-      const payload = Buffer.from(frameData.subarray(payloadStart));
-      for (let i = 0; i < payload.length; i++) {
-        payload[i] ^= mask[i % 4];
-      }
-      return payload.toString("utf-8");
-    } else {
-      const payload = frameData.subarray(payloadStart);
-      return payload.toString("utf-8");
+      const frameData = this.buffer.subarray(0, totalFrameLen);
+      this.buffer = this.buffer.subarray(totalFrameLen);
+      let payloadStart = headerLen;
+      let payload;
+      if (masked) {
+        const mask = frameData.subarray(payloadStart, payloadStart + 4);
+        payloadStart += 4;
+        payload = Buffer.from(frameData.subarray(payloadStart));
+        for (let i = 0; i < payload.length; i++) {
+          payload[i] ^= mask[i % 4];
+        }
+      } else {
+        payload = Buffer.from(frameData.subarray(payloadStart));
+      }
+      this.fragments.push(payload);
+      if (fin) {
+        const completePayload = Buffer.concat(this.fragments);
+        this.fragments = [];
+        return completePayload.toString("utf-8");
+      }
     }
   }
 };
@@ -20063,12 +20081,10 @@ async function applyTransforms({ src, createdIbGibs_Running, dnaAddrsToApplyToSt
       const dnaAddrToApply = dnaAddrsToApplyToStoreVersion_MUTATES_IN_PLACE.splice(0, 1)[0];
       const dnaIbGib_IntermediateArray = allLocalIbGibs.filter((x) => getIbGibAddr({ ibGib: x }) === dnaAddrToApply);
       let dnaIbGib;
-      if (dnaIbGib_IntermediateArray.length === 1) {
+      if (dnaIbGib_IntermediateArray.length > 0) {
         dnaIbGib = dnaIbGib_IntermediateArray[0];
-      } else if (dnaIbGib_IntermediateArray.length === 0) {
-        throw new Error(`dna ibGib not found in supplied allLocalIbGibs. dnaAddr: ${dnaAddrToApply}. (E: 7f56826852cf48a79ab8af16bf27e284)`);
       } else {
-        throw new Error(`More than one ibGib in allLocalIbGibs with the dna address of ${dnaAddrToApply}? (E: a726134f4cc14a4fb2ed2d39d22af17c)(UNEXPECTED)`);
+        throw new Error(`dna ibGib not found in supplied allLocalIbGibs. dnaAddr: ${dnaAddrToApply}. (E: 7f56826852cf48a79ab8af16bf27e284)`);
       }
       let argTransform = clone(dnaIbGib.data);
       argTransform.src = src;
@@ -21666,6 +21682,7 @@ var SyncPeerWebSocketReceiver_V1 = class _SyncPeerWebSocketReceiver_V1 extends S
   pendingContext;
   pendingPayloadAddrs;
   pendingResponsePayloadsToSend = [];
+  receivedPayloads = [];
   constructor(initialData, initialRel8ns) {
     super(initialData, initialRel8ns);
   }
@@ -21764,14 +21781,18 @@ var SyncPeerWebSocketReceiver_V1 = class _SyncPeerWebSocketReceiver_V1 extends S
         if (validationErrors.length > 0) {
           throw new Error(`controlIbGibs invalid intrinsically. validationErrors: ${validationErrors.join("|")} (E: 5ee1787d4cc53d3d2c55f3d4f2865226)`);
         }
-        if (this.pendingContext && this.pendingPayloadAddrs) {
+        const pendingPayloadAddrs = this.pendingPayloadAddrs;
+        if (this.pendingContext && pendingPayloadAddrs) {
           const addr = getIbGibAddr({ ibGib });
-          if (this.pendingPayloadAddrs.has(addr)) {
+          if (pendingPayloadAddrs.has(addr)) {
             const tempSpace = await this.ensureLocalTempSpace();
             await putInSpace({ space: tempSpace, ibGibs: [ibGib] });
-            this.pendingPayloadAddrs.delete(addr);
-            if (this.pendingPayloadAddrs.size === 0) {
+            this.receivedPayloads.push(ibGib);
+            pendingPayloadAddrs.delete(addr);
+            if (pendingPayloadAddrs.size === 0 && this.pendingPayloadAddrs !== void 0) {
               const context = this.pendingContext;
+              context.payloadIbGibsDomain = this.receivedPayloads;
+              this.receivedPayloads = [];
               this.pendingContext = void 0;
               this.pendingPayloadAddrs = void 0;
               await this.executeIncomingSyncRequestAndRespond({ context });
@@ -21805,6 +21826,7 @@ var SyncPeerWebSocketReceiver_V1 = class _SyncPeerWebSocketReceiver_V1 extends S
         if (expectedPayloadAddrs.length > 0) {
           this.pendingContext = context;
           this.pendingPayloadAddrs = new Set(expectedPayloadAddrs);
+          this.receivedPayloads = [];
           this.socketWrapper.send(JSON.stringify({
             type: SyncWebSocketMsgType.sync_frame_authenticated,
             contextAddr: getIbGibAddr({ ibGib: context })
@@ -21821,6 +21843,8 @@ var SyncPeerWebSocketReceiver_V1 = class _SyncPeerWebSocketReceiver_V1 extends S
             ibGib
           }));
         }
+      } else {
+        throw new Error(`(UNEXPECTED) msg.type is ${msg.type}? not expected at this time (E: bad7c4fa1958b1976904cb884e624826)`);
       }
     } catch (error) {
       console.error(`${lc2} message frame handling failed: ${extractErrorMsg(error)}`);
@@ -22042,7 +22066,7 @@ async function appendToTimeline({ timeline, rel8nInfos, rel8nRemovalInfos, timel
           skipLock
         });
       }
-      metaspace.registerNewIbGib({ ibGib: newTimelineIbGib2, space });
+      await metaspace.registerNewIbGib({ ibGib: newTimelineIbGib2, space });
       return newTimelineIbGib2;
     };
     const newTimelineIbGib = skipLock ? await fn() : await execInSpaceWithLocking({
@@ -22509,7 +22533,7 @@ var KeystoneConfigBuilderBase = class {
       replenish: this._replenish,
       selectSequentially: this._seq,
       selectRandomly: this._rand,
-      targetBindingChars: this._targetBinding
+      targetBindingCount: this._targetBinding
     };
   }
   /**
@@ -22858,112 +22882,116 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
           await subscription.unsubscribe();
         }
       }));
-      const requestCtx = await this.createSyncSagaContext({
-        sagaFrame: currentFrame,
-        /**
-         * init frame: empty
-         * ack frame: possible push offers
-         * delta frame: requested ibgibs or commit offer
-         * commit frame: empty
-         */
-        payloadIbGibsDomain: nextDomainIbGibs,
-        localSpace,
-        metaspace,
-        sessionIdentityAddr: peer.currentSessionIdentityAddr,
-        peer
-      });
-      if (logalotControlDomain) {
-        const domainAddrs = nextDomainIbGibs.map((p) => getIbGibAddr({ ibGib: p }));
-        console.log(`${lc2}${lcControlDomain} SENDER TRANSMIT -> peer.witness (I: 5b0081803698770f0bf64992220b312)`);
-        console.log(`${lc2}${lcControlDomain}   Context: ${getIbGibAddr({ ibGib: requestCtx })}`);
-        console.log(`${lc2}${lcControlDomain}   Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
-        console.log(`${lc2}${lcControlDomain}   DOMAIN Payloads (${domainAddrs.length}): ${domainAddrs.join(", ") || "(none)"}`);
-      }
-      updates$.next(requestCtx);
-      peer.setOptionalOpts({ localSpace, localTempSpace: tempSpace });
-      const responseCtx = await peer.witness(requestCtx);
-      if (!responseCtx) {
-        if (currentFrame) {
-          const msg = await getSyncSagaMessageFromFrame({ frameIbGib: currentFrame, space: localSpace });
-          if (msg?.data?.stage === SyncStage.commit) {
-            if (logalot58) {
-              console.log(`${lc2} Sender sent Commit. Peer returned no response. Saga Complete. (I: 26f9ee073858ca78b8284753368b5226)`);
+      try {
+        const requestCtx = await this.createSyncSagaContext({
+          sagaFrame: currentFrame,
+          /**
+           * init frame: empty
+           * ack frame: possible push offers
+           * delta frame: requested ibgibs or commit offer
+           * commit frame: empty
+           */
+          payloadIbGibsDomain: nextDomainIbGibs,
+          localSpace,
+          metaspace,
+          sessionIdentityAddr: peer.currentSessionIdentityAddr,
+          peer
+        });
+        if (logalotControlDomain) {
+          const domainAddrs = nextDomainIbGibs.map((p) => getIbGibAddr({ ibGib: p }));
+          console.log(`${lc2}${lcControlDomain} SENDER TRANSMIT -> peer.witness (I: 5b0081803698770f0bf64992220b312)`);
+          console.log(`${lc2}${lcControlDomain}   Context: ${getIbGibAddr({ ibGib: requestCtx })}`);
+          console.log(`${lc2}${lcControlDomain}   Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
+          console.log(`${lc2}${lcControlDomain}   DOMAIN Payloads (${domainAddrs.length}): ${domainAddrs.join(", ") || "(none)"}`);
+        }
+        updates$.next(requestCtx);
+        peer.setOptionalOpts({ localSpace, localTempSpace: tempSpace });
+        const responseCtx = await peer.witness(requestCtx);
+        if (!responseCtx) {
+          if (currentFrame) {
+            const msg = await getSyncSagaMessageFromFrame({ frameIbGib: currentFrame, space: localSpace });
+            if (msg?.data?.stage === SyncStage.commit) {
+              if (logalot58) {
+                console.log(`${lc2} Sender sent Commit. Peer returned no response. Saga Complete. (I: 26f9ee073858ca78b8284753368b5226)`);
+              }
+              currentFrame = null;
+              break;
+            } else {
+              throw new Error(`(UNEXPECTED) responseCtx falsy and currentFrame truthy, but we're not in the commit stage? This may be expected ultimately, but atow I am not seeing this as being expected. (E: cc34498962bd370deeff351fac939f26)`);
             }
-            currentFrame = null;
-            break;
           } else {
-            throw new Error(`(UNEXPECTED) responseCtx falsy and currentFrame truthy, but we're not in the commit stage? This may be expected ultimately, but atow I am not seeing this as being expected. (E: cc34498962bd370deeff351fac939f26)`);
+            throw new Error(`(UNEXPECTED) no response and currentFrame falsy? (E: 8d1085ea2f28cfc3f9c922649864a826)`);
           }
-        } else {
-          throw new Error(`(UNEXPECTED) no response and currentFrame falsy? (E: 8d1085ea2f28cfc3f9c922649864a826)`);
         }
-      }
-      if (!responseCtx.data) {
-        throw new Error(`(UNEXPECTED) responseCtx.data falsy? (E: a969992bae53ab18a827ec58aec15826)`);
-      }
-      updates$.next(responseCtx);
-      const contextAndSagaFrameValidationErrors = await validateContextAndSagaFrame({ context: responseCtx });
-      if (contextAndSagaFrameValidationErrors.length > 0) {
-        throw new Error(`contextAndSagaFrameValidationErrors: ${contextAndSagaFrameValidationErrors} (E: 6eebe8e7fa437c00a8cde3ada3c66826)`);
-      }
-      const returnContextErrors = await this.validateReturnContext({
-        requestCtx,
-        responseCtx,
-        localSpace
-      });
-      if (returnContextErrors.length > 0) {
-        throw new Error(`validateReturnContext errors: ${returnContextErrors.join(", ")} (E: cb8a023b9d0728cceb09fa3da0bb8226)`);
-      }
-      const responsePayloadAddrsDomain = responseCtx.data[SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN] || [];
-      if (responsePayloadAddrsDomain.length > 0) {
-        responseCtx.payloadIbGibsDomain = await this.pollForDomainPayloads({
-          expectedAddrs: responsePayloadAddrsDomain,
-          pollIntervalMs: 20,
-          // relatively arbitrary right now
-          domainPayloadsMap,
-          tempSpace
+        if (!responseCtx.data) {
+          throw new Error(`(UNEXPECTED) responseCtx.data falsy? (E: a969992bae53ab18a827ec58aec15826)`);
+        }
+        updates$.next(responseCtx);
+        const contextAndSagaFrameValidationErrors = await validateContextAndSagaFrame({ context: responseCtx });
+        if (contextAndSagaFrameValidationErrors.length > 0) {
+          throw new Error(`contextAndSagaFrameValidationErrors: ${contextAndSagaFrameValidationErrors} (E: 6eebe8e7fa437c00a8cde3ada3c66826)`);
+        }
+        const returnContextErrors = await this.validateReturnContext({
+          requestCtx,
+          responseCtx,
+          localSpace
         });
-      }
-      if (!responseCtx.sagaFrame) {
-        throw new Error(`(UNEXPECTED) responseCtx.sagaFrame falsy? the Peer should have set this when it got the response back from the remote. (E: e650adadf9a2063ec6764a1e31d3d826)`);
-      }
-      if (logalotControlDomain) {
-        const responseControlAddrs = responseCtx.data?.["@payloadAddrsControl"] || [];
-        console.log(`${lc2}${lcControlDomain} SENDER RECEIVED <- peer.witness (I: 3dc76a9744d89a4fc3e2f076c2be4826)`);
-        console.log(`${lc2}${lcControlDomain}   Response Context: ${getIbGibAddr({ ibGib: responseCtx })}`);
-        console.log(`${lc2}${lcControlDomain}   Response Saga Frame: ${getIbGibAddr({ ibGib: responseCtx.sagaFrame })}`);
-        console.log(`${lc2}${lcControlDomain}   CONTROL Payloads (${responseControlAddrs.length}): ${responseControlAddrs.join(", ") || "(none)"}`);
-        console.log(`${lc2}${lcControlDomain}   DOMAIN Payloads (${responsePayloadAddrsDomain.length}): ${responsePayloadAddrsDomain.join(", ") || "(none)"}`);
-      }
-      const contextResult = await this.handleResponseSagaContext({
-        sagaContext: responseCtx,
-        initDomainGraph,
-        mySpace: localSpace,
-        myTempSpace: tempSpace,
-        metaspace
-      });
-      if (!contextResult) {
-        console.error(`${lc2} NAG ERROR (DOES NOT THROW): does this ever hit now? (E: e04d02efc2a8e72a88b79f1f0f95ca26)`);
-        break;
-      } else if (contextResult.nextFrameInfo?.sagaComplete) {
-        if (logalot58) {
-          console.log(`${lc2} Handler returned null (Saga End). (I: 123bf9e7dca8886de72553a8d4f29e26)`);
+        if (returnContextErrors.length > 0) {
+          throw new Error(`validateReturnContext errors: ${returnContextErrors.join(", ")} (E: cb8a023b9d0728cceb09fa3da0bb8226)`);
+        }
+        const responsePayloadAddrsDomain = responseCtx.data[SYNC_SAGA_PAYLOAD_ADDRS_DOMAIN] || [];
+        if (responsePayloadAddrsDomain.length > 0) {
+          responseCtx.payloadIbGibsDomain = await this.pollForDomainPayloads({
+            expectedAddrs: responsePayloadAddrsDomain,
+            pollIntervalMs: 20,
+            // relatively arbitrary right now
+            domainPayloadsMap,
+            tempSpace
+          });
         }
-        break;
-      }
-      if (contextResult.errorMsg) {
-        throw new Error(`Couldn't handle response saga context. errorMsg: ${contextResult.errorMsg} (E: c948e81d513b2a0eb8b8afa878edc626)`);
-      } else if (!contextResult.nextFrameInfo) {
-        throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo falsy? (E: c287a82e823e662a77923278e2418826)`);
-      }
-      const { frame, payloadIbGibsDomain } = contextResult.nextFrameInfo;
-      currentFrame = frame;
-      nextDomainIbGibs = [...payloadIbGibsDomain || []];
-      if (logalotControlDomain) {
-        const handlerDomainAddrs = nextDomainIbGibs.map((p) => getIbGibAddr({ ibGib: p }));
-        console.log(`${lc2}${lcControlDomain} HANDLER RESULT -> next iteration (I: 6b0d88c4c28857ccd812381515bd7826)`);
-        console.log(`${lc2}${lcControlDomain}   Next Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
-        console.log(`${lc2}${lcControlDomain}   DOMAIN for next (${handlerDomainAddrs.length}): ${handlerDomainAddrs.join(", ") || "(none)"}`);
+        if (!responseCtx.sagaFrame) {
+          throw new Error(`(UNEXPECTED) responseCtx.sagaFrame falsy? the Peer should have set this when it got the response back from the remote. (E: e650adadf9a2063ec6764a1e31d3d826)`);
+        }
+        if (logalotControlDomain) {
+          const responseControlAddrs = responseCtx.data?.["@payloadAddrsControl"] || [];
+          console.log(`${lc2}${lcControlDomain} SENDER RECEIVED <- peer.witness (I: 3dc76a9744d89a4fc3e2f076c2be4826)`);
+          console.log(`${lc2}${lcControlDomain}   Response Context: ${getIbGibAddr({ ibGib: responseCtx })}`);
+          console.log(`${lc2}${lcControlDomain}   Response Saga Frame: ${getIbGibAddr({ ibGib: responseCtx.sagaFrame })}`);
+          console.log(`${lc2}${lcControlDomain}   CONTROL Payloads (${responseControlAddrs.length}): ${responseControlAddrs.join(", ") || "(none)"}`);
+          console.log(`${lc2}${lcControlDomain}   DOMAIN Payloads (${responsePayloadAddrsDomain.length}): ${responsePayloadAddrsDomain.join(", ") || "(none)"}`);
+        }
+        const contextResult = await this.handleResponseSagaContext({
+          sagaContext: responseCtx,
+          initDomainGraph,
+          mySpace: localSpace,
+          myTempSpace: tempSpace,
+          metaspace
+        });
+        if (!contextResult) {
+          console.error(`${lc2} NAG ERROR (DOES NOT THROW): does this ever hit now? (E: e04d02efc2a8e72a88b79f1f0f95ca26)`);
+          break;
+        } else if (contextResult.nextFrameInfo?.sagaComplete) {
+          if (logalot58) {
+            console.log(`${lc2} Handler returned null (Saga End). (I: 123bf9e7dca8886de72553a8d4f29e26)`);
+          }
+          break;
+        }
+        if (contextResult.errorMsg) {
+          throw new Error(`Couldn't handle response saga context. errorMsg: ${contextResult.errorMsg} (E: c948e81d513b2a0eb8b8afa878edc626)`);
+        } else if (!contextResult.nextFrameInfo) {
+          throw new Error(`(UNEXPECTED) contextResult.nextFrameInfo falsy? (E: c287a82e823e662a77923278e2418826)`);
+        }
+        const { frame, payloadIbGibsDomain } = contextResult.nextFrameInfo;
+        currentFrame = frame;
+        nextDomainIbGibs = [...payloadIbGibsDomain || []];
+        if (logalotControlDomain) {
+          const handlerDomainAddrs = nextDomainIbGibs.map((p) => getIbGibAddr({ ibGib: p }));
+          console.log(`${lc2}${lcControlDomain} HANDLER RESULT -> next iteration (I: 6b0d88c4c28857ccd812381515bd7826)`);
+          console.log(`${lc2}${lcControlDomain}   Next Frame: ${getIbGibAddr({ ibGib: currentFrame })}`);
+          console.log(`${lc2}${lcControlDomain}   DOMAIN for next (${handlerDomainAddrs.length}): ${handlerDomainAddrs.join(", ") || "(none)"}`);
+        }
+      } finally {
+        await subscription.unsubscribe();
       }
     }
   }
@@ -23233,7 +23261,8 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
         console.log(`${lc2} starting... (I: 26dce86bfca572939885798802d6e926)`);
       }
       let resultDomainPayloads = [];
-      let pending = [...expectedAddrs];
+      const uniqueExpectedAddrs = [...new Set(expectedAddrs)];
+      let pending = [...uniqueExpectedAddrs];
       const start = Date.now();
       const timeoutMs = 5 * 60 * 1e3;
       while (pending.length > 0) {
@@ -23259,8 +23288,8 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
           await delay(pollIntervalMs);
         }
       }
-      if (expectedAddrs.length !== resultDomainPayloads.length) {
-        throw new Error(`(UNEXPECTED) expectedAddrs.length !== resultDomainPayloads.length? at this point, we expect all of the payload ibgibs to have been received. (E: 03749a7478c4b8b28bfc86951887a826)`);
+      if (uniqueExpectedAddrs.length !== resultDomainPayloads.length) {
+        throw new Error(`(UNEXPECTED) uniqueExpectedAddrs.length !== resultDomainPayloads.length? at this point, we expect all of the payload ibgibs to have been received. (E: 03749a7478c4b8b28bfc86951887a826)`);
       }
       return resultDomainPayloads;
     } catch (error) {
@@ -23710,11 +23739,11 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
         throw new Error(`${lc2} Peer reported terminal conflicts. (E: 23a0096ee05a2ccfa89334e8f156b426)`);
       }
       const outgoingPayloadIbGibsDomain_conflicts = [];
+      const activeConflicts = [];
       if (conflicts.length > 0) {
         if (logalot58) {
           console.log(`${lc2} [CONFLICT DEBUG] Processing ${conflicts.length} non-terminal conflicts`);
         }
-        proposeCommit = false;
         for (const conflict of conflicts) {
           const {
             receiverTipAddr,
@@ -23773,13 +23802,26 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
             const deltaPayloadIbGib = deltaGraph[deltaPayloadAddr];
             outgoingPayloadIbGibsDomain_conflicts.push(deltaPayloadIbGib);
           });
-          if (conflict.accretivePayloadAddrs) {
-            throw new Error(`(UNEXPECTED) conflict.accretivePayloadAddrs already truthy? This is expected to be falsy at this point in the sync. (E: 6b6b1846779867849cbde208f4374326)`);
+          const isFastForward = latestCommonFrameAddr === receiverTipAddr;
+          if (isFastForward) {
+            if (logalot58) {
+              console.log(`${lc2} [CONFLICT DEBUG] TJP ${tjpAddr}: Fast-forward detected (receiver behind sender). Excluding from active conflicts and sending delta payload.`);
+            }
+          } else {
+            if (conflict.accretivePayloadAddrs) {
+              throw new Error(`(UNEXPECTED) conflict.accretivePayloadAddrs already truthy? This is expected to be falsy at this point in the sync. (E: 6b6b1846779867849cbde208f4374326)`);
+            }
+            conflict.accretivePayloadAddrs = accretivePayloadAddrs;
+            activeConflicts.push(conflict);
           }
-          conflict.accretivePayloadAddrs = accretivePayloadAddrs;
+        }
+        if (activeConflicts.length > 0) {
+          proposeCommit = false;
+        } else {
+          proposeCommit = true;
         }
         if (logalot58) {
-          console.log(`${lc2} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. outgoingPayloadIbGibsDomain_conflicts.length (total outgoing payload ibgibs for ALL conflicts): ${outgoingPayloadIbGibsDomain_conflicts.length}`);
+          console.log(`${lc2} [CONFLICT DEBUG] Finished processing ${conflicts.length} conflicts. Active (divergent) conflicts: ${activeConflicts.length}. outgoingPayloadIbGibsDomain_conflicts.length (total outgoing payload ibgibs for ALL conflicts): ${outgoingPayloadIbGibsDomain_conflicts.length}`);
         }
       } else {
         if (logalot58) {
@@ -23808,7 +23850,7 @@ var SyncSagaCoordinator = class _SyncSagaCoordinator {
         /**
          * these are the modified conflicts with additional information.
          */
-        conflicts,
+        conflicts: activeConflicts,
         /**
          * we're sending these domain ibgibs as payload (they were
          * requested by receiver and/or they are being sent as delta
@@ -24738,9 +24780,26 @@ var SyncUpgradeHandlerBase = class _SyncUpgradeHandlerBase extends ServeGibHandl
         sagaId: void 0
         // Resolved dynamically inside runtime turns
       });
+      socket.on("error", (err) => {
+        if (logalot59) {
+          console.warn(`[SyncUpgradeHandlerBase] Socket error: ${extractErrorMsg(err)}`);
+        }
+        try {
+          socket.destroy();
+        } catch (e) {
+        }
+      });
       const socketWrapper = {
         send(data) {
-          socket.write(encodeTextFrame(data));
+          if (socket.writable) {
+            try {
+              socket.write(encodeTextFrame(data));
+            } catch (e) {
+              if (logalot59) {
+                console.warn(`[SyncUpgradeHandlerBase] failed to write message frame: ${extractErrorMsg(e)}`);
+              }
+            }
+          }
         },
         onMessage(callback) {
           const decoder = new WebSocketFrameDecoder();
@@ -24756,7 +24815,12 @@ var SyncUpgradeHandlerBase = class _SyncUpgradeHandlerBase extends ServeGibHandl
               if (logalot59) {
                 console.warn(`[SyncUpgradeHandlerBase] closing connection due to decoder error: ${extractErrorMsg(error)}`);
               }
-              socket.write(encodeCloseFrame());
+              if (socket.writable) {
+                try {
+                  socket.write(encodeCloseFrame());
+                } catch (e) {
+                }
+              }
               socket.end();
             }
           });
@@ -24765,7 +24829,12 @@ var SyncUpgradeHandlerBase = class _SyncUpgradeHandlerBase extends ServeGibHandl
           socket.on("close", callback);
         },
         close() {
-          socket.write(encodeCloseFrame());
+          if (socket.writable) {
+            try {
+              socket.write(encodeCloseFrame());
+            } catch (e) {
+            }
+          }
           socket.end();
         }
       };