@fluidframework/routerlicious-driver 2.0.0-rc.4.0.6 → 2.0.0-rc.5.0.0

package/src/documentService.ts

@@ -5,13 +5,22 @@
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
-import * as api from "@fluidframework/driver-definitions/internal";
+import { IClient } from "@fluidframework/driver-definitions";
+import {
+	IDocumentServiceEvents,
+	IDocumentServicePolicies,
+	IDocumentDeltaConnection,
+	IDocumentDeltaStorageService,
+	IDocumentService,
+	IDocumentStorageService,
+	IDocumentStorageServicePolicies,
+	IResolvedUrl,
+} from "@fluidframework/driver-definitions/internal";
 import {
 	NetworkErrorBasic,
 	RateLimiter,
 	canRetryOnError,
 } from "@fluidframework/driver-utils/internal";
-import { IClient } from "@fluidframework/protocol-definitions";
 import {
 	ITelemetryLoggerExt,
 	PerformanceEvent,
@@ -52,9 +61,9 @@ const RediscoverAfterTimeSinceDiscoveryMs = 5 * 60000; // 5 minute
  * clients.
  */
 export class DocumentService
-	extends TypedEventEmitter<api.IDocumentServiceEvents>
+	extends TypedEventEmitter<IDocumentServiceEvents>
 	// eslint-disable-next-line import/namespace
-	implements api.IDocumentService
+	implements IDocumentService
 {
 	private lastDiscoveredAt: number = Date.now();
 	private discoverP: Promise<void> | undefined;
@@ -62,12 +71,14 @@ export class DocumentService
 	private storageManager: GitManager | undefined;
 	private noCacheStorageManager: GitManager | undefined;
 
+	private _policies: IDocumentServicePolicies | undefined;
+
 	public get resolvedUrl() {
 		return this._resolvedUrl;
 	}
 
 	constructor(
-		private _resolvedUrl: api.IResolvedUrl,
+		private _resolvedUrl: IResolvedUrl,
 		protected ordererUrl: string,
 		private deltaStorageUrl: string,
 		private deltaStreamUrl: string,
@@ -77,12 +88,12 @@ export class DocumentService
 		protected tenantId: string,
 		protected documentId: string,
 		protected ordererRestWrapper: RouterliciousOrdererRestWrapper,
-		private readonly documentStorageServicePolicies: api.IDocumentStorageServicePolicies,
+		private readonly documentStorageServicePolicies: IDocumentStorageServicePolicies,
 		private readonly driverPolicies: IRouterliciousDriverPolicies,
 		private readonly blobCache: ICache<ArrayBufferLike>,
 		private readonly wholeSnapshotTreeCache: ICache<INormalizedWholeSnapshot>,
 		private readonly shreddedSummaryTreeCache: ICache<ISnapshotTreeVersion>,
-		private readonly discoverFluidResolvedUrl: () => Promise<api.IResolvedUrl>,
+		private readonly discoverFluidResolvedUrl: () => Promise<IResolvedUrl>,
 		private storageRestWrapper: RouterliciousStorageRestWrapper,
 		private readonly storageTokenFetcher: TokenFetcher,
 		private readonly ordererTokenFetcher: TokenFetcher,
@@ -92,6 +103,10 @@ export class DocumentService
 
 	private documentStorageService: DocumentStorageService | undefined;
 
+	public get policies(): IDocumentServicePolicies | undefined {
+		return this._policies;
+	}
+
 	public dispose() {}
 
 	/**
@@ -99,7 +114,7 @@ export class DocumentService
 	 *
 	 * @returns returns the document storage service for routerlicious driver.
 	 */
-	public async connectToStorage(): Promise<api.IDocumentStorageService> {
+	public async connectToStorage(): Promise<IDocumentStorageService> {
 		if (this.documentStorageService !== undefined) {
 			return this.documentStorageService;
 		}
@@ -162,7 +177,7 @@ export class DocumentService
 	 *
 	 * @returns returns the document delta storage service for routerlicious driver.
 	 */
-	public async connectToDeltaStorage(): Promise<api.IDocumentDeltaStorageService> {
+	public async connectToDeltaStorage(): Promise<IDocumentDeltaStorageService> {
 		await this.connectToStorage();
 		assert(!!this.documentStorageService, 0x0b1 /* "Storage service not initialized" */);
 
@@ -171,9 +186,7 @@ export class DocumentService
 
 			if (shouldUpdateDiscoveredSessionInfo) {
 				await this.refreshDiscovery();
-				const rateLimiter = new RateLimiter(
-					this.driverPolicies.maxConcurrentOrdererRequests,
-				);
+				const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
 				this.ordererRestWrapper = RouterliciousOrdererRestWrapper.load(
 					this.ordererTokenFetcher,
 					this.logger,
@@ -205,7 +218,7 @@ export class DocumentService
 	 *
 	 * @returns returns the document delta stream service for routerlicious driver.
 	 */
-	public async connectToDeltaStream(client: IClient): Promise<api.IDocumentDeltaConnection> {
+	public async connectToDeltaStream(client: IClient): Promise<IDocumentDeltaConnection> {
 		const connect = async (refreshToken?: boolean) => {
 			let ordererToken = await this.ordererRestWrapper.getToken();
 			if (this.shouldUpdateDiscoveredSessionInfo()) {
@@ -273,6 +286,17 @@ export class DocumentService
 		// Retry with new token on authorization error; otherwise, allow container layer to handle.
 		try {
 			const connection = await connect();
+			// Enable single-commit summaries via driver policy based on the enable_single_commit_summary flag which maybe provided by the service during connection.
+			// summarizeProtocolTree flag is used by the loader layer to attach protocol tree along with the summary required in the single-commit summaries.
+			const shouldSummarizeProtocolTree = (connection as R11sDocumentDeltaConnection).details
+				?.supportedFeatures?.enable_single_commit_summary
+				? true
+				: false;
+			this._policies = {
+				...this._policies,
+				summarizeProtocolTree: shouldSummarizeProtocolTree,
+			};
+
 			return connection;
 		} catch (error: any) {
 			if (error?.statusCode === 401) {

package/src/documentServiceFactory.ts

@@ -6,6 +6,7 @@
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import { getW3CData } from "@fluidframework/driver-base/internal";
+import { ISummaryTree } from "@fluidframework/driver-definitions";
 import {
 	FiveDaysMs,
 	IDocumentService,
@@ -20,7 +21,6 @@ import {
 	getQuorumValuesFromProtocolSummary,
 	isCombinedAppAndProtocolSummary,
 } from "@fluidframework/driver-utils/internal";
-import { ISummaryTree } from "@fluidframework/protocol-definitions";
 import {
 	ISession,
 	convertSummaryTreeToWholeSummaryTree,

package/src/documentStorageService.ts

@@ -7,12 +7,13 @@ import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
 	LoaderCachingPolicy,
+	ISnapshotTree,
+	IVersion,
 } from "@fluidframework/driver-definitions/internal";
 import {
 	DocumentStorageServiceProxy,
 	PrefetchDocumentStorageService,
 } from "@fluidframework/driver-utils/internal";
-import { ISnapshotTree, IVersion } from "@fluidframework/protocol-definitions";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 import { ICache } from "./cache.js";
@@ -53,7 +54,7 @@ export class DocumentStorageService extends DocumentStorageServiceProxy {
 					snapshotTreeCache,
 					noCacheGitManager,
 					getStorageManager,
-			  )
+				)
 			: new ShreddedSummaryDocumentStorageService(
 					id,
 					manager,
@@ -63,7 +64,7 @@ export class DocumentStorageService extends DocumentStorageServiceProxy {
 					blobCache,
 					shreddedSummaryTreeCache,
 					getStorageManager,
-			  );
+				);
 		// TODO: worth prefetching latest summary making version + snapshot call with WholeSummary storage?
 		if (
 			!driverPolicies?.enableWholeSummaryUpload &&

package/src/errorUtils.ts

@@ -93,11 +93,7 @@ export function createR11sNetworkError(
 			error = new NonRetryableError(errorMessage, errorType, props);
 			break;
 		case 429:
-			error = createGenericNetworkError(
-				errorMessage,
-				{ canRetry: true, retryAfterMs },
-				props,
-			);
+			error = createGenericNetworkError(errorMessage, { canRetry: true, retryAfterMs }, props);
 			break;
 		case 500:
 		case 502:

package/src/gitManager.ts

@@ -3,7 +3,14 @@
  * Licensed under the MIT License.
  */
 
-import * as resources from "@fluidframework/gitresources";
+import type {
+	IGitBlob,
+	IGitCommitDetails,
+	IGitCreateBlobParams,
+	IGitCreateBlobResponse,
+	IGitCreateTreeParams,
+	IGitTree,
+} from "@fluidframework/driver-definitions/internal";
 import {
 	IWholeSummaryPayload,
 	IWriteSummaryResponse,
@@ -22,35 +29,33 @@ export class GitManager implements IGitManager {
 	public async getCommits(
 		sha: string,
 		count: number,
-	): Promise<IR11sResponse<resources.ICommitDetails[]>> {
+	): Promise<IR11sResponse<IGitCommitDetails[]>> {
 		return this.historian.getCommits(sha, count);
 	}
 
 	/**
 	 * Reads the object with the given ID. We defer to the client implementation to do the actual read.
 	 */
-	public async getTree(root: string, recursive = true): Promise<IR11sResponse<resources.ITree>> {
+	public async getTree(root: string, recursive = true): Promise<IR11sResponse<IGitTree>> {
 		return this.historian.getTree(root, recursive);
 	}
 
-	public async getBlob(sha: string): Promise<IR11sResponse<resources.IBlob>> {
+	public async getBlob(sha: string): Promise<IR11sResponse<IGitBlob>> {
 		return this.historian.getBlob(sha);
 	}
 
 	public async createBlob(
 		content: string,
 		encoding: "utf-8" | "base64",
-	): Promise<IR11sResponse<resources.ICreateBlobResponse>> {
-		const blob: resources.ICreateBlobParams = {
+	): Promise<IR11sResponse<IGitCreateBlobResponse>> {
+		const blob: IGitCreateBlobParams = {
 			content,
 			encoding,
 		};
 		return this.historian.createBlob(blob);
 	}
 
-	public async createGitTree(
-		params: resources.ICreateTreeParams,
-	): Promise<IR11sResponse<resources.ITree>> {
+	public async createGitTree(params: IGitCreateTreeParams): Promise<IR11sResponse<IGitTree>> {
 		const treeP = this.historian.createTree(params);
 		return treeP;
 	}

package/src/historian.ts

@@ -4,7 +4,14 @@
  */
 
 import { fromUtf8ToBase64 } from "@fluid-internal/client-utils";
-import * as git from "@fluidframework/gitresources";
+import type {
+	IGitBlob,
+	IGitCommitDetails,
+	IGitCreateBlobParams,
+	IGitCreateBlobResponse,
+	IGitCreateTreeParams,
+	IGitTree,
+} from "@fluidframework/driver-definitions/internal";
 import {
 	IWholeSummaryPayload,
 	IWriteSummaryResponse,
@@ -43,17 +50,17 @@ export class Historian implements IHistorian {
 		}
 	}
 
-	public async getBlob(sha: string): Promise<IR11sResponse<git.IBlob>> {
-		return this.restWrapper.get<git.IBlob>(
+	public async getBlob(sha: string): Promise<IR11sResponse<IGitBlob>> {
+		return this.restWrapper.get<IGitBlob>(
 			`/git/blobs/${encodeURIComponent(sha)}`,
 			this.getQueryString(),
 		);
 	}
 
 	public async createBlob(
-		blob: git.ICreateBlobParams,
-	): Promise<IR11sResponse<git.ICreateBlobResponse>> {
-		return this.restWrapper.post<git.ICreateBlobResponse>(
+		blob: IGitCreateBlobParams,
+	): Promise<IR11sResponse<IGitCreateBlobResponse>> {
+		return this.restWrapper.post<IGitCreateBlobResponse>(
 			`/git/blobs`,
 			blob,
 			this.getQueryString(),
@@ -63,9 +70,9 @@ export class Historian implements IHistorian {
 	public async getCommits(
 		sha: string,
 		count: number,
-	): Promise<IR11sResponse<git.ICommitDetails[]>> {
+	): Promise<IR11sResponse<IGitCommitDetails[]>> {
 		return this.restWrapper
-			.get<git.ICommitDetails[]>(`/commits`, this.getQueryString({ count, sha }))
+			.get<IGitCommitDetails[]>(`/commits`, this.getQueryString({ count, sha }))
 			.catch(async (error) =>
 				error.statusCode === 400 || error.statusCode === 404
 					? {
@@ -73,17 +80,17 @@ export class Historian implements IHistorian {
 							headers: new Map(),
 							propsToLog: {},
 							requestUrl: "",
-					  }
-					: Promise.reject<IR11sResponse<git.ICommitDetails[]>>(error),
+						}
+					: Promise.reject<IR11sResponse<IGitCommitDetails[]>>(error),
 			);
 	}
 
-	public async createTree(tree: git.ICreateTreeParams): Promise<IR11sResponse<git.ITree>> {
-		return this.restWrapper.post<git.ITree>(`/git/trees`, tree, this.getQueryString());
+	public async createTree(tree: IGitCreateTreeParams): Promise<IR11sResponse<IGitTree>> {
+		return this.restWrapper.post<IGitTree>(`/git/trees`, tree, this.getQueryString());
 	}
 
-	public async getTree(sha: string, recursive: boolean): Promise<IR11sResponse<git.ITree>> {
-		return this.restWrapper.get<git.ITree>(
+	public async getTree(sha: string, recursive: boolean): Promise<IR11sResponse<IGitTree>> {
+		return this.restWrapper.get<IGitTree>(
 			`/git/trees/${encodeURIComponent(sha)}`,
 			this.getQueryString({ recursive: recursive ? 1 : 0 }),
 		);

package/src/nullBlobStorageService.ts

@@ -3,37 +3,40 @@
  * Licensed under the MIT License.
  */
 
+import { ISummaryTree, ISummaryHandle } from "@fluidframework/driver-definitions";
 import {
 	IDocumentStorageService,
 	ISummaryContext,
+	IVersion,
+	ISnapshotTree,
+	ICreateBlobResponse,
 } from "@fluidframework/driver-definitions/internal";
-import * as api from "@fluidframework/protocol-definitions";
 
 /**
  * Document access to underlying storage. It is default implementation of a storage service.
  * Does not read/write anything.
  */
 export class NullBlobStorageService implements IDocumentStorageService {
-	public async getSnapshotTree(version?: api.IVersion): Promise<api.ISnapshotTree | null> {
+	public async getSnapshotTree(version?: IVersion): Promise<ISnapshotTree | null> {
 		return version ? Promise.reject(new Error("Invalid operation")) : null;
 	}
 
-	public async getVersions(versionId: string | null, count: number): Promise<api.IVersion[]> {
+	public async getVersions(versionId: string | null, count: number): Promise<IVersion[]> {
 		return [];
 	}
 
 	public async uploadSummaryWithContext(
-		summary: api.ISummaryTree,
+		summary: ISummaryTree,
 		context: ISummaryContext,
 	): Promise<string> {
 		throw new Error("Invalid operation");
 	}
 
-	public async downloadSummary(handle: api.ISummaryHandle): Promise<api.ISummaryTree> {
+	public async downloadSummary(handle: ISummaryHandle): Promise<ISummaryTree> {
 		throw new Error("Invalid operation");
 	}
 
-	public async createBlob(file: ArrayBufferLike): Promise<api.ICreateBlobResponse> {
+	public async createBlob(file: ArrayBufferLike): Promise<ICreateBlobResponse> {
 		throw new Error("Null blob storage can not create blob");
 	}
 	public async readBlob(blobId: string): Promise<ArrayBufferLike> {

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-rc.4.0.6";
+export const pkgVersion = "2.0.0-rc.5.0.0";

package/src/r11sSnapshotParser.ts

@@ -4,7 +4,7 @@
  */
 
 import { stringToBuffer } from "@fluid-internal/client-utils";
-import { ISnapshotTree } from "@fluidframework/protocol-definitions";
+import { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 
 import {
 	INormalizedWholeSnapshot,

package/src/restWrapper.ts

@@ -155,12 +155,10 @@ export class RouterliciousRestWrapper extends RestWrapper {
 				const err = errorMessage.includes("failed, reason: self signed certificate")
 					? new NonRetryableError(errorMessage, RouterliciousErrorTypes.sslCertError, {
 							driverVersion,
-					  })
-					: new GenericNetworkError(
-							errorMessage,
-							errorMessage.startsWith("NetworkError"),
-							{ driverVersion },
-					  );
+						})
+					: new GenericNetworkError(errorMessage, errorMessage.startsWith("NetworkError"), {
+							driverVersion,
+						});
 				throw err;
 			});
 			return {
@@ -177,7 +175,9 @@ export class RouterliciousRestWrapper extends RestWrapper {
 
 		const bodySize = text.length;
 		start = performance.now();
-		const responseBody: any = response.headers.get("content-type")?.includes("application/json")
+		const responseBody: any = response.headers
+			.get("content-type")
+			?.includes("application/json")
 			? JSON.parse(text)
 			: text;
 		const parseTime = performance.now() - start;

package/src/retriableGitManager.ts

@@ -3,8 +3,14 @@
  * Licensed under the MIT License.
  */
 
+import type {
+	IGitCommitDetails,
+	IGitBlob,
+	IGitCreateBlobResponse,
+	IGitCreateTreeParams,
+	IGitTree,
+} from "@fluidframework/driver-definitions/internal";
 import { runWithRetry } from "@fluidframework/driver-utils/internal";
-import type * as git from "@fluidframework/gitresources";
 import {
 	IWholeSummaryPayload,
 	IWriteSummaryResponse,
@@ -24,21 +30,21 @@ export class RetriableGitManager implements IGitManager {
 	public async getCommits(
 		sha: string,
 		count: number,
-	): Promise<IR11sResponse<git.ICommitDetails[]>> {
+	): Promise<IR11sResponse<IGitCommitDetails[]>> {
 		return this.runWithRetry(
 			async () => this.internalGitManager.getCommits(sha, count),
 			"gitManager_getCommits",
 		);
 	}
 
-	public async getTree(root: string, recursive: boolean): Promise<IR11sResponse<git.ITree>> {
+	public async getTree(root: string, recursive: boolean): Promise<IR11sResponse<IGitTree>> {
 		return this.runWithRetry(
 			async () => this.internalGitManager.getTree(root, recursive),
 			"gitManager_getTree",
 		);
 	}
 
-	public async getBlob(sha: string): Promise<IR11sResponse<git.IBlob>> {
+	public async getBlob(sha: string): Promise<IR11sResponse<IGitBlob>> {
 		return this.runWithRetry(
 			async () => this.internalGitManager.getBlob(sha),
 			"gitManager_getBlob",
@@ -48,14 +54,14 @@ export class RetriableGitManager implements IGitManager {
 	public async createBlob(
 		content: string,
 		encoding: string,
-	): Promise<IR11sResponse<git.ICreateBlobResponse>> {
+	): Promise<IR11sResponse<IGitCreateBlobResponse>> {
 		return this.runWithRetry(
 			async () => this.internalGitManager.createBlob(content, encoding),
 			"gitManager_createBlob",
 		);
 	}
 
-	public async createGitTree(params: git.ICreateTreeParams): Promise<IR11sResponse<git.ITree>> {
+	public async createGitTree(params: IGitCreateTreeParams): Promise<IR11sResponse<IGitTree>> {
 		return this.runWithRetry(
 			async () => this.internalGitManager.createGitTree(params),
 			"gitManager_createGitTree",

package/src/shreddedSummaryDocumentStorageService.ts

@@ -4,19 +4,16 @@
  */
 
 import { Uint8ArrayToString, stringToBuffer } from "@fluid-internal/client-utils";
+import { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
 import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
 	ISummaryContext,
-} from "@fluidframework/driver-definitions/internal";
-import { buildGitTreeHierarchy } from "@fluidframework/protocol-base";
-import {
 	ICreateBlobResponse,
 	ISnapshotTreeEx,
-	ISummaryHandle,
-	ISummaryTree,
 	IVersion,
-} from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
+import { buildGitTreeHierarchy } from "@fluidframework/driver-utils/internal";
 import {
 	ITelemetryLoggerExt,
 	MonitoringContext,
@@ -125,7 +122,7 @@ export class ShreddedSummaryDocumentStorageService implements IDocumentStorageSe
 			},
 			async (event) => {
 				const manager = await this.getStorageManager();
-				const response = (await manager.getTree(requestVersion!.treeId)).content;
+				const response = (await manager.getTree(requestVersion.treeId)).content;
 				event.end({
 					size: response.tree.length,
 				});
@@ -226,7 +223,7 @@ export class ShreddedSummaryDocumentStorageService implements IDocumentStorageSe
 					// Clear the cache as the getSnapshotTree call will fill the cache.
 					this.blobsShaCache.clear();
 					return this.getSnapshotTree(versions[0]);
-			  })
+				})
 			: undefined;
 	}
 

package/src/storageContracts.ts

@@ -3,8 +3,15 @@
  * Licensed under the MIT License.
  */
 
-import * as git from "@fluidframework/gitresources";
-import * as api from "@fluidframework/protocol-definitions";
+import { ISummaryTree } from "@fluidframework/driver-definitions";
+import type {
+	IGitBlob,
+	IGitCommitDetails,
+	IGitCreateBlobParams,
+	IGitCreateBlobResponse,
+	IGitCreateTreeParams,
+	IGitTree,
+} from "@fluidframework/driver-definitions/internal";
 import {
 	IWholeSummaryPayload,
 	IWholeSummaryPayloadType,
@@ -18,11 +25,11 @@ import { IR11sResponse } from "./restWrapper.js";
  * Interface to a generic Git provider
  */
 export interface IHistorian {
-	getBlob(sha: string): Promise<IR11sResponse<git.IBlob>>;
-	createBlob(blob: git.ICreateBlobParams): Promise<IR11sResponse<git.ICreateBlobResponse>>;
-	getCommits(sha: string, count: number): Promise<IR11sResponse<git.ICommitDetails[]>>;
-	createTree(tree: git.ICreateTreeParams): Promise<IR11sResponse<git.ITree>>;
-	getTree(sha: string, recursive: boolean): Promise<IR11sResponse<git.ITree>>;
+	getBlob(sha: string): Promise<IR11sResponse<IGitBlob>>;
+	createBlob(blob: IGitCreateBlobParams): Promise<IR11sResponse<IGitCreateBlobResponse>>;
+	getCommits(sha: string, count: number): Promise<IR11sResponse<IGitCommitDetails[]>>;
+	createTree(tree: IGitCreateTreeParams): Promise<IR11sResponse<IGitTree>>;
+	getTree(sha: string, recursive: boolean): Promise<IR11sResponse<IGitTree>>;
 	createSummary(
 		summary: IWholeSummaryPayload,
 		initial?: boolean,
@@ -31,11 +38,14 @@ export interface IHistorian {
 }
 
 export interface IGitManager {
-	getCommits(sha: string, count: number): Promise<IR11sResponse<git.ICommitDetails[]>>;
-	getTree(root: string, recursive: boolean): Promise<IR11sResponse<git.ITree>>;
-	getBlob(sha: string): Promise<IR11sResponse<git.IBlob>>;
-	createBlob(content: string, encoding: string): Promise<IR11sResponse<git.ICreateBlobResponse>>;
-	createGitTree(params: git.ICreateTreeParams): Promise<IR11sResponse<git.ITree>>;
+	getCommits(sha: string, count: number): Promise<IR11sResponse<IGitCommitDetails[]>>;
+	getTree(root: string, recursive: boolean): Promise<IR11sResponse<IGitTree>>;
+	getBlob(sha: string): Promise<IR11sResponse<IGitBlob>>;
+	createBlob(
+		content: string,
+		encoding: string,
+	): Promise<IR11sResponse<IGitCreateBlobResponse>>;
+	createGitTree(params: IGitCreateTreeParams): Promise<IR11sResponse<IGitTree>>;
 	createSummary(
 		summary: IWholeSummaryPayload,
 		initial?: boolean,
@@ -56,7 +66,7 @@ export interface ISummaryUploadManager {
 	 * @returns Id of created tree as a string.
 	 */
 	writeSummaryTree(
-		summaryTree: api.ISummaryTree,
+		summaryTree: ISummaryTree,
 		parentHandle: string,
 		summaryType: IWholeSummaryPayloadType,
 		sequenceNumber?: number,

package/src/summaryTreeUploadManager.ts

@@ -5,14 +5,10 @@
 
 import { IsoBuffer, Uint8ArrayToString, gitHashFile } from "@fluid-internal/client-utils";
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
-import { ICreateTreeEntry } from "@fluidframework/gitresources";
-import { getGitMode, getGitType } from "@fluidframework/protocol-base";
-import {
-	ISnapshotTreeEx,
-	ISummaryTree,
-	SummaryObject,
-	SummaryType,
-} from "@fluidframework/protocol-definitions";
+import { ISummaryTree, SummaryObject, SummaryType } from "@fluidframework/driver-definitions";
+import type { IGitCreateTreeEntry } from "@fluidframework/driver-definitions/internal";
+import { ISnapshotTreeEx } from "@fluidframework/driver-definitions/internal";
+import { getGitMode, getGitType } from "@fluidframework/driver-utils/internal";
 import { IWholeSummaryPayloadType } from "@fluidframework/server-services-client";
 
 import { IGitManager, ISummaryUploadManager } from "./storageContracts.js";
@@ -48,7 +44,7 @@ export class SummaryTreeUploadManager implements ISummaryUploadManager {
 			Object.keys(summaryTree.tree).map(async (key) => {
 				const entry = summaryTree.tree[key];
 				const pathHandle = await this.writeSummaryTreeObject(entry, previousFullSnapshot);
-				const treeEntry: ICreateTreeEntry = {
+				const treeEntry: IGitCreateTreeEntry = {
 					mode: getGitMode(entry),
 					path: encodeURIComponent(key),
 					sha: pathHandle,

package/src/tokens.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITokenClaims } from "@fluidframework/protocol-definitions";
+import { ITokenClaims } from "@fluidframework/driver-definitions/internal";
 
 /**
  * Abstracts the discovery of claims contained within a token.

package/src/treeUtils.ts

@@ -5,12 +5,8 @@
 
 import { IsoBuffer } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
-import {
-	ISnapshotTree,
-	ISummaryTree,
-	SummaryObject,
-	SummaryType,
-} from "@fluidframework/protocol-definitions";
+import { ISummaryTree, SummaryObject, SummaryType } from "@fluidframework/driver-definitions";
+import { ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 
 import { INormalizedWholeSnapshot } from "./contracts.js";
 

package/src/wholeSummaryDocumentStorageService.ts

@@ -6,18 +6,15 @@
 import { Uint8ArrayToString, performance, stringToBuffer } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
 import { getW3CData, promiseRaceWithWinner } from "@fluidframework/driver-base/internal";
+import { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
 import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
 	ISummaryContext,
-} from "@fluidframework/driver-definitions/internal";
-import {
 	ICreateBlobResponse,
 	ISnapshotTree,
-	ISummaryHandle,
-	ISummaryTree,
 	IVersion,
-} from "@fluidframework/protocol-definitions";
+} from "@fluidframework/driver-definitions/internal";
 import {
 	ITelemetryLoggerExt,
 	MonitoringContext,