@fluidframework/container-runtime 2.63.0-359734 → 2.63.0

package/src/containerRuntime.ts

@@ -282,6 +282,7 @@ import {
 	type IRootSummarizerNodeWithGC,
 	type ISerializedElection,
 	isSummariesDisabled,
+	isSummaryOnRequest,
 	type ISubmitSummaryOptions,
 	type ISummarizeResults,
 	type ISummarizerInternalsProvider,
@@ -1935,7 +1936,7 @@ export class ContainerRuntime
 				}),
 			isBlobDeleted: (blobPath: string) => this.garbageCollector.isNodeDeleted(blobPath),
 			runtime: this,
-			stashedBlobs: pendingRuntimeState?.pendingAttachmentBlobs,
+			pendingBlobs: pendingRuntimeState?.pendingAttachmentBlobs,
 			createBlobPayloadPending: this.sessionSchema.createBlobPayloadPending === true,
 		});
 
@@ -2180,31 +2181,7 @@ export class ContainerRuntime
 			this.deltaManager,
 			this.baseLogger,
 		);
-		const orderedClientLogger = createChildLogger({
-			logger: this.baseLogger,
-			namespace: "OrderedClientElection",
-		});
-		const orderedClientCollection = new OrderedClientCollection(
-			orderedClientLogger,
-			this.innerDeltaManager,
-			this._quorum,
-		);
-		const orderedClientElectionForSummarizer = new OrderedClientElection(
-			orderedClientLogger,
-			orderedClientCollection,
-			this.electedSummarizerData ?? this.innerDeltaManager.lastSequenceNumber,
-			SummarizerClientElection.isClientEligible,
-			this.mc.config.getBoolean(
-				"Fluid.ContainerRuntime.OrderedClientElection.EnablePerformanceEvents",
-			),
-		);
-
-		this.summarizerClientElection = new SummarizerClientElection(
-			orderedClientLogger,
-			summaryCollection,
-			orderedClientElectionForSummarizer,
-			maxOpsSinceLastSummary,
-		);
+		const onRequestMode = isSummaryOnRequest(this.summaryConfiguration);
 
 		if (this.isSummarizerClient) {
 			// We want to dynamically import any thing inside summaryDelayLoadedModule module only when we are the summarizer client,
@@ -2227,9 +2204,38 @@ export class ContainerRuntime
 						() => this.innerDeltaManager.active,
 					),
 			);
-		} else if (SummarizerClientElection.clientDetailsPermitElection(this.clientDetails)) {
+		} else if (
+			!onRequestMode &&
+			SummarizerClientElection.clientDetailsPermitElection(this.clientDetails)
+		) {
 			// Only create a SummaryManager and SummarizerClientElection
 			// if summaries are enabled and we are not the summarizer client.
+			const orderedClientLogger = createChildLogger({
+				logger: this.baseLogger,
+				namespace: "OrderedClientElection",
+			});
+			const orderedClientCollection = new OrderedClientCollection(
+				orderedClientLogger,
+				this.innerDeltaManager,
+				this._quorum,
+			);
+			const orderedClientElectionForSummarizer = new OrderedClientElection(
+				orderedClientLogger,
+				orderedClientCollection,
+				this.electedSummarizerData ?? this.innerDeltaManager.lastSequenceNumber,
+				SummarizerClientElection.isClientEligible,
+				this.mc.config.getBoolean(
+					"Fluid.ContainerRuntime.OrderedClientElection.EnablePerformanceEvents",
+				),
+			);
+
+			this.summarizerClientElection = new SummarizerClientElection(
+				orderedClientLogger,
+				summaryCollection,
+				orderedClientElectionForSummarizer,
+				maxOpsSinceLastSummary,
+			);
+
 			const defaultAction = (): void => {
 				if (summaryCollection.opsSinceLastAck > maxOpsSinceLastSummary) {
 					this.mc.logger.sendTelemetryEvent({ eventName: "SummaryStatus:Behind" });

package/src/index.ts

@@ -113,6 +113,7 @@ export {
 	type ISummaryConfigurationHeuristics,
 	type ISummaryConfigurationDisableSummarizer,
 	type ISummaryConfigurationDisableHeuristics,
+	type ISummaryConfigurationWithSummaryOnRequest,
 	type ISummaryConfiguration,
 	DefaultSummaryConfiguration,
 } from "./summary/index.js";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.63.0-359734";
+export const pkgVersion = "2.63.0";

package/src/summary/index.ts

@@ -40,6 +40,7 @@ export {
 	type ISummaryConfigurationDisableHeuristics,
 	type ISummaryConfigurationDisableSummarizer,
 	type ISummaryConfigurationHeuristics,
+	type ISummaryConfigurationWithSummaryOnRequest,
 	type ISummaryBaseConfiguration,
 } from "./summarizerTypes.js";
 export {
@@ -98,6 +99,7 @@ export {
 	summarizerRequestUrl,
 	DefaultSummaryConfiguration,
 	isSummariesDisabled,
+	isSummaryOnRequest,
 } from "./summaryHelpers.js";
 export {
 	type IdCompressorMode,

package/src/summary/summarizerTypes.ts

@@ -759,10 +759,19 @@ export interface ISummaryConfigurationDisableHeuristics extends ISummaryBaseConf
 	state: "disableHeuristics";
 }
 
+/**
+ * Configuration used internally to indicate on-demand summaries only (no election/heuristics).
+ * @legacy @beta
+ */
+export interface ISummaryConfigurationWithSummaryOnRequest extends ISummaryBaseConfiguration {
+	state: "summaryOnRequest";
+}
+
 /**
  * @legacy @beta
  */
 export type ISummaryConfiguration =
 	| ISummaryConfigurationDisableSummarizer
 	| ISummaryConfigurationDisableHeuristics
-	| ISummaryConfigurationHeuristics;
+	| ISummaryConfigurationHeuristics
+	| ISummaryConfigurationWithSummaryOnRequest;

package/src/summary/summaryDelayLoadedModule/runningSummarizer.ts

@@ -227,14 +227,12 @@ export class RunningSummarizer
 			},
 		});
 
-		if (configuration.state !== "disableHeuristics") {
-			assert(
-				this.configuration.state === "enabled",
-				0x2ea /* "Configuration state should be enabled" */,
-			);
+		// Only create heuristics when in 'enabled' mode.
+		// This bypasses heuristics for 'disableHeuristics' and 'summaryOnRequest' configurations.
+		if (configuration.state === "enabled") {
 			this.heuristicRunner = new SummarizeHeuristicRunner(
 				heuristicData,
-				this.configuration,
+				configuration,
 				(reason) => this.trySummarize(reason),
 				this.mc.logger,
 			);

package/src/summary/summaryHelpers.ts

@@ -25,6 +25,10 @@ export function isSummariesDisabled(
 	return config.state === "disabled";
 }
 
+export function isSummaryOnRequest(config: { state?: string }): boolean {
+	return config.state === "summaryOnRequest";
+}
+
 /**
  * @legacy @beta
  */