@frockbot/workspace-store 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/workspace-store",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "private": false,
   "type": "module",
   "exports": {
@@ -15,7 +15,7 @@
     "typecheck": "tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/kernel-contracts": "0.3.5"
+    "@frockbot/kernel-contracts": "0.3.7"
   },
   "devDependencies": {
     "@types/bun": "1.4.0",

package/src/store.test.ts

@@ -680,11 +680,14 @@ describe("an unrecorded file is still overwritable by the writer that read it",
     // The `record` that follows a `put` fails once: the bytes land, and the
     // only place their generation exists is beside them in the object store.
     const record = generations.record;
-    let failed = false;
+    let attempts = 0;
     generations.record = (entry) => {
-      if (failed) return record(entry);
-      failed = true;
-      return Promise.reject(new Error("the ledger is unreachable"));
+      attempts += 1;
+      // Both attempts fail: the retry is not what is under test here.
+      if (attempts <= 2) {
+        return Promise.reject(new Error("the ledger is unreachable"));
+      }
+      return record(entry);
     };
 
     const first = await files.write({
@@ -693,7 +696,12 @@ describe("an unrecorded file is still overwritable by the writer that read it",
       writer: user,
       expectedGenerationId: null,
     });
-    expect(first.status).toBe("unavailable");
+    // The bytes are durable, so the write is `ok`. Reporting a failure here
+    // told the model nothing was written while object storage held it, and
+    // the write then turned up in the next injection anyway.
+    expect(first).toMatchObject({ status: "ok", ledgerPending: true });
+    // It is tried twice before it is called pending.
+    expect(attempts).toBe(2);
     expect(await generations.current(INSTRUCTIONS, "notes.md")).toBeUndefined();
 
     // The file reads back with the generation its writer minted…

package/src/store.ts

@@ -44,6 +44,7 @@
 // and `gcTombstoneMarkersV1` collects markers old enough that no create can
 // still be conditioned on one.
 import {
+  retryOnceV1,
   WORKSPACE_MAX_FILE_BYTES,
   WORKSPACE_MAX_LIST_ENTRIES,
   isWorkspaceComputerReadOnlyRootV1,
@@ -613,19 +614,25 @@ class ObjectWorkspaceFiles implements WorkspaceFilesV1 {
         );
       }
       if (written) {
+        // The bytes are durable. The ledger is the index of that fact, not
+        // the fact: reporting a failure here told the model nothing was
+        // written while object storage held it, and the write then turned up
+        // in the next injection anyway — exactly the intent/outcome
+        // divergence the record exists to prevent. So the ledger call is
+        // retried, and a still-failing ledger is `ok` with `ledgerPending`:
+        // the metadata beside the bytes lets `reconcile` repair the entry.
         try {
-          await this.generations.record({
-            schemaVersion: 1,
-            root,
-            path: relative,
-            generation,
-            etag: written.etag,
-          });
-        } catch (error) {
-          return failure(
-            "unavailable",
-            error instanceof Error ? error.message : String(error),
+          await retryOnceV1(() =>
+            this.generations.record({
+              schemaVersion: 1,
+              root,
+              path: relative,
+              generation,
+              etag: written.etag,
+            }),
           );
+        } catch {
+          return { status: "ok", generation, ledgerPending: true };
         }
         return { status: "ok", generation };
       }