diff --git a/commands/access/json_gen.go b/commands/access/json_gen.go
index 9d805c5..775be20 100644
--- a/commands/access/json_gen.go
+++ b/commands/access/json_gen.go
@@ -29,7 +29,7 @@ func (t *RequestArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Attenuations ([]access.CapabilityRequest) (slice)
 	if len("att") > 8192 {
@@ -62,8 +62,8 @@ func (t *RequestArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Attenuations: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -82,7 +82,6 @@ func (t *RequestArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Issuer.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Issuer: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -293,7 +292,7 @@ func (t *RequestOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Confirm (promise.AwaitOK) (struct)
 	if len("confirm") > 8192 {
@@ -308,8 +307,8 @@ func (t *RequestOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Confirm.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Confirm: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -330,8 +329,8 @@ func (t *RequestOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing int64 for field t.Expiration: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -352,7 +351,6 @@ func (t *RequestOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Request: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -602,7 +600,7 @@ func (t *ConfirmArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Attenuations ([]access.CapabilityRequest) (slice)
 	if len("att") > 8192 {
@@ -635,8 +633,8 @@ func (t *ConfirmArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Attenuations: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -655,8 +653,8 @@ func (t *ConfirmArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Audience.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Audience: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -677,8 +675,8 @@ func (t *ConfirmArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Cause: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -697,7 +695,6 @@ func (t *ConfirmArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Issuer.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Issuer: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -985,7 +982,7 @@ func (t *GrantArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Attenuations ([]access.CapabilityRequest) (slice)
 	if len("att") > 8192 {
@@ -1018,9 +1015,9 @@ func (t *GrantArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Attenuations: %w", err)
 	}
 
-	written++
+	written = true
 	if t.Cause != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -1049,7 +1046,6 @@ func (t *GrantArguments) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
 	}
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
diff --git a/commands/assert/json_gen.go b/commands/assert/json_gen.go
index efd7d62..dba92b1 100644
--- a/commands/assert/json_gen.go
+++ b/commands/assert/json_gen.go
@@ -276,7 +276,7 @@ func (t *LocationArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Content (multihash.Multihash) (slice)
 	if len("content") > 8192 {
@@ -296,8 +296,8 @@ func (t *LocationArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Content: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -334,9 +334,9 @@ func (t *LocationArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Location: %w", err)
 	}
 
-	written++
+	written = true
 	if t.Range != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -357,9 +357,9 @@ func (t *LocationArguments) MarshalDagJSON(w io.Writer) error {
 		if err := t.Range.MarshalDagJSON(jw); err != nil {
 			return fmt.Errorf("marshaling field t.Range: %w", err)
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -378,7 +378,6 @@ func (t *LocationArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Space.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Space: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -534,7 +533,7 @@ func (t *Range) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.End (uint64) (uint64)
 	if t.End != nil {
@@ -558,9 +557,9 @@ func (t *Range) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -581,7 +580,6 @@ func (t *Range) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Start: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -678,7 +676,7 @@ func (t *EqualsArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Content (multihash.Multihash) (slice)
 	if len("content") > 8192 {
@@ -698,8 +696,8 @@ func (t *EqualsArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Content: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -720,7 +718,6 @@ func (t *EqualsArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Equals: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/blob/json_gen.go b/commands/blob/json_gen.go
index bdffafb..11d0010 100644
--- a/commands/blob/json_gen.go
+++ b/commands/blob/json_gen.go
@@ -30,7 +30,7 @@ func (t *AllocateArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Blob (blob.Blob) (struct)
 	if len("blob") > 8192 {
@@ -45,8 +45,8 @@ func (t *AllocateArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Blob.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Blob: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -67,8 +67,8 @@ func (t *AllocateArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Cause: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -87,7 +87,6 @@ func (t *AllocateArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Space.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Space: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -184,7 +183,7 @@ func (t *Blob) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Digest (multihash.Multihash) (slice)
 	if len("digest") > 8192 {
@@ -204,8 +203,8 @@ func (t *Blob) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Digest: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -226,7 +225,6 @@ func (t *Blob) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Size: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -324,7 +322,7 @@ func (t *AllocateOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Address (blob.BlobAddress) (struct)
 	if t.Address != nil {
@@ -340,9 +338,9 @@ func (t *AllocateOK) MarshalDagJSON(w io.Writer) error {
 		if err := t.Address.MarshalDagJSON(jw); err != nil {
 			return fmt.Errorf("marshaling field t.Address: %w", err)
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -363,7 +361,6 @@ func (t *AllocateOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Size: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -465,7 +462,7 @@ func (t *BlobAddress) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Expires (int64) (int64)
 	if len("expires") > 8192 {
@@ -482,8 +479,8 @@ func (t *BlobAddress) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing int64 for field t.Expires: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -542,8 +539,8 @@ func (t *BlobAddress) MarshalDagJSON(w io.Writer) error {
 		}
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -562,7 +559,6 @@ func (t *BlobAddress) MarshalDagJSON(w io.Writer) error {
 	if err := t.URL.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.URL: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -706,7 +702,7 @@ func (t *AcceptArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Put (promise.AwaitOK) (struct)
 	if len("_put") > 8192 {
@@ -721,8 +717,8 @@ func (t *AcceptArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Put.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Put: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -741,8 +737,8 @@ func (t *AcceptArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Blob.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Blob: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -761,7 +757,6 @@ func (t *AcceptArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Space.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Space: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -853,7 +848,7 @@ func (t *AcceptOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.PDP (promise.AwaitOK) (struct)
 	if len("pdp") > 8192 {
@@ -868,8 +863,8 @@ func (t *AcceptOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.PDP.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.PDP: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -890,7 +885,6 @@ func (t *AcceptOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Site: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -1266,7 +1260,7 @@ func (t *ReleaseArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cause (cid.Cid) (struct)
 	if len("cause") > 8192 {
@@ -1283,8 +1277,8 @@ func (t *ReleaseArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Cause: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1308,8 +1302,8 @@ func (t *ReleaseArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Digest: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1328,7 +1322,6 @@ func (t *ReleaseArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Space.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Space: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -1434,7 +1427,7 @@ func (t *AbortArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cause (cid.Cid) (struct)
 	if len("cause") > 8192 {
@@ -1451,8 +1444,8 @@ func (t *AbortArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Cause: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1476,7 +1469,6 @@ func (t *AbortArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Digest: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -1575,7 +1567,7 @@ func (t *RejectArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Digest (multihash.Multihash) (slice)
 	if len("digest") > 8192 {
@@ -1595,8 +1587,8 @@ func (t *RejectArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Digest: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1615,7 +1607,6 @@ func (t *RejectArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Space.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Space: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -1709,7 +1700,7 @@ func (t *ReplicateArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Blob (blob.Blob) (struct)
 	if len("blob") > 8192 {
@@ -1724,8 +1715,8 @@ func (t *ReplicateArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Blob.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Blob: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1746,8 +1737,8 @@ func (t *ReplicateArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Replicas: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1768,7 +1759,6 @@ func (t *ReplicateArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Site: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -2012,7 +2002,7 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -2037,10 +2027,10 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
 	if t.Size != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -2069,7 +2059,6 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
 	}
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
@@ -2170,7 +2159,7 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -2195,9 +2184,9 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -2234,8 +2223,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Results: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -2256,7 +2245,6 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Size: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -2395,7 +2383,7 @@ func (t *ListBlobItem) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Blob (blob.Blob) (struct)
 	if len("blob") > 8192 {
@@ -2410,8 +2398,8 @@ func (t *ListBlobItem) MarshalDagJSON(w io.Writer) error {
 	if err := t.Blob.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Blob: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -2432,7 +2420,6 @@ func (t *ListBlobItem) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing int64 for field t.InsertedAt: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/claim/json_gen.go b/commands/claim/json_gen.go
index b1b06da..a165794 100644
--- a/commands/claim/json_gen.go
+++ b/commands/claim/json_gen.go
@@ -29,7 +29,7 @@ func (t *CacheArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Claim (cid.Cid) (struct)
 	if len("claim") > 8192 {
@@ -46,8 +46,8 @@ func (t *CacheArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Claim: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -66,7 +66,6 @@ func (t *CacheArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Provider.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Provider: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/content/json_gen.maps.go b/commands/content/json_gen.maps.go
index 4220fd6..1a178df 100644
--- a/commands/content/json_gen.maps.go
+++ b/commands/content/json_gen.maps.go
@@ -134,7 +134,7 @@ func (t *RetrieveArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Blob (content.Blob) (struct)
 	if len("blob") > 8192 {
@@ -149,8 +149,8 @@ func (t *RetrieveArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Blob.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Blob: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -169,7 +169,6 @@ func (t *RetrieveArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Range.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Range: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/customer/json_gen.go b/commands/customer/json_gen.go
index 1b3f74a..92462b4 100644
--- a/commands/customer/json_gen.go
+++ b/commands/customer/json_gen.go
@@ -29,7 +29,7 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Customer (did.DID) (struct)
 	if len("customer") > 8192 {
@@ -44,8 +44,8 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Customer.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Customer: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -104,9 +104,9 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 		}
 	}
 
-	written++
+	written = true
 	if t.ExternalAccount != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -136,9 +136,9 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.ExternalAccount: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -157,7 +157,6 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Product.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Product: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/http/json_gen.go b/commands/http/json_gen.go
index d3dd5d1..61d152b 100644
--- a/commands/http/json_gen.go
+++ b/commands/http/json_gen.go
@@ -29,7 +29,7 @@ func (t *PutArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Body (blob.Blob) (struct)
 	if len("body") > 8192 {
@@ -44,8 +44,8 @@ func (t *PutArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Body.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Body: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -64,7 +64,6 @@ func (t *PutArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Destination.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Destination: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/provider/json_gen.go b/commands/provider/json_gen.go
index 91b5f19..fc1234e 100644
--- a/commands/provider/json_gen.go
+++ b/commands/provider/json_gen.go
@@ -29,7 +29,7 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Consumer (did.DID) (struct)
 	if len("consumer") > 8192 {
@@ -44,8 +44,8 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Consumer.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Consumer: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -64,7 +64,6 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Provider.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Provider: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/s3/bucket/json_gen.go b/commands/s3/bucket/json_gen.go
index 25ddbcf..16d1db1 100644
--- a/commands/s3/bucket/json_gen.go
+++ b/commands/s3/bucket/json_gen.go
@@ -302,7 +302,7 @@ func (t *InfoArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.AccessKey (did.DID) (struct)
 	if len("accessKey") > 8192 {
@@ -317,8 +317,8 @@ func (t *InfoArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.AccessKey.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.AccessKey: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -340,7 +340,6 @@ func (t *InfoArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Name)); err != nil {
 		return fmt.Errorf("writing string for field t.Name: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -430,7 +429,7 @@ func (t *InfoOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Delegations (s3.ProofSet) (struct)
 	if len("delegations") > 8192 {
@@ -445,8 +444,8 @@ func (t *InfoOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Delegations.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Delegations: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -465,8 +464,8 @@ func (t *InfoOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.ID.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.ID: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -485,7 +484,6 @@ func (t *InfoOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Permissions.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Permissions: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -577,7 +575,7 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Buckets ([]bucket.Bucket) (slice)
 	if len("buckets") > 8192 {
@@ -610,8 +608,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Buckets: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -633,8 +631,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.ContinuationToken)); err != nil {
 		return fmt.Errorf("writing string for field t.ContinuationToken: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -653,8 +651,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Owner.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Owner: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -676,7 +674,6 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Prefix)); err != nil {
 		return fmt.Errorf("writing string for field t.Prefix: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -821,7 +818,7 @@ func (t *Bucket) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.ARN (string) (string)
 	if len("arn") > 8192 {
@@ -839,8 +836,8 @@ func (t *Bucket) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.ARN)); err != nil {
 		return fmt.Errorf("writing string for field t.ARN: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -862,8 +859,8 @@ func (t *Bucket) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.CreationDate)); err != nil {
 		return fmt.Errorf("writing string for field t.CreationDate: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -885,8 +882,8 @@ func (t *Bucket) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Name)); err != nil {
 		return fmt.Errorf("writing string for field t.Name: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -908,7 +905,6 @@ func (t *Bucket) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Region)); err != nil {
 		return fmt.Errorf("writing string for field t.Region: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -1030,7 +1026,7 @@ func (t *Owner) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.DisplayName (string) (string)
 	if len("displayName") > 8192 {
@@ -1048,8 +1044,8 @@ func (t *Owner) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.DisplayName)); err != nil {
 		return fmt.Errorf("writing string for field t.DisplayName: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -1071,7 +1067,6 @@ func (t *Owner) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.ID)); err != nil {
 		return fmt.Errorf("writing string for field t.ID: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/s3/codec_test.go b/commands/s3/codec_test.go
index 97e5d12..9510199 100644
--- a/commands/s3/codec_test.go
+++ b/commands/s3/codec_test.go
@@ -74,6 +74,7 @@ func TestAuthorizeOKRoundTrip(t *testing.T) {
 
 	in := &request.AuthorizeOK{
 		Bucket: ptr(did.MustParse("did:key:z6MkmNBgCewjYfEDTdKLpHkbMWUogJk29CxmiVdLeW4Kz3UG")),
+		Tenant: did.MustParse("did:plc:ewvi7nxzyoun6zhxrhs64oiz"),
 		Permissions: s3.PermissionSet{Entries: map[did.DID][]string{
 			access: {"s3:GetObject", "s3:PutObject"},
 		}},
diff --git a/commands/s3/json_gen.go b/commands/s3/json_gen.go
index 3291b5f..1c56355 100644
--- a/commands/s3/json_gen.go
+++ b/commands/s3/json_gen.go
@@ -29,7 +29,7 @@ func (t *Request) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Headers (map[string]string) (map)
 	if len("headers") > 8192 {
@@ -84,8 +84,8 @@ func (t *Request) MarshalDagJSON(w io.Writer) error {
 		}
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -107,8 +107,8 @@ func (t *Request) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Method)); err != nil {
 		return fmt.Errorf("writing string for field t.Method: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -130,7 +130,6 @@ func (t *Request) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.URL)); err != nil {
 		return fmt.Errorf("writing string for field t.URL: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -280,7 +279,7 @@ func (t *VerificationKey) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Data ([]uint8) (slice)
 	if len("data") > 8192 {
@@ -300,8 +299,8 @@ func (t *VerificationKey) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing bytes for field t.Data: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -323,7 +322,6 @@ func (t *VerificationKey) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteString(string(t.Kind)); err != nil {
 		return fmt.Errorf("writing string for field t.Kind: %w", err)
 	}
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/s3/request/cbor_gen.go b/commands/s3/request/cbor_gen.go
index 6b1df6b..4a6eab0 100644
--- a/commands/s3/request/cbor_gen.go
+++ b/commands/s3/request/cbor_gen.go
@@ -120,7 +120,7 @@ func (t *AuthorizeOK) MarshalCBOR(w io.Writer) error {
 	}
 
 	cw := cbg.NewCborWriter(w)
-	fieldCount := 4
+	fieldCount := 5
 
 	if t.Bucket == nil {
 		fieldCount--
@@ -165,6 +165,22 @@ func (t *AuthorizeOK) MarshalCBOR(w io.Writer) error {
 		}
 	}
 
+	// t.Tenant (did.DID) (struct)
+	if len("tenant") > 8192 {
+		return xerrors.Errorf("Value in field \"tenant\" was too long")
+	}
+
+	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("tenant"))); err != nil {
+		return err
+	}
+	if _, err := cw.WriteString(string("tenant")); err != nil {
+		return err
+	}
+
+	if err := t.Tenant.MarshalCBOR(cw); err != nil {
+		return err
+	}
+
 	// t.Delegations (s3.ProofSet) (struct)
 	if len("delegations") > 8192 {
 		return xerrors.Errorf("Value in field \"delegations\" was too long")
@@ -269,6 +285,16 @@ func (t *AuthorizeOK) UnmarshalCBOR(r io.Reader) (err error) {
 					}
 				}
 
+			}
+			// t.Tenant (did.DID) (struct)
+		case "tenant":
+
+			{
+
+				if err := t.Tenant.UnmarshalCBOR(cr); err != nil {
+					return xerrors.Errorf("unmarshaling t.Tenant: %w", err)
+				}
+
 			}
 			// t.Delegations (s3.ProofSet) (struct)
 		case "delegations":
diff --git a/commands/s3/request/json_gen.go b/commands/s3/request/json_gen.go
index e047a75..33c3669 100644
--- a/commands/s3/request/json_gen.go
+++ b/commands/s3/request/json_gen.go
@@ -121,7 +121,7 @@ func (t *AuthorizeOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Bucket (did.DID) (struct)
 	if t.Bucket != nil {
@@ -137,9 +137,9 @@ func (t *AuthorizeOK) MarshalDagJSON(w io.Writer) error {
 		if err := t.Bucket.MarshalDagJSON(jw); err != nil {
 			return fmt.Errorf("marshaling field t.Bucket: %w", err)
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -158,8 +158,8 @@ func (t *AuthorizeOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Delegations.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Delegations: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -178,8 +178,8 @@ func (t *AuthorizeOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Keys.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Keys: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -198,7 +198,26 @@ func (t *AuthorizeOK) MarshalDagJSON(w io.Writer) error {
 	if err := t.Permissions.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Permissions: %w", err)
 	}
-	written++
+	written = true
+	if written {
+		if err := jw.WriteComma(); err != nil {
+			return err
+		}
+	}
+
+	// t.Tenant (did.DID) (struct)
+	if len("tenant") > 8192 {
+		return fmt.Errorf("string in field \"tenant\" was too long")
+	}
+	if err := jw.WriteString(string("tenant")); err != nil {
+		return fmt.Errorf("writing string for field \"tenant\": %w", err)
+	}
+	if err := jw.WriteObjectColon(); err != nil {
+		return err
+	}
+	if err := t.Tenant.MarshalDagJSON(jw); err != nil {
+		return fmt.Errorf("marshaling field t.Tenant: %w", err)
+	}
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -279,6 +298,13 @@ func (t *AuthorizeOK) UnmarshalDagJSON(r io.Reader) (err error) {
 					return fmt.Errorf("unmarshaling t.Permissions: %w", err)
 				}
 
+				// t.Tenant (did.DID) (struct)
+			case "tenant":
+
+				if err := t.Tenant.UnmarshalDagJSON(jr); err != nil {
+					return fmt.Errorf("unmarshaling t.Tenant: %w", err)
+				}
+
 			default:
 				// Field doesn't exist on this type, so ignore it
 				if err := jr.DiscardType(); err != nil {
diff --git a/commands/s3/request/types.go b/commands/s3/request/types.go
index 213bbf7..cf806ac 100644
--- a/commands/s3/request/types.go
+++ b/commands/s3/request/types.go
@@ -12,9 +12,9 @@ type AuthorizeArguments struct {
 }
 
 // AuthorizeOK is the successful result of `/s3/request/authorize`. It carries
-// the resolved bucket DID, the S3 permission set for the access key, the
-// derived signing key(s) and the (24-hour TTL) delegations re-delegated to the
-// invocation issuer.
+// the resolved bucket DID, the tenant DID, the S3 permission set for the access
+// key, the derived signing key(s) and the (24-hour TTL) delegations
+// re-delegated to the invocation issuer.
 //
 // Its Permissions, Keys and Delegations fields are slice-valued maps that
 // cbor-gen / dag-json-gen cannot generate inline, but they are wrapped in
@@ -25,6 +25,10 @@ type AuthorizeOK struct {
 	// requests are bucket-scoped, so this field may be nil. e.g. CreateBucket,
 	// ListAllMyBuckets, etc.
 	Bucket *did.DID `cborgen:"bucket,omitempty" dagjsongen:"bucket,omitempty"`
+	// Tenant is the DID of the tenant the access key belongs to (the tenant's
+	// did:plc). The gateway resolves its DID document to obtain the tenant's
+	// wrap key — the FEE tenant recipient every stored object is encrypted to.
+	Tenant did.DID `cborgen:"tenant" dagjsongen:"tenant"`
 	// Permissions maps the access key DID to its assigned S3 permissions.
 	Permissions s3.PermissionSet `cborgen:"permissions" dagjsongen:"permissions"`
 	// Keys maps the access key DID to its derived signing key(s).
diff --git a/commands/space/egress/json_gen.go b/commands/space/egress/json_gen.go
index fd49e62..561133c 100644
--- a/commands/space/egress/json_gen.go
+++ b/commands/space/egress/json_gen.go
@@ -29,7 +29,7 @@ func (t *TrackArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Endpoint (commands.CborURL) (struct)
 	if len("endpoint") > 8192 {
@@ -44,8 +44,8 @@ func (t *TrackArguments) MarshalDagJSON(w io.Writer) error {
 	if err := t.Endpoint.MarshalDagJSON(jw); err != nil {
 		return fmt.Errorf("marshaling field t.Endpoint: %w", err)
 	}
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -66,7 +66,6 @@ func (t *TrackArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Receipts: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/ucan/json_gen.go b/commands/ucan/json_gen.go
index b6d59f0..07763e6 100644
--- a/commands/ucan/json_gen.go
+++ b/commands/ucan/json_gen.go
@@ -126,7 +126,7 @@ func (t *RevokeArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Path ([]cid.Cid) (slice)
 	if len("path") > 8192 {
@@ -161,8 +161,8 @@ func (t *RevokeArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Path: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -183,7 +183,6 @@ func (t *RevokeArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Revoke: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/upload/json_gen.go b/commands/upload/json_gen.go
index fa19d3a..a7813d3 100644
--- a/commands/upload/json_gen.go
+++ b/commands/upload/json_gen.go
@@ -29,7 +29,7 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Index (cid.Cid) (struct)
 	if t.Index != nil {
@@ -53,9 +53,9 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -76,8 +76,8 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Root: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -116,7 +116,6 @@ func (t *AddArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Shards: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -353,7 +352,7 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -378,10 +377,10 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
 	if t.Size != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -410,7 +409,6 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
 	}
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
@@ -511,7 +509,7 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -536,9 +534,9 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -575,8 +573,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Results: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -597,7 +595,6 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Size: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
@@ -736,7 +733,7 @@ func (t *ListUploadItem) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Index (cid.Cid) (struct)
 	if t.Index != nil {
@@ -760,9 +757,9 @@ func (t *ListUploadItem) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -783,7 +780,6 @@ func (t *ListUploadItem) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Root: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/commands/upload/shard/json_gen.go b/commands/upload/shard/json_gen.go
index f17a139..d25c1f7 100644
--- a/commands/upload/shard/json_gen.go
+++ b/commands/upload/shard/json_gen.go
@@ -29,7 +29,7 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -54,9 +54,9 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -77,9 +77,9 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing CID for field t.Root: %w", err)
 	}
 
-	written++
+	written = true
 	if t.Size != nil {
-		if written > 0 {
+		if written {
 			if err := jw.WriteComma(); err != nil {
 				return err
 			}
@@ -108,7 +108,6 @@ func (t *ListArguments) MarshalDagJSON(w io.Writer) error {
 			}
 		}
 
-		written++
 	}
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
@@ -221,7 +220,7 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 	if err := jw.WriteObjectOpen(); err != nil {
 		return err
 	}
-	written := 0
+	written := false
 
 	// t.Cursor (string) (string)
 	if t.Cursor != nil {
@@ -246,9 +245,9 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 				return fmt.Errorf("writing string for field t.Cursor: %w", err)
 			}
 		}
-		written++
+		written = true
 	}
-	if written > 0 {
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -287,8 +286,8 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing array close for field t.Results: %w", err)
 	}
 
-	written++
-	if written > 0 {
+	written = true
+	if written {
 		if err := jw.WriteComma(); err != nil {
 			return err
 		}
@@ -309,7 +308,6 @@ func (t *ListOK) MarshalDagJSON(w io.Writer) error {
 		return fmt.Errorf("writing uint64 for field t.Size: %w", err)
 	}
 
-	written++
 	if err := jw.WriteObjectClose(); err != nil {
 		return err
 	}
diff --git a/go.mod b/go.mod
index 4d08a8a..ee8367e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,11 @@
 module github.com/fil-forge/libforge
 
-go 1.25.3
+go 1.27.0
 
 require (
-	github.com/alanshaw/dag-json-gen v0.0.8
+	github.com/alanshaw/dag-json-gen v0.0.9
 	github.com/fil-forge/automobile v0.0.1
-	github.com/fil-forge/ucantone v0.0.0-20260619013642-7985ec010b88
+	github.com/fil-forge/ucantone v0.0.0-20260827134420-25cf8340b9a1
 	github.com/filecoin-project/go-data-segment v0.0.1
 	github.com/filecoin-project/go-fil-commcid v0.3.1
 	github.com/filecoin-project/go-fil-commp-hashhash v0.4.0
@@ -22,8 +22,8 @@ require (
 
 require (
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.22 // indirect
+	github.com/klauspost/cpuid/v2 v2.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.24 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mr-tron/base58 v1.3.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -32,9 +32,9 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.28.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.5 // indirect
-	golang.org/x/crypto v0.53.0 // indirect
-	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
-	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/crypto v0.55.0 // indirect
+	golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa // indirect
+	golang.org/x/sys v0.47.0 // indirect
 	lukechampine.com/blake3 v1.4.1 // indirect
 	pitr.ca/jsontokenizer v0.3.2 // indirect
 )
diff --git a/go.sum b/go.sum
index 58a490e..5cd770c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/alanshaw/dag-json-gen v0.0.8 h1:Y0SfO2bp9ECDvcNbw6aQ91jmnfLC7UgRDshCeASDfT8=
-github.com/alanshaw/dag-json-gen v0.0.8/go.mod h1:v1YBZcS4B355MqxtyQr+fGNbEhm0CzHd+gOqOO/MZ+I=
+github.com/alanshaw/dag-json-gen v0.0.9 h1:q59Ra1mQB6HnFGI1ilFxsZvF1CqGN0XDlUWq16EJ6pw=
+github.com/alanshaw/dag-json-gen v0.0.9/go.mod h1:v1YBZcS4B355MqxtyQr+fGNbEhm0CzHd+gOqOO/MZ+I=
 github.com/fil-forge/automobile v0.0.1 h1:9xB3yc4l5b9EdRJSJcNwudgBFNHoMPEAdcb7GfobLhA=
 github.com/fil-forge/automobile v0.0.1/go.mod h1:TsO7jlO8ykJZY5tF8j4GsUcu3F02lEzxO7ULoB61hRA=
-github.com/fil-forge/ucantone v0.0.0-20260619013642-7985ec010b88 h1:N0gbL3Ik+XBYk4y/5BxTVymwbRGlxRXwC5eNWzi1bGI=
-github.com/fil-forge/ucantone v0.0.0-20260619013642-7985ec010b88/go.mod h1:rTIRXz4xErI4U+YlBU9ZvhlTbr4Hs5tJhVMwereVkSg=
+github.com/fil-forge/ucantone v0.0.0-20260827134420-25cf8340b9a1 h1:Tzy3lZ7+LAyVK4+qyWM97UMOtnXx05Wdn+rcTDLdBDE=
+github.com/fil-forge/ucantone v0.0.0-20260827134420-25cf8340b9a1/go.mod h1:aX35jlUs3hnWAhigjO8z9kMPiYnkW3XOW8iVoJyz7cg=
 github.com/filecoin-project/go-data-segment v0.0.1 h1:1wmDxOG4ubWQm3ZC1XI5nCon5qgSq7Ra3Rb6Dbu10Gs=
 github.com/filecoin-project/go-data-segment v0.0.1/go.mod h1:H0/NKbsRxmRFBcLibmABv+yFNHdmtl5AyplYLnb0Zv4=
 github.com/filecoin-project/go-fil-commcid v0.3.1 h1:4EfxpHSlvtkOqa9weG2Yt5kxFmPib2xU7Uc9Lbqk7fs=
@@ -16,12 +16,12 @@ github.com/ipfs/go-cid v0.6.2 h1:VuGwJd+KJTaMJ4S4d5EEf9SXc17YUblS5axCbocn9YE=
 github.com/ipfs/go-cid v0.6.2/go.mod h1:Xhwg8NzHeK9xPCEZkCw4idzPiuNMpX3fARuI5Iwj1Lo=
 github.com/ipfs/go-log/v2 v2.9.2 h1:O/5BB0elpkRILvT24rCJ5976wWd7u0nJ436T3rdYdc4=
 github.com/ipfs/go-log/v2 v2.9.2/go.mod h1:RziRwwXWhndlk8L75RnEe0zeAYaq2heKtEMc3jqUov0=
-github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
-github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
+github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw=
+github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
-github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
+github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mr-tron/base58 v1.3.0 h1:K6Y13R2h+dku0wOqKtecgRnBUBPrZzLZy5aIj8lCcJI=
@@ -56,12 +56,12 @@ go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo=
 go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q=
 go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
 go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
-golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
-golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 h1:jiDhWWeC7jfWqR9c/uplMOqJ0sbNlNWv0UkzE0vX1MA=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:xE1HEv6b+1SCZ5/uscMRjUBKtIxworgEcEi+/n9NQDQ=
-golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
-golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
+golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
+golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa h1:QSyA8ishJCyT21kER9KwNt0b7BM3iRK4x9QXhjN5Fdk=
+golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa/go.mod h1:zeBbvyFKDaLwa7CH/zI8KXt7gTl14SF7sO08Pl5jBCM=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 lukechampine.com/blake3 v1.4.1 h1:I3Smz7gso8w4/TunLKec6K2fn+kyKtDxr/xcQEN84Wg=