@bagelink/workspace 1.12.19 → 1.12.25

package/bin/bgl.ts

@@ -85,23 +85,27 @@ Lint Commands:
 			// Auto-detect workspace or allow override
 			const forceWorkspace = args.includes('--workspace') || args.includes('-w')
 			const forceProject = args.includes('--project') || args.includes('-p')
+			const splitMode = args.includes('--split') || args.includes('-s')
 
 			let workspaceMode = isWorkspace(process.cwd())
 			if (forceWorkspace) workspaceMode = true
 			if (forceProject) workspaceMode = false
 
+			const sdkOptions = { split: splitMode || undefined }
+
 			if (workspaceMode) {
 				console.log('✓ Detected workspace mode - will generate for multiple projects')
-				await generateSDKForWorkspace()
+				await generateSDKForWorkspace(process.cwd(), sdkOptions)
 			}
 			else {
-				await generateSDK(process.cwd())
+				await generateSDK(process.cwd(), sdkOptions)
 			}
 		}
 		else {
 			console.log(`
 SDK Commands:
   bgl sdk generate             Generate SDK (auto-detects workspace)
+  bgl sdk generate --split     Generate per-module API files
   bgl sdk generate --workspace Force workspace mode
   bgl sdk generate --project   Force single project mode
 `)
@@ -145,10 +149,12 @@ Usage:
                             Example: bgl build --mode production
   bgl lint init             Set up linting (auto-detects workspace)
   bgl sdk generate          Generate SDK (auto-detects workspace)
+  bgl sdk generate --split  Generate per-module API files
 
 Options:
   --workspace, -w           Force workspace mode
   --project, -p             Force single project mode
+  --split, -s               Split SDK into per-module files
   --mode <env>              Set environment (matches bgl.config.ts keys)
   --help, -h                Show this help message
 

package/dist/bin/bgl.cjs

@@ -636,7 +636,7 @@ function updatePackageJsonLint(root, configs) {
   }
 }
 
-async function generateSDK(root = process__default.cwd()) {
+async function generateSDK(root = process__default.cwd(), options = {}) {
   console.log("\n\u{1F527} Generating SDK from OpenAPI...\n");
   let config = null;
   let openApiUrl;
@@ -668,9 +668,9 @@ async function generateSDK(root = process__default.cwd()) {
       initial: "./src/api"
     },
     {
-      type: "confirm",
+      type: options.split !== void 0 ? null : "confirm",
       name: "splitFiles",
-      message: "Split into organized files?",
+      message: "Split into per-module files?",
       initial: true
     }
   ]);
@@ -679,16 +679,15 @@ async function generateSDK(root = process__default.cwd()) {
     process__default.exit(1);
   }
   const finalUrl = openApiUrl ?? response.openApiUrl;
