@wictorwilen/cocogen 1.0.50 → 1.1.0-preview.2

package/dist/init/templates/dotnet/Core/PeoplePayload.cs.ejs

@@ -1,61 +1,23 @@
 using System;
 using System.Collections.Generic;
 using System.Text.Json;
+<% const hasLocalGraphTypes = peopleProfileTypes.some((type) => !type.sourcePackage); -%>
+<% if (hasLocalGraphTypes) { -%>
 using System.Text.Json.Serialization;
 using Date = System.DateOnly;
-
-namespace <%= namespaceName %>.Core;
-
-public enum PeoplePayloadKind
-{
-    String,
-    StringCollection
-}
-
-<% if (graphEnums && graphEnums.length > 0) { -%>
-<% for (const enumDef of graphEnums) { -%>
-[JsonConverter(typeof(JsonStringEnumConverter))]
-public enum <%= enumDef.csName %>
-{
-<% for (const value of enumDef.values) { -%>
-    <%= value %>,
 <% } -%>
-}
 
-<% } -%>
-<% } -%>
+namespace <%= namespaceName %>.Core;
 
-public sealed record PeopleLabelDefinition(
+public sealed record PeopleLabelSerializationOptions(
     string Label,
-    string GraphTypeName,
-    PeoplePayloadKind PayloadKind,
     IReadOnlyList<string> RequiredFields,
-    int? CollectionLimit
+    int? CollectionLimit,
+    bool DisallowReadonlyItemFacetFields
 );
 
 public static class PeoplePayload
 {
-    private static readonly Dictionary<string, PeopleLabelDefinition> Definitions = new(StringComparer.OrdinalIgnoreCase)
-    {
-<% for (const def of peopleLabelDefinitions) { -%>
-<% const requiredFields = def.requiredFields.length ? `new[] { ${def.requiredFields.map((field) => JSON.stringify(field)).join(", ")} }` : "Array.Empty<string>()"; -%>
-        [<%= JSON.stringify(def.label) %>] = new PeopleLabelDefinition(
-            <%= JSON.stringify(def.label) %>,
-            <%= JSON.stringify(def.graphTypeName) %>,
-            PeoplePayloadKind.<%= def.payloadType === "string" ? "String" : "StringCollection" %>,
-            <%- requiredFields %>,
-            <%= def.collectionLimit ?? "null" %>
-        ),
-<% } -%>
-    };
-
-    private static readonly HashSet<string> ItemFacetTypes = new(StringComparer.OrdinalIgnoreCase)
-    {
-<% for (const typeName of itemFacetTypeNames ?? []) { -%>
-        <%= JSON.stringify(typeName) %>,
-<% } -%>
-    };
-
     private static readonly string[] ItemFacetReadOnlyFields =
     {
 <% for (const field of itemFacetReadOnlyFields ?? []) { -%>
@@ -63,32 +25,30 @@ public static class PeoplePayload
 <% } -%>
     };
 
-    public static string? SerializeStringLabel(string label, string? value, string propertyName)
+    public static string? SerializeStringLabel(string? value, string propertyName, PeopleLabelSerializationOptions options)
     {
         if (value is null) return value;
         if (string.IsNullOrWhiteSpace(value))
         {
             throw new InvalidOperationException(
-                $"People label '{label}' on property '{propertyName}' must be a non-empty JSON string.");
+                $"People label '{options.Label}' on property '{propertyName}' must be a non-empty JSON string.");
         }
-        var definition = GetDefinition(label, PeoplePayloadKind.String, propertyName);
-        var element = ParseJsonObject(label, value, propertyName);
-        if (ItemFacetTypes.Contains(definition.GraphTypeName))
+        var element = ParseJsonObject(options.Label, value, propertyName);
+        if (options.DisallowReadonlyItemFacetFields)
         {
-            EnsureItemFacetReadOnlyFields(definition.Label, element, propertyName);
+            EnsureItemFacetReadOnlyFields(options.Label, element, propertyName);
         }
-        ValidateRequiredFields(definition, element, propertyName);
+        ValidateRequiredFields(options, element, propertyName);
         return value;
     }
 
-    public static List<string>? SerializeCollectionLabel(string label, List<string>? values, string propertyName)
+    public static List<string>? SerializeCollectionLabel(List<string>? values, string propertyName, PeopleLabelSerializationOptions options)
     {
         if (values is null) return values;
-        var definition = GetDefinition(label, PeoplePayloadKind.StringCollection, propertyName);
-        if (definition.CollectionLimit.HasValue && values.Count > definition.CollectionLimit.Value)
+        if (options.CollectionLimit.HasValue && values.Count > options.CollectionLimit.Value)
         {
             throw new InvalidOperationException(
-                $"People label '{label}' on property '{propertyName}' exceeds collection limit of {definition.CollectionLimit.Value}.");
+                $"People label '{options.Label}' on property '{propertyName}' exceeds collection limit of {options.CollectionLimit.Value}.");
         }
 
         for (var index = 0; index < values.Count; index++)
@@ -97,36 +57,20 @@ public static class PeoplePayload
             if (string.IsNullOrWhiteSpace(value))
             {
                 throw new InvalidOperationException(
-                    $"People label '{label}' on property '{propertyName}' contains an empty payload at index {index}.");
+                    $"People label '{options.Label}' on property '{propertyName}' contains an empty payload at index {index}.");
             }
 
-            var element = ParseJsonObject(label, value, propertyName);
-            if (ItemFacetTypes.Contains(definition.GraphTypeName))
+            var element = ParseJsonObject(options.Label, value, propertyName);
+            if (options.DisallowReadonlyItemFacetFields)
             {
-                EnsureItemFacetReadOnlyFields(definition.Label, element, propertyName);
+                EnsureItemFacetReadOnlyFields(options.Label, element, propertyName);
             }
-            ValidateRequiredFields(definition, element, propertyName);
+            ValidateRequiredFields(options, element, propertyName);
         }
 
         return values;
     }
 