-  const { outputDir, splitFiles } = response;
+  const { outputDir } = response;
+  const splitFiles = options.split ?? response.splitFiles ?? false;
   console.log(`
 \u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
-  console.log(`\u{1F4C1} Output directory: ${outputDir}
+  console.log(`\u{1F4C1} Output directory: ${outputDir}`);
+  console.log(`\u{1F500} Split mode: ${splitFiles ? "per-module" : "monolithic"}
 `);
   try {
     const { openAPI } = await import('@bagelink/sdk');
-    const { readFileSync } = await import('node:fs');
-    const { dirname, join } = await import('node:path');
-    const { fileURLToPath } = await import('node:url');
     const { types, code } = await openAPI(finalUrl, "/api");
     const outputPath = node_path.resolve(root, outputDir);
     if (!node_fs.existsSync(outputPath)) {
@@ -696,21 +695,40 @@ async function generateSDK(root = process__default.cwd()) {
     }
     const typesPath = node_path.resolve(outputPath, "types.d.ts");
     node_fs.writeFileSync(typesPath, types);
-    console.log("\u2705 Generated types.d.ts");
     const apiPath = node_path.resolve(outputPath, "api.ts");
     node_fs.writeFileSync(apiPath, code);
-    console.log("\u2705 Generated api.ts");
-    console.log("\u2139\uFE0F  Stream utilities are imported from @bagelink/sdk");
     if (splitFiles) {
-      console.log("\n\u{1F500} Splitting into organized files...");
-      console.log("\u2139\uFE0F  File splitting requires @bagelink/sdk bin scripts");
-      console.log("    Keeping monolithic structure for now");
+      console.log("\u{1F500} Splitting into per-module files...");
+      try {
+        const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen');
+        await splitClientCode({
+          bagelinkDir: outputPath,
+          useDirectories: true
+        });
+        node_fs.rmSync(apiPath, { force: true });
+        node_fs.rmSync(typesPath, { force: true });
+        console.log("\u2705 SDK split into per-module files!");
+      } catch (splitError) {
+        console.warn("\u26A0\uFE0F  Split failed, keeping monolithic files:", splitError instanceof Error ? splitError.message : splitError);
+        console.log("\u2705 Generated monolithic api.ts + types.d.ts");
+      }
+    } else {
+      console.log("\u2705 Generated types.d.ts");
+      console.log("\u2705 Generated api.ts");
     }
+    console.log("\u2139\uFE0F  Stream utilities are imported from @bagelink/sdk");
     console.log("\n\u2705 SDK generated successfully!");
-    console.log(`
+    if (splitFiles) {
+      console.log(`
+Import per-module in your code:`);
+      console.log(`  import { person } from '${outputDir.replace("./src/", "./")}/api'`);
+      console.log(`  import type { PersonOut } from '${outputDir.replace("./src/", "./")}/types'`);
+    } else {
+      console.log(`
 Import directly in your code:`);
-    console.log(`  import { agents } from '${outputDir.replace("./src/", "./")}/api'`);
-    console.log(`  import type { SendMessageRequest } from '${outputDir.replace("./src/", "./")}/types.d'`);
+      console.log(`  import { agents } from '${outputDir.replace("./src/", "./")}/api'`);
+      console.log(`  import type { SendMessageRequest } from '${outputDir.replace("./src/", "./")}/types.d'`);
+    }
     console.log("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -726,7 +744,7 @@ Import directly in your code:`);
     process__default.exit(1);
   }
 }
-async function generateSDKForWorkspace(root = process__default.cwd()) {
+async function generateSDKForWorkspace(root = process__default.cwd(), options = {}) {
   console.log("\n\u{1F3E2} Generating SDK for workspace...\n");
   let config = null;
   let openApiUrl;
@@ -756,9 +774,11 @@ async function generateSDKForWorkspace(root = process__default.cwd()) {
   }
   const finalUrl = openApiUrl ?? response.openApiUrl;
   const outputDir = "./shared";
+  const splitFiles = options.split ?? false;
   console.log(`
 \u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
-  console.log(`\u{1F4C1} Output directory: ${outputDir}
+  console.log(`\u{1F4C1} Output directory: ${outputDir}`);
+  console.log(`\u{1F500} Split mode: ${splitFiles ? "per-module" : "monolithic"}
 `);
   try {
     const { openAPI } = await import('@bagelink/sdk');
@@ -769,15 +789,38 @@ async function generateSDKForWorkspace(root = process__default.cwd()) {
     }
     const typesPath = node_path.resolve(outputPath, "types.d.ts");
     node_fs.writeFileSync(typesPath, types);
-    console.log("\u2705 Generated types.d.ts");
     const apiPath = node_path.resolve(outputPath, "api.ts");
     node_fs.writeFileSync(apiPath, code);
-    console.log("\u2705 Generated api.ts");
+    if (splitFiles) {
+      console.log("\u{1F500} Splitting into per-module files...");
+      try {
+        const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen');
+        await splitClientCode({
+          bagelinkDir: outputPath,
+          useDirectories: true
+        });
+        node_fs.rmSync(apiPath, { force: true });
+        node_fs.rmSync(typesPath, { force: true });
+        console.log("\u2705 SDK split into per-module files!");
+      } catch (splitError) {
+        console.warn("\u26A0\uFE0F  Split failed, keeping monolithic files:", splitError instanceof Error ? splitError.message : splitError);
+      }
+    } else {
+      console.log("\u2705 Generated types.d.ts");
+      console.log("\u2705 Generated api.ts");
+    }
     console.log("\n\u2705 SDK generated successfully in shared folder!");
-    console.log(`
+    if (splitFiles) {
+      console.log(`
+Import per-module from shared:`);
+      console.log(`  import { person } from '@shared/api'`);
+      console.log(`  import type { PersonOut } from '@shared/types'`);
+    } else {
+      console.log(`
 Import from shared in your projects:`);
-    console.log(`  import { agents } from '../shared/api'`);
-    console.log(`  import type { SendMessageRequest } from '../shared/types'`);
+      console.log(`  import { agents } from '@shared/api'`);
+      console.log(`  import type { SendMessageRequest } from '@shared/types'`);
+    }
     console.log("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -850,19 +893,22 @@ Lint Commands:
     if (subcommand === "generate") {
       const forceWorkspace = args.includes("--workspace") || args.includes("-w");
       const forceProject = args.includes("--project") || args.includes("-p");
+      const splitMode = args.includes("--split") || args.includes("-s");
       let workspaceMode = isWorkspace(process__default.cwd());
       if (forceWorkspace) workspaceMode = true;
       if (forceProject) workspaceMode = false;
+      const sdkOptions = { split: splitMode || void 0 };
       if (workspaceMode) {
         console.log("\u2713 Detected workspace mode - will generate for multiple projects");
-        await generateSDKForWorkspace();
+        await generateSDKForWorkspace(process__default.cwd(), sdkOptions);
       } else {
-        await generateSDK(process__default.cwd());
+        await generateSDK(process__default.cwd(), sdkOptions);
       }
     } else {
       console.log(`
 SDK Commands:
   bgl sdk generate             Generate SDK (auto-detects workspace)
+  bgl sdk generate --split     Generate per-module API files
   bgl sdk generate --workspace Force workspace mode
   bgl sdk generate --project   Force single project mode
 `);
@@ -903,10 +949,12 @@ Usage:
                             Example: bgl build --mode production
   bgl lint init             Set up linting (auto-detects workspace)
   bgl sdk generate          Generate SDK (auto-detects workspace)
+  bgl sdk generate --split  Generate per-module API files
 
 Options:
   --workspace, -w           Force workspace mode
   --project, -p             Force single project mode
+  --split, -s               Split SDK into per-module files
   --mode <env>              Set environment (matches bgl.config.ts keys)
   --help, -h                Show this help message
 

package/dist/bin/bgl.mjs

@@ -3,7 +3,7 @@ import { resolve } from 'node:path';
 import process from 'node:process';
 import { spawn } from 'node:child_process';
 import { l as listProjects, w as writeNetlifyConfig, i as initWorkspace, a as addProject } from '../shared/workspace.Bhp9XbPk.mjs';
-import { existsSync, readFileSync, readdirSync, writeFileSync, unlinkSync, mkdirSync } from 'node:fs';
+import { existsSync, readFileSync, readdirSync, writeFileSync, unlinkSync, mkdirSync, rmSync } from 'node:fs';
 import prompts from 'prompts';
 
 async function runBuild(filter, additionalArgs = []) {
@@ -629,7 +629,7 @@ function updatePackageJsonLint(root, configs) {
   }
 }
 
-async function generateSDK(root = process.cwd()) {
+async function generateSDK(root = process.cwd(), options = {}) {
   console.log("\n\u{1F527} Generating SDK from OpenAPI...\n");
   let config = null;
   let openApiUrl;
@@ -661,9 +661,9 @@ async function generateSDK(root = process.cwd()) {
       initial: "./src/api"
     },
     {
-      type: "confirm",
+      type: options.split !== void 0 ? null : "confirm",
       name: "splitFiles",
-      message: "Split into organized files?",
+      message: "Split into per-module files?",
       initial: true
     }
   ]);
@@ -672,16 +672,15 @@ async function generateSDK(root = process.cwd()) {
     process.exit(1);
   }
   const finalUrl = openApiUrl ?? response.openApiUrl;
-  const { outputDir, splitFiles } = response;
+  const { outputDir } = response;
+  const splitFiles = options.split ?? response.splitFiles ?? false;
   console.log(`
 \u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
-  console.log(`\u{1F4C1} Output directory: ${outputDir}
+  console.log(`\u{1F4C1} Output directory: ${outputDir}`);
+  console.log(`\u{1F500} Split mode: ${splitFiles ? "per-module" : "monolithic"}
 `);
   try {
     const { openAPI } = await import('@bagelink/sdk');
-    const { readFileSync } = await import('node:fs');
-    const { dirname, join } = await import('node:path');
-    const { fileURLToPath } = await import('node:url');
     const { types, code } = await openAPI(finalUrl, "/api");
     const outputPath = resolve(root, outputDir);
     if (!existsSync(outputPath)) {
@@ -689,21 +688,40 @@ async function generateSDK(root = process.cwd()) {
     }
     const typesPath = resolve(outputPath, "types.d.ts");
     writeFileSync(typesPath, types);
-    console.log("\u2705 Generated types.d.ts");
     const apiPath = resolve(outputPath, "api.ts");
     writeFileSync(apiPath, code);
-    console.log("\u2705 Generated api.ts");
-    console.log("\u2139\uFE0F  Stream utilities are imported from @bagelink/sdk");
     if (splitFiles) {
-      console.log("\n\u{1F500} Splitting into organized files...");
-      console.log("\u2139\uFE0F  File splitting requires @bagelink/sdk bin scripts");
-      console.log("    Keeping monolithic structure for now");
+      console.log("\u{1F500} Splitting into per-module files...");
+      try {
+        const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen');
+        await splitClientCode({
+          bagelinkDir: outputPath,
+          useDirectories: true
+        });
+        rmSync(apiPath, { force: true });
+        rmSync(typesPath, { force: true });
+        console.log("\u2705 SDK split into per-module files!");
+      } catch (splitError) {
+        console.warn("\u26A0\uFE0F  Split failed, keeping monolithic files:", splitError instanceof Error ? splitError.message : splitError);
+        console.log("\u2705 Generated monolithic api.ts + types.d.ts");
+      }
+    } else {
+      console.log("\u2705 Generated types.d.ts");
+      console.log("\u2705 Generated api.ts");
     }
+    console.log("\u2139\uFE0F  Stream utilities are imported from @bagelink/sdk");
     console.log("\n\u2705 SDK generated successfully!");
-    console.log(`
+    if (splitFiles) {
+      console.log(`
+Import per-module in your code:`);
+      console.log(`  import { person } from '${outputDir.replace("./src/", "./")}/api'`);
+      console.log(`  import type { PersonOut } from '${outputDir.replace("./src/", "./")}/types'`);
+    } else {
+      console.log(`
 Import directly in your code:`);
-    console.log(`  import { agents } from '${outputDir.replace("./src/", "./")}/api'`);
-    console.log(`  import type { SendMessageRequest } from '${outputDir.replace("./src/", "./")}/types.d'`);
+      console.log(`  import { agents } from '${outputDir.replace("./src/", "./")}/api'`);
+      console.log(`  import type { SendMessageRequest } from '${outputDir.replace("./src/", "./")}/types.d'`);
+    }
     console.log("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -719,7 +737,7 @@ Import directly in your code:`);
     process.exit(1);
   }
 }
-async function generateSDKForWorkspace(root = process.cwd()) {
+async function generateSDKForWorkspace(root = process.cwd(), options = {}) {
   console.log("\n\u{1F3E2} Generating SDK for workspace...\n");
   let config = null;
   let openApiUrl;
@@ -749,9 +767,11 @@ async function generateSDKForWorkspace(root = process.cwd()) {
   }
   const finalUrl = openApiUrl ?? response.openApiUrl;
   const outputDir = "./shared";
+  const splitFiles = options.split ?? false;
   console.log(`
 \u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
-  console.log(`\u{1F4C1} Output directory: ${outputDir}
+  console.log(`\u{1F4C1} Output directory: ${outputDir}`);
+  console.log(`\u{1F500} Split mode: ${splitFiles ? "per-module" : "monolithic"}
 `);
   try {
     const { openAPI } = await import('@bagelink/sdk');
@@ -762,15 +782,38 @@ async function generateSDKForWorkspace(root = process.cwd()) {
     }
     const typesPath = resolve(outputPath, "types.d.ts");
     writeFileSync(typesPath, types);
-    console.log("\u2705 Generated types.d.ts");
     const apiPath = resolve(outputPath, "api.ts");
     writeFileSync(apiPath, code);
-    console.log("\u2705 Generated api.ts");
+    if (splitFiles) {
+      console.log("\u{1F500} Splitting into per-module files...");
+      try {
+        const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen');
+        await splitClientCode({
+          bagelinkDir: outputPath,
+          useDirectories: true
+        });
+        rmSync(apiPath, { force: true });
+        rmSync(typesPath, { force: true });
+        console.log("\u2705 SDK split into per-module files!");
+      } catch (splitError) {
+        console.warn("\u26A0\uFE0F  Split failed, keeping monolithic files:", splitError instanceof Error ? splitError.message : splitError);
+      }
+    } else {
+      console.log("\u2705 Generated types.d.ts");
+      console.log("\u2705 Generated api.ts");
+    }
     console.log("\n\u2705 SDK generated successfully in shared folder!");
-    console.log(`
+    if (splitFiles) {
+      console.log(`
+Import per-module from shared:`);
+      console.log(`  import { person } from '@shared/api'`);
+      console.log(`  import type { PersonOut } from '@shared/types'`);
+    } else {
+      console.log(`
 Import from shared in your projects:`);
-    console.log(`  import { agents } from '../shared/api'`);
-    console.log(`  import type { SendMessageRequest } from '../shared/types'`);
+      console.log(`  import { agents } from '@shared/api'`);
+      console.log(`  import type { SendMessageRequest } from '@shared/types'`);
+    }
     console.log("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -843,19 +886,22 @@ Lint Commands:
     if (subcommand === "generate") {
       const forceWorkspace = args.includes("--workspace") || args.includes("-w");
       const forceProject = args.includes("--project") || args.includes("-p");
+      const splitMode = args.includes("--split") || args.includes("-s");
       let workspaceMode = isWorkspace(process.cwd());
       if (forceWorkspace) workspaceMode = true;
       if (forceProject) workspaceMode = false;
+      const sdkOptions = { split: splitMode || void 0 };
       if (workspaceMode) {
         console.log("\u2713 Detected workspace mode - will generate for multiple projects");
-        await generateSDKForWorkspace();
+        await generateSDKForWorkspace(process.cwd(), sdkOptions);
       } else {
-        await generateSDK(process.cwd());
+        await generateSDK(process.cwd(), sdkOptions);
       }
     } else {
       console.log(`
 SDK Commands:
   bgl sdk generate             Generate SDK (auto-detects workspace)
+  bgl sdk generate --split     Generate per-module API files
   bgl sdk generate --workspace Force workspace mode
   bgl sdk generate --project   Force single project mode
 `);
@@ -896,10 +942,12 @@ Usage:
                             Example: bgl build --mode production
   bgl lint init             Set up linting (auto-detects workspace)
   bgl sdk generate          Generate SDK (auto-detects workspace)
+  bgl sdk generate --split  Generate per-module API files
 
 Options:
   --workspace, -w           Force workspace mode
   --project, -p             Force single project mode
+  --split, -s               Split SDK into per-module files
   --mode <env>              Set environment (matches bgl.config.ts keys)
   --help, -h                Show this help message
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/workspace",
   "type": "module",
-  "version": "1.12.19",
+  "version": "1.12.25",
   "description": "Monorepo workspace tooling for Bagel projects with proxy and config management",
   "author": {
     "name": "Bagel Studio",

package/src/sdk.ts

@@ -1,14 +1,20 @@
 import type { WorkspaceConfig } from './types'
-import { existsSync, mkdirSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import process from 'node:process'
 import prompts from 'prompts'
 
+export interface GenerateSDKOptions {
+	/** Force split mode (per-module files) */
+	split?: boolean
+}
+
 /**
  * Generate SDK from OpenAPI spec
  */
 export async function generateSDK(
 	root: string = process.cwd(),
+	options: GenerateSDKOptions = {},
 ): Promise<void> {
 	console.log('\n🔧 Generating SDK from OpenAPI...\n')
 
@@ -48,9 +54,9 @@ export async function generateSDK(
 			initial: './src/api',
 		},
 		{
-			type: 'confirm',
+			type: options.split !== undefined ? null : 'confirm',
 			name: 'splitFiles',
-			message: 'Split into organized files?',
+			message: 'Split into per-module files?',
 			initial: true,
 		},
 	])
@@ -61,17 +67,15 @@ export async function generateSDK(
 	}
 
 	const finalUrl = openApiUrl ?? response.openApiUrl
-	const { outputDir, splitFiles } = response
+	const { outputDir } = response
+	const splitFiles = options.split ?? response.splitFiles ?? false
 
 	console.log(`\n📡 Fetching OpenAPI spec from: ${finalUrl}`)
-	console.log(`📁 Output directory: ${outputDir}\n`)
+	console.log(`📁 Output directory: ${outputDir}`)
+	console.log(`🔀 Split mode: ${splitFiles ? 'per-module' : 'monolithic'}\n`)
 
 	try {
-		// Dynamic import of @bagelink/sdk
 		const { openAPI } = await import('@bagelink/sdk')
-		const { readFileSync } = await import('node:fs')
-		const { dirname, join } = await import('node:path')
-		const { fileURLToPath } = await import('node:url')
 
 		const { types, code } = await openAPI(finalUrl, '/api')
 
@@ -80,29 +84,49 @@ export async function generateSDK(
 			mkdirSync(outputPath, { recursive: true })
 		}
 
-		// Write types
+		// Write monolithic files first (always needed as intermediate)
 		const typesPath = resolve(outputPath, 'types.d.ts')
 		writeFileSync(typesPath, types)
-		console.log('✅ Generated types.d.ts')
 
-		// Write API client
 		const apiPath = resolve(outputPath, 'api.ts')
 		writeFileSync(apiPath, code)
-		console.log('✅ Generated api.ts')
-		console.log('ℹ️  Stream utilities are imported from @bagelink/sdk')
 
 		if (splitFiles) {
-			console.log('\n🔀 Splitting into organized files...')
-			console.log('ℹ️  File splitting requires @bagelink/sdk bin scripts')
-			console.log('    Keeping monolithic structure for now')
-			// Note: File splitting requires unpublished bin scripts
-			// Users can manually run: bunx bagelink generate
+			console.log('🔀 Splitting into per-module files...')
+			try {
+				const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen')
+				await splitClientCode({
+					bagelinkDir: outputPath,
+					useDirectories: true,
+				})
+				// Remove monolithic files after successful split
+				rmSync(apiPath, { force: true })
+				rmSync(typesPath, { force: true })
+				console.log('✅ SDK split into per-module files!')
+			}
+			catch (splitError: unknown) {
+				console.warn('⚠️  Split failed, keeping monolithic files:', splitError instanceof Error ? splitError.message : splitError)
+				console.log('✅ Generated monolithic api.ts + types.d.ts')
+			}
+		}
+		else {
+			console.log('✅ Generated types.d.ts')
+			console.log('✅ Generated api.ts')
 		}
 
+		console.log('ℹ️  Stream utilities are imported from @bagelink/sdk')
 		console.log('\n✅ SDK generated successfully!')
-		console.log(`\nImport directly in your code:`)
-		console.log(`  import { agents } from '${outputDir.replace('./src/', './')}/api'`)
-		console.log(`  import type { SendMessageRequest } from '${outputDir.replace('./src/', './')}/types.d'`)
+
+		if (splitFiles) {
+			console.log(`\nImport per-module in your code:`)
+			console.log(`  import { person } from '${outputDir.replace('./src/', './')}/api'`)
+			console.log(`  import type { PersonOut } from '${outputDir.replace('./src/', './')}/types'`)
+		}
+		else {
+			console.log(`\nImport directly in your code:`)
+			console.log(`  import { agents } from '${outputDir.replace('./src/', './')}/api'`)
+			console.log(`  import type { SendMessageRequest } from '${outputDir.replace('./src/', './')}/types.d'`)
+		}
 		console.log('')
 	}
 	catch (error: unknown) {
@@ -124,7 +148,10 @@ export async function generateSDK(
 /**
  * Generate SDK for all projects in workspace
  */
-export async function generateSDKForWorkspace(root: string = process.cwd()): Promise<void> {
+export async function generateSDKForWorkspace(
+	root: string = process.cwd(),
+	options: GenerateSDKOptions = {},
+): Promise<void> {
 	console.log('\n🏢 Generating SDK for workspace...\n')
 
 	// Try to load config
@@ -163,12 +190,13 @@ export async function generateSDKForWorkspace(root: string = process.cwd()): Pro
 
 	const finalUrl = openApiUrl ?? response.openApiUrl
 	const outputDir = './shared'
+	const splitFiles = options.split ?? false
 
 	console.log(`\n📡 Fetching OpenAPI spec from: ${finalUrl}`)
-	console.log(`📁 Output directory: ${outputDir}\n`)
+	console.log(`📁 Output directory: ${outputDir}`)
+	console.log(`🔀 Split mode: ${splitFiles ? 'per-module' : 'monolithic'}\n`)
 
 	try {
-		// Dynamic import of @bagelink/sdk
 		const { openAPI } = await import('@bagelink/sdk')
 
 		const { types, code } = await openAPI(finalUrl, '/api')
@@ -178,20 +206,47 @@ export async function generateSDKForWorkspace(root: string = process.cwd()): Pro
 			mkdirSync(outputPath, { recursive: true })
 		}
 
-		// Write types
+		// Write monolithic files (always needed as intermediate for split)
 		const typesPath = resolve(outputPath, 'types.d.ts')
 		writeFileSync(typesPath, types)
-		console.log('✅ Generated types.d.ts')
 
-		// Write API client
 		const apiPath = resolve(outputPath, 'api.ts')
 		writeFileSync(apiPath, code)
-		console.log('✅ Generated api.ts')
+
+		if (splitFiles) {
+			console.log('🔀 Splitting into per-module files...')
+			try {
+				const { splitClientCode } = await import('@bagelink/sdk/bin/splitClientGen')
+				await splitClientCode({
+					bagelinkDir: outputPath,
+					useDirectories: true,
+				})
+				// Remove monolithic files after successful split
+				rmSync(apiPath, { force: true })
+				rmSync(typesPath, { force: true })
+				console.log('✅ SDK split into per-module files!')
+			}
+			catch (splitError: unknown) {
+				console.warn('⚠️  Split failed, keeping monolithic files:', splitError instanceof Error ? splitError.message : splitError)
+			}
+		}
+		else {
+			console.log('✅ Generated types.d.ts')
+			console.log('✅ Generated api.ts')
+		}
 
 		console.log('\n✅ SDK generated successfully in shared folder!')
-		console.log(`\nImport from shared in your projects:`)
-		console.log(`  import { agents } from '../shared/api'`)
-		console.log(`  import type { SendMessageRequest } from '../shared/types'`)
+
+		if (splitFiles) {
+			console.log(`\nImport per-module from shared:`)
+			console.log(`  import { person } from '@shared/api'`)
+			console.log(`  import type { PersonOut } from '@shared/types'`)
+		}
+		else {
+			console.log(`\nImport from shared in your projects:`)
+			console.log(`  import { agents } from '@shared/api'`)
+			console.log(`  import type { SendMessageRequest } from '@shared/types'`)
+		}
 		console.log('')
 	}
 	catch (error: unknown) {