-    private static PeopleLabelDefinition GetDefinition(string label, PeoplePayloadKind expected, string propertyName)
-    {
-        if (!Definitions.TryGetValue(label, out var definition))
-        {
-            throw new InvalidOperationException($"Unknown people label '{label}' on property '{propertyName}'.");
-        }
-
-        if (definition.PayloadKind != expected)
-        {
-            throw new InvalidOperationException(
-                $"People label '{label}' on property '{propertyName}' expects {definition.PayloadKind} payloads.");
-        }
-
-        return definition;
-    }
-
     private static JsonElement ParseJsonObject(string label, string value, string propertyName)
     {
         try
@@ -146,14 +90,14 @@ public static class PeoplePayload
         }
     }
 
-    private static void ValidateRequiredFields(PeopleLabelDefinition definition, JsonElement element, string propertyName)
+    private static void ValidateRequiredFields(PeopleLabelSerializationOptions options, JsonElement element, string propertyName)
     {
-        foreach (var required in definition.RequiredFields)
+        foreach (var required in options.RequiredFields)
         {
             if (!element.TryGetProperty(required, out var property) || property.ValueKind == JsonValueKind.Null)
             {
                 throw new InvalidOperationException(
-                    $"People label '{definition.Label}' on property '{propertyName}' is missing required field '{required}'.");
+                    $"People label '{options.Label}' on property '{propertyName}' is missing required field '{required}'.");
             }
         }
     }
@@ -171,15 +115,21 @@ public static class PeoplePayload
     }
 }
 
+<% if (hasLocalGraphTypes) { -%>
 <% const enumNames = new Set((graphEnums ?? []).map((entry) => entry.csName)); -%>
 <% const isEnumType = (csType) => {
     const trimmed = csType.replace("?", "");
+    const shortName = trimmed.split(".").at(-1) ?? trimmed;
     const listMatch = /^List<(.+)>$/.exec(trimmed);
-    if (listMatch) return enumNames.has(listMatch[1] ?? "");
-    return enumNames.has(trimmed);
+    if (listMatch) {
+        const listShortName = (listMatch[1] ?? "").split(".").at(-1) ?? "";
+        return enumNames.has(listShortName);
+    }
+    return enumNames.has(shortName);
 }; -%>
 <% for (const type of peopleProfileTypes) { -%>
-public <%= baseTypeNames.has(type.csName) ? "class" : "sealed class" %> <%= type.csName %><% if (type.baseType) { -%> : <%= type.baseType %><% } -%>
+<% if (!type.sourcePackage) { -%>
+public <%= baseTypeNames.has(type.csName) ? "class" : "sealed class" %> <%= type.typeName ?? type.csName %><% if (type.baseType) { -%> : <%= type.baseType %><% } -%>
 {
 <% for (const prop of type.properties) { -%>
 <% if (prop.csType.endsWith("?")) { -%>
@@ -199,3 +149,5 @@ public <%= baseTypeNames.has(type.csName) ? "class" : "sealed class" %> <%= type
 }
 
 <% } -%>
+<% } -%>
+<% } -%>

package/dist/init/templates/dotnet/Core/Principal.cs.ejs

@@ -1,4 +1,3 @@
-<% if (graphApiVersion === 'beta') { -%>
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -10,20 +9,20 @@ public sealed class Principal : IAdditionalDataHolder, IParsable
 {
     [JsonPropertyName("@odata.type")]
     public string? OdataType { get; set; } = "#microsoft.graph.externalConnectors.principal";
-    [JsonPropertyName("externalName")]
-    public string? ExternalName { get; set; }
-    [JsonPropertyName("externalId")]
-    public string? ExternalId { get; set; }
+    [JsonPropertyName("email")]
+    public string? Email { get; set; }
     [JsonPropertyName("entraDisplayName")]
     public string? EntraDisplayName { get; set; }
     [JsonPropertyName("entraId")]
     public string? EntraId { get; set; }
-    [JsonPropertyName("email")]
-    public string? Email { get; set; }
-    [JsonPropertyName("upn")]
-    public string? Upn { get; set; }
+    [JsonPropertyName("externalId")]
+    public string? ExternalId { get; set; }
+    [JsonPropertyName("externalName")]
+    public string? ExternalName { get; set; }
     [JsonPropertyName("tenantId")]
     public string? TenantId { get; set; }
+    [JsonPropertyName("upn")]
+    public string? Upn { get; set; }
     public IDictionary<string, object> AdditionalData { get; set; } = new Dictionary<string, object>();
 
     public static Principal CreateFromDiscriminatorValue(IParseNode parseNode) => new();
@@ -33,27 +32,26 @@ public sealed class Principal : IAdditionalDataHolder, IParsable
         return new Dictionary<string, Action<IParseNode>>(StringComparer.OrdinalIgnoreCase)
         {
             { "@odata.type", n => OdataType = n.GetStringValue() },
-            { "externalName", n => ExternalName = n.GetStringValue() },
-            { "externalId", n => ExternalId = n.GetStringValue() },
+            { "email", n => Email = n.GetStringValue() },
             { "entraDisplayName", n => EntraDisplayName = n.GetStringValue() },
             { "entraId", n => EntraId = n.GetStringValue() },
-            { "email", n => Email = n.GetStringValue() },
-            { "upn", n => Upn = n.GetStringValue() },
+            { "externalId", n => ExternalId = n.GetStringValue() },
+            { "externalName", n => ExternalName = n.GetStringValue() },
             { "tenantId", n => TenantId = n.GetStringValue() },
+            { "upn", n => Upn = n.GetStringValue() },
         };
     }
 
     public void Serialize(ISerializationWriter writer)
     {
         writer.WriteStringValue("@odata.type", OdataType);
-        writer.WriteStringValue("externalName", ExternalName);
-        writer.WriteStringValue("externalId", ExternalId);
+        writer.WriteStringValue("email", Email);
         writer.WriteStringValue("entraDisplayName", EntraDisplayName);
         writer.WriteStringValue("entraId", EntraId);
-        writer.WriteStringValue("email", Email);
-        writer.WriteStringValue("upn", Upn);
+        writer.WriteStringValue("externalId", ExternalId);
+        writer.WriteStringValue("externalName", ExternalName);
         writer.WriteStringValue("tenantId", TenantId);
+        writer.WriteStringValue("upn", Upn);
         writer.WriteAdditionalData(AdditionalData);
     }
 }
-<% } -%>

package/dist/init/templates/dotnet/Generated/Constants.cs.ejs

@@ -8,6 +8,14 @@ public static class SchemaConstants
 {
     public const string GraphApiVersion = <%= JSON.stringify(graphApiVersion) %>;
     public const string GraphBaseUrl = "https://graph.microsoft.com/" + GraphApiVersion;
+    public const string ConnectionProvisioningGraphApiVersion = <%= JSON.stringify(graphOperationVersions.connectionProvisioning) %>;
+    public const string ConnectionProvisioningGraphBaseUrl = "https://graph.microsoft.com/" + ConnectionProvisioningGraphApiVersion;
+    public const string SchemaRegistrationGraphApiVersion = <%= JSON.stringify(graphOperationVersions.schemaRegistration) %>;
+    public const string SchemaRegistrationGraphBaseUrl = "https://graph.microsoft.com/" + SchemaRegistrationGraphApiVersion;
+    public const string ItemIngestionGraphApiVersion = <%= JSON.stringify(graphOperationVersions.itemIngestion) %>;
+    public const string ItemIngestionGraphBaseUrl = "https://graph.microsoft.com/" + ItemIngestionGraphApiVersion;
+    public const string ProfileSourceRegistrationGraphApiVersion = <%= JSON.stringify(graphOperationVersions.profileSourceRegistration) %>;
+    public const string ProfileSourceRegistrationGraphBaseUrl = "https://graph.microsoft.com/" + ProfileSourceRegistrationGraphApiVersion;
 
     public const string ItemTypeName = <%= JSON.stringify(itemTypeName) %>;
     public const string IdPropertyName = <%= JSON.stringify(idPropertyName) %>;

package/dist/init/templates/dotnet/Generated/FromRow.cs.ejs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using <%= namespaceName %>;
 using <%= namespaceName %>.Datasource;
-<% if (usesPrincipal && graphApiVersion === 'beta') { -%>
+<% if (usesPrincipal) { -%>
 using <%= namespaceName %>.Core;
 <% } -%>
 

package/dist/init/templates/dotnet/Generated/Model.cs.ejs

@@ -1,5 +1,5 @@
 // C# representation of the external item schema.
-<% if (usesPrincipal && graphApiVersion === 'beta') { -%>
+<% if (usesPrincipal) { -%>
 using <%= namespaceName %>.Core;
 
 <% } -%>

package/dist/init/templates/dotnet/Program.commandline.cs.ejs

@@ -84,6 +84,14 @@ string InputPath(string? inputPath)
         : "data.csv"
     ) %>;
 }
+
+int ValidateBatchSize(int? batchSize)
+{
+    batchSize ??= 1;
+    if (batchSize < 1 || batchSize > 20)
+        throw new InvalidOperationException("Invalid --batch-size: expected an integer between 1 and 20.");
+    return batchSize.Value;
+}
 <% if (inputFormat === "rest") { -%>
 string RestBaseUrl(string? inputPath)
 {
@@ -136,7 +144,7 @@ TokenCredential CreateCredential()
 GraphServiceClient CreateGraphClient(TokenCredential credential)
 {
     var graph = new GraphServiceClient(credential, new[] { "https://graph.microsoft.com/.default" });
-    graph.RequestAdapter.BaseUrl = SchemaConstants.GraphBaseUrl;
+    graph.RequestAdapter.BaseUrl = SchemaConstants.ConnectionProvisioningGraphBaseUrl;
     return graph;
 }
 
@@ -178,8 +186,10 @@ async Task ProvisionAsync()
 /// <summary>
 /// Ingest items from the configured input.
 /// </summary>
-async Task IngestAsync(string? inputPath, bool dryRun, int? limit, bool verbose, bool failFast)
+async Task IngestAsync(string? inputPath, bool dryRun, int? limit, int? batchSize, bool verbose, bool failFast)
 {
+    var validatedBatchSize = ValidateBatchSize(batchSize);
+
     GraphServiceClient? graph = null;
     TokenCredential? credential = null;
     string connectionId = "dry-run";
@@ -203,7 +213,7 @@ async Task IngestAsync(string? inputPath, bool dryRun, int? limit, bool verbose,
 <% } -%>
     var core = BuildConnectorCore(graph, credential, connectionId);
 
-    await core.IngestAsync(source, dryRun, limit, verbose, failFast);
+    await core.IngestAsync(source, dryRun, limit, validatedBatchSize, verbose, failFast);
 }
 
 /// <summary>
@@ -224,6 +234,7 @@ var inputOption = new Option<string?>("--input") { Description = <%= JSON.string
 var dryRunOption = new Option<bool>("--dry-run") { Description = "Build payloads but do not send to Graph" };
 var failFastOption = new Option<bool>("--fail-fast") { Description = "Abort on the first item failure" };
 var limitOption = new Option<int?>("--limit") { Description = "Limit number of items" };
+var batchSizeOption = new Option<int?>("--batch-size") { Description = "Number of concurrent PUT requests to send per batch (1-20)" };
 var verboseOption = new Option<bool>("--verbose") { Description = "Print payloads sent to Graph" };
 
 var root = new RootCommand("Connector CLI generated by cocogen");
@@ -237,6 +248,7 @@ ingestCommand.Options.Add(inputOption);
 ingestCommand.Options.Add(dryRunOption);
 ingestCommand.Options.Add(failFastOption);
 ingestCommand.Options.Add(limitOption);
+ingestCommand.Options.Add(batchSizeOption);
 ingestCommand.Options.Add(verboseOption);
 ingestCommand.SetAction(async (parseResult, cancellationToken) =>
 {
@@ -244,8 +256,9 @@ ingestCommand.SetAction(async (parseResult, cancellationToken) =>
     var dryRun = parseResult.GetValue(dryRunOption);
     var failFast = parseResult.GetValue(failFastOption);
     var limit = parseResult.GetValue(limitOption);
+    var batchSize = parseResult.GetValue(batchSizeOption);
     var verbose = parseResult.GetValue(verboseOption);
-    await IngestAsync(input, dryRun, limit, verbose, failFast);
+    await IngestAsync(input, dryRun, limit, batchSize, verbose, failFast);
 });
 
 var deleteCommand = new Command("delete", "Delete the connection");

package/dist/init/templates/dotnet/README.md.ejs

@@ -19,10 +19,11 @@ Generated by cocogen.
 
 <% if (isPeopleConnector) { -%>
 Note: this is a People connector (preview). It uses Graph beta endpoints and registers the connection as a profile source during `provision`.
+Generated people connectors also bind row-to-payload transforms to the official Microsoft Graph .NET beta profile models for SDK-backed people payload types.
 <% } -%>
 
 ## Graph API version note
-If your schema sets `@coco.connection({ contentCategory: "..." })`, provisioning must use Microsoft Graph **/beta** because `externalConnection.contentCategory` is currently exposed on the beta endpoint.
+`externalConnection.contentCategory` and `principal`/`principalCollection` are available on Microsoft Graph **v1.0**. This project only needs Microsoft Graph **/beta** when the schema uses beta-only people labels or registers the connection as a profile source.
 
 ## Multiple connections
 This generated CLI currently targets a single connection ID from configuration. Multi-connection support is planned for a future version.
@@ -71,6 +72,7 @@ Use `dotnet run -- ingest` with:
 - `--dry-run` (build payloads without sending)
 - `--fail-fast` (abort on the first item failure)
 - `--limit <n>` (ingest only N items)
+- `--batch-size <n>` (send up to N concurrent PUT requests per batch, default `1`, max `20`)
 - `--verbose` (print the exact payload sent to Graph)
 
 Note: `--dry-run` does not require Azure AD or connection settings.

package/dist/init/templates/dotnet/project.csproj.ejs

@@ -13,6 +13,9 @@
     <PackageReference Include="Azure.Identity" Version="1.17.1" />
     <% if (graphApiVersion === "beta") { -%>
     <PackageReference Include="Microsoft.Graph.Beta" Version="5.129.0-preview" />
+    <% } else if (isPeopleConnector) { -%>
+    <PackageReference Include="Microsoft.Graph" Version="5.100.0" />
+    <PackageReference Include="Microsoft.Graph.Beta" Version="5.129.0-preview" />
     <% } else { -%>
     <PackageReference Include="Microsoft.Graph" Version="5.100.0" />
     <% } -%>

package/dist/init/templates/starter/AGENTS.md.ejs

@@ -118,13 +118,13 @@ Common fixes:
 - Missing `@coco.connection` → add connection metadata at top level
 - Missing or multiple `@coco.id` → ensure exactly one stable ID field
 - Optional properties → make required (connectors require non-optional schema properties)
-- People schemas without preview flag → re-run with `--use-preview-features`
+- Schemas with beta-only labels and no preview flag → re-run with `--use-preview-features`
 
 <% if (kind === "people") { %>
-## People connectors (preview)
+## People connectors
 
-People connectors use Microsoft Graph **/beta**.
+People connectors use Microsoft Graph **v1.0** unless they use beta-only labels.
 
-- Always validate/generate with: `--use-preview-features`
-- Expect breaking changes as Graph beta evolves
+- Use `--use-preview-features` only when cocogen reports a Graph beta requirement
+- Expect breaking changes only for beta-only Graph labels and models
 <% } %>

package/dist/init/templates/ts/README.md.ejs

@@ -19,10 +19,11 @@ Generated by cocogen.
 
 <% if (isPeopleConnector) { -%>
 Note: this is a People connector (preview). It uses Graph beta endpoints and registers the connection as a profile source during `provision`.
+Generated people connectors include the official Graph TypeScript packages, and people payload helpers bind to the beta Graph profile model package so labels that still use beta-only profile types remain strongly typed.
 <% } -%>
 
 ## Graph API version note
-If your schema sets `@coco.connection({ contentCategory: "..." })`, provisioning must use Microsoft Graph **/beta** because `externalConnection.contentCategory` is currently exposed on the beta endpoint.
+`externalConnection.contentCategory` and `principal`/`principalCollection` are available on Microsoft Graph **v1.0**. This project only needs Microsoft Graph **/beta** when the schema uses beta-only people labels or registers the connection as a profile source.
 
 ## Requirements
 - Microsoft Entra app registration with application permissions:
@@ -60,6 +61,7 @@ Use `npm run ingest --` with:
 - `--dry-run` (build payloads without sending)
 - `--fail-fast` (abort on the first item failure)
 - `--limit <n>` (ingest only N items)
+- `--batch-size <n>` (send up to N concurrent PUT requests per batch, default `1`, max `20`)
 - `--verbose` (print the exact payload sent to Graph)
 
 Note: `--dry-run` does not require CONNECTION_ID, but you still need it for real ingestion.

package/dist/init/templates/ts/package.json.ejs

@@ -14,6 +14,11 @@
   "dependencies": {
     "@azure/identity": "^4.13.0",
     "commander": "^14.0.2",
+    "@microsoft/microsoft-graph-client": "^3.0.7",
+<% if (isPeopleConnector) { -%>
+    "@microsoft/microsoft-graph-types": "^2.43.1",
+    "@microsoft/microsoft-graph-types-beta": "^0.44.0-preview",
+<% } -%>
     "dotenv": "^17.2.3"<% if (inputFormat === "csv") { %>,
     "csv-parse": "^6.1.0"<% } %><% if (inputFormat !== "csv") { %>,
     "jsonpath-plus": "^10.3.0"<% } %><% if (inputFormat === "yaml") { %>,

package/dist/init/templates/ts/src/cli.ts.ejs

@@ -3,7 +3,7 @@
  */
 import "dotenv/config";
 
-import { Command } from "commander";
+import { Command, InvalidArgumentError } from "commander";
 import { ClientSecretCredential, ManagedIdentityCredential } from "@azure/identity";
 
 import type { <%= itemTypeName %> } from "./<%= schemaFolderName %>/model.js";
@@ -12,6 +12,7 @@ import {
   connectionName as defaultConnectionName,
   connectionId as defaultConnectionId,
   connectionDescription as defaultConnectionDescription,
+  graphBaseUrls,
   profileSourceWebUrl as defaultProfileSourceWebUrl,
   profileSourceDisplayName as defaultProfileSourceDisplayName,
   profileSourcePriority as defaultProfileSourcePriority,
@@ -32,7 +33,6 @@ import { CsvItemSource } from "./datasource/csvItemSource.js";
 <% } -%>
 import { ConnectorCore } from "./core/connectorCore.js";
 
-const GRAPH_BASE_URL = <%= JSON.stringify(graphBaseUrl) %>;
 const GRAPH_SCOPE = "https://graph.microsoft.com/.default";
 
 const useColor = !process.env.NO_COLOR;
@@ -110,6 +110,14 @@ function resolveInputPath(inputPath?: string): string {
   ) %>;
 }
 
+function parseBatchSize(value: string): number {
+  const parsed = Number.parseInt(value, 10);
+  if (!Number.isInteger(parsed) || parsed < 1 || parsed > 20) {
+    throw new InvalidArgumentError("expected an integer between 1 and 20");
+  }
+  return parsed;
+}
+
 function buildItemSource(path: string): ItemSource<<%= itemTypeName %>> {
 <% if (inputFormat === "rest") { -%>
   return new RestItemSource(resolveRestOptions(path));
@@ -173,7 +181,7 @@ function buildConnectorCore(): ConnectorCore<<%= itemTypeName %>> {
     : "undefined" %>;
 
   return new ConnectorCore<<%= itemTypeName %>>({
-    graphBaseUrl: GRAPH_BASE_URL,
+    graphBaseUrls,
     contentCategory,
     schemaPayload,
     getAccessToken,
@@ -219,6 +227,7 @@ async function ingest(options: {
   inputPath?: string;
   dryRun?: boolean;
   limit?: number;
+  batchSize?: number;
   verbose?: boolean;
   failFast?: boolean;
 }): Promise<void> {
@@ -231,6 +240,7 @@ async function ingest(options: {
     connectionId,
     dryRun: options.dryRun,
     limit: options.limit,
+    batchSize: options.batchSize,
     verbose: options.verbose,
     failFast: options.failFast,
     toExternalItem
@@ -252,13 +262,15 @@ program
   .option("--dry-run", "Build payloads but do not send to Graph")
   .option("--fail-fast", "Abort on the first item failure")
   .option("--limit <n>", "Limit number of items", (value) => Number(value))
+  .option("--batch-size <n>", "Number of concurrent PUT requests to send per batch (1-20)", parseBatchSize, 1)
   .option("--verbose", "Print payloads sent to Graph")
-  .action((options: { input?: string; dryRun?: boolean; limit?: number; verbose?: boolean; failFast?: boolean }) =>
+  .action((options: { input?: string; dryRun?: boolean; limit?: number; batchSize?: number; verbose?: boolean; failFast?: boolean }) =>
     ingest({
       inputPath: options.input,
       dryRun: options.dryRun,
       failFast: options.failFast,
       limit: options.limit,
+      batchSize: options.batchSize,
       verbose: options.verbose,
     })
   );