@bagelink/workspace 1.8.5 → 1.8.9

package/dist/bin/bgl.cjs

@@ -1097,7 +1097,6 @@ async function generateSDK(root = process__default.cwd()) {
     node_fs.writeFileSync(apiPath, code);
     console.log("\u2705 Generated api.ts");
     try {
-      const sdkModule = await import('@bagelink/sdk');
       const sdkPath = fileURLToPath(undefined("@bagelink/sdk"));
       const sdkDir = dirname(sdkPath);
       const streamClientSource = join(sdkDir, "openAPITools", "streamClient.ts");
@@ -1107,15 +1106,16 @@ async function generateSDK(root = process__default.cwd()) {
         node_fs.writeFileSync(streamClientPath, streamClientCode);
         console.log("\u2705 Generated streamClient.ts");
       }
+      const streamControllerSource = join(sdkDir, "openAPITools", "StreamController.ts");
+      if (node_fs.existsSync(streamControllerSource)) {
+        const streamControllerCode = readFileSync(streamControllerSource, "utf-8");
+        const streamControllerPath = node_path.resolve(outputPath, "StreamController.ts");
+        node_fs.writeFileSync(streamControllerPath, streamControllerCode);
+        console.log("\u2705 Generated StreamController.ts");
+      }
     } catch (e) {
-      console.log("\u2139\uFE0F  streamClient.ts not found (optional)");
+      console.log("\u2139\uFE0F  Stream utilities not found (optional)");
     }
-    const indexPath = node_path.resolve(outputPath, "index.ts");
-    node_fs.writeFileSync(
-      indexPath,
-      "export * from './api'\nexport * from './types.d'\n"
-    );
-    console.log("\u2705 Generated index.ts");
     if (splitFiles) {
       console.log("\n\u{1F500} Splitting into organized files...");
       console.log("\u2139\uFE0F  File splitting requires @bagelink/sdk bin scripts");
@@ -1123,8 +1123,9 @@ async function generateSDK(root = process__default.cwd()) {
     }
     console.log("\n\u2705 SDK generated successfully!");
     console.log(`
-Import it in your code:`);
-    console.log(`  import { api } from '${outputDir.replace("./src/", "./")}'`);
+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("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -1141,37 +1142,71 @@ Import it in your code:`);
   }
 }
 async function generateSDKForWorkspace(root = process__default.cwd()) {
-  console.log("\n\u{1F3E2} Generating SDK for workspace projects...\n");
-  const fs = await import('node:fs');
-  const items = fs.readdirSync(root, { withFileTypes: true });
-  const projects = items.filter(
-    (item) => item.isDirectory() && item.name !== "node_modules" && item.name !== "shared" && item.name !== ".git" && !item.name.startsWith(".")
-  ).map((item) => item.name);
-  if (projects.length === 0) {
-    console.log("No projects found in workspace");
-    return;
+  console.log("\n\u{1F3E2} Generating SDK for workspace...\n");
+  let config = null;
+  let openApiUrl;
+  try {
+    const configPath = node_path.resolve(root, "bgl.config.ts");
+    if (node_fs.existsSync(configPath)) {
+      const module = await import(`file://${configPath}`);
+      const workspace = module.default;
+      if (typeof workspace === "function") {
+        config = workspace("development");
+        if (config?.openapi_url) {
+          openApiUrl = config.openapi_url;
+        }
+      }
+    }
+  } catch {
   }
   const response = await prompts__default({
-    type: "multiselect",
-    name: "selectedProjects",
-    message: "Select projects to generate SDK for:",
-    choices: projects.map((p) => ({ title: p, value: p, selected: true }))
+    type: openApiUrl !== void 0 ? null : "text",
+    name: "openApiUrl",
+    message: "OpenAPI spec URL:",
+    initial: openApiUrl ?? "http://localhost:8000/openapi.json"
   });
-  if (!response || !response.selectedProjects || response.selectedProjects.length === 0) {
-    console.log("\n\u274C No projects selected.\n");
-    return;
+  if (response === void 0 || openApiUrl === void 0 && !response.openApiUrl) {
+    console.log("\n\u274C SDK generation cancelled.\n");
+    process__default.exit(1);
   }
-  for (const project of response.selectedProjects) {
+  const finalUrl = openApiUrl ?? response.openApiUrl;
+  const outputDir = "./shared";
+  console.log(`
+\u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
+  console.log(`\u{1F4C1} Output directory: ${outputDir}
+`);
+  try {
+    const { openAPI } = await import('@bagelink/sdk');
+    const { types, code } = await openAPI(finalUrl, "/api");
+    const outputPath = node_path.resolve(root, outputDir);
+    if (!node_fs.existsSync(outputPath)) {
+      node_fs.mkdirSync(outputPath, { recursive: true });
+    }
+    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("\n\u2705 SDK generated successfully in shared folder!");
     console.log(`
-\u{1F4E6} Generating SDK for: ${project}`);
-    const projectPath = node_path.resolve(root, project);
-    try {
-      await generateSDK(projectPath);
-    } catch {
-      console.error(`Failed to generate SDK for ${project}`);
+Import from shared in your projects:`);
+    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:");
+    if (error instanceof Error) {
+      console.error(error.message);
+    } else {
+      console.error(error);
     }
+    console.log("\nMake sure:");
+    console.log("  1. @bagelink/sdk is installed: bun add -D @bagelink/sdk");
+    console.log("  2. OpenAPI URL is accessible");
+    console.log("  3. API server is running (if using localhost)");
+    process__default.exit(1);
   }
-  console.log("\n\u2705 All SDKs generated!");
 }
 
 const [, , command, subcommand, ...args] = process__default.argv;

package/dist/bin/bgl.mjs

@@ -1090,7 +1090,6 @@ async function generateSDK(root = process.cwd()) {
     writeFileSync(apiPath, code);
     console.log("\u2705 Generated api.ts");
     try {
-      const sdkModule = await import('@bagelink/sdk');
       const sdkPath = fileURLToPath(import.meta.resolve("@bagelink/sdk"));
       const sdkDir = dirname(sdkPath);
       const streamClientSource = join(sdkDir, "openAPITools", "streamClient.ts");
@@ -1100,15 +1099,16 @@ async function generateSDK(root = process.cwd()) {
         writeFileSync(streamClientPath, streamClientCode);
         console.log("\u2705 Generated streamClient.ts");
       }
+      const streamControllerSource = join(sdkDir, "openAPITools", "StreamController.ts");
+      if (existsSync(streamControllerSource)) {
+        const streamControllerCode = readFileSync(streamControllerSource, "utf-8");
+        const streamControllerPath = resolve(outputPath, "StreamController.ts");
+        writeFileSync(streamControllerPath, streamControllerCode);
+        console.log("\u2705 Generated StreamController.ts");
+      }
     } catch (e) {
-      console.log("\u2139\uFE0F  streamClient.ts not found (optional)");
+      console.log("\u2139\uFE0F  Stream utilities not found (optional)");
     }
-    const indexPath = resolve(outputPath, "index.ts");
-    writeFileSync(
-      indexPath,
-      "export * from './api'\nexport * from './types.d'\n"
-    );
-    console.log("\u2705 Generated index.ts");
     if (splitFiles) {
       console.log("\n\u{1F500} Splitting into organized files...");
       console.log("\u2139\uFE0F  File splitting requires @bagelink/sdk bin scripts");
@@ -1116,8 +1116,9 @@ async function generateSDK(root = process.cwd()) {
     }
     console.log("\n\u2705 SDK generated successfully!");
     console.log(`
-Import it in your code:`);
-    console.log(`  import { api } from '${outputDir.replace("./src/", "./")}'`);
+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("");
   } catch (error) {
     console.error("\n\u274C Failed to generate SDK:");
@@ -1134,37 +1135,71 @@ Import it in your code:`);
   }
 }
 async function generateSDKForWorkspace(root = process.cwd()) {
-  console.log("\n\u{1F3E2} Generating SDK for workspace projects...\n");
-  const fs = await import('node:fs');
-  const items = fs.readdirSync(root, { withFileTypes: true });
-  const projects = items.filter(
-    (item) => item.isDirectory() && item.name !== "node_modules" && item.name !== "shared" && item.name !== ".git" && !item.name.startsWith(".")
-  ).map((item) => item.name);
-  if (projects.length === 0) {
-    console.log("No projects found in workspace");
-    return;
+  console.log("\n\u{1F3E2} Generating SDK for workspace...\n");
+  let config = null;
+  let openApiUrl;
+  try {
+    const configPath = resolve(root, "bgl.config.ts");
+    if (existsSync(configPath)) {
+      const module = await import(`file://${configPath}`);
+      const workspace = module.default;
+      if (typeof workspace === "function") {
+        config = workspace("development");
+        if (config?.openapi_url) {
+          openApiUrl = config.openapi_url;
+        }
+      }
+    }
+  } catch {
   }
   const response = await prompts({
-    type: "multiselect",
-    name: "selectedProjects",
-    message: "Select projects to generate SDK for:",
-    choices: projects.map((p) => ({ title: p, value: p, selected: true }))
+    type: openApiUrl !== void 0 ? null : "text",
+    name: "openApiUrl",
+    message: "OpenAPI spec URL:",
+    initial: openApiUrl ?? "http://localhost:8000/openapi.json"
   });
-  if (!response || !response.selectedProjects || response.selectedProjects.length === 0) {
-    console.log("\n\u274C No projects selected.\n");
-    return;
+  if (response === void 0 || openApiUrl === void 0 && !response.openApiUrl) {
+    console.log("\n\u274C SDK generation cancelled.\n");
+    process.exit(1);
   }
-  for (const project of response.selectedProjects) {
+  const finalUrl = openApiUrl ?? response.openApiUrl;
+  const outputDir = "./shared";
+  console.log(`
+\u{1F4E1} Fetching OpenAPI spec from: ${finalUrl}`);
+  console.log(`\u{1F4C1} Output directory: ${outputDir}
+`);
+  try {
+    const { openAPI } = await import('@bagelink/sdk');
+    const { types, code } = await openAPI(finalUrl, "/api");
+    const outputPath = resolve(root, outputDir);
+    if (!existsSync(outputPath)) {
+      mkdirSync(outputPath, { recursive: true });
+    }
+    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("\n\u2705 SDK generated successfully in shared folder!");
     console.log(`
-\u{1F4E6} Generating SDK for: ${project}`);
-    const projectPath = resolve(root, project);
-    try {
-      await generateSDK(projectPath);
-    } catch {
-      console.error(`Failed to generate SDK for ${project}`);
+Import from shared in your projects:`);
+    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:");
+    if (error instanceof Error) {
+      console.error(error.message);
+    } else {
+      console.error(error);
     }
+    console.log("\nMake sure:");
+    console.log("  1. @bagelink/sdk is installed: bun add -D @bagelink/sdk");
+    console.log("  2. OpenAPI URL is accessible");
+    console.log("  3. API server is running (if using localhost)");
+    process.exit(1);
   }
-  console.log("\n\u2705 All SDKs generated!");
 }
 
 const [, , command, subcommand, ...args] = process.argv;

package/package.json

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

package/src/sdk.ts

@@ -90,32 +90,33 @@ export async function generateSDK(
 		writeFileSync(apiPath, code)
 		console.log('✅ Generated api.ts')
 
-		// Copy streamClient.ts from @bagelink/sdk
+		// Copy streamClient and StreamController from @bagelink/sdk
 		try {
-			const sdkModule = await import('@bagelink/sdk')
 			const sdkPath = fileURLToPath(import.meta.resolve('@bagelink/sdk'))
 			const sdkDir = dirname(sdkPath)
-			const streamClientSource = join(sdkDir, 'openAPITools', 'streamClient.ts')
 
+			// Copy streamClient.ts
+			const streamClientSource = join(sdkDir, 'openAPITools', 'streamClient.ts')
 			if (existsSync(streamClientSource)) {
 				const streamClientCode = readFileSync(streamClientSource, 'utf-8')
 				const streamClientPath = resolve(outputPath, 'streamClient.ts')
 				writeFileSync(streamClientPath, streamClientCode)
 				console.log('✅ Generated streamClient.ts')
 			}
+
+			// Copy StreamController.ts
+			const streamControllerSource = join(sdkDir, 'openAPITools', 'StreamController.ts')
+			if (existsSync(streamControllerSource)) {
+				const streamControllerCode = readFileSync(streamControllerSource, 'utf-8')
+				const streamControllerPath = resolve(outputPath, 'StreamController.ts')
+				writeFileSync(streamControllerPath, streamControllerCode)
+				console.log('✅ Generated StreamController.ts')
+			}
 		} catch (e) {
 			// Stream client is optional, don't fail if not found
-			console.log('ℹ️  streamClient.ts not found (optional)')
+			console.log('ℹ️  Stream utilities not found (optional)')
 		}
 
-		// Write index
-		const indexPath = resolve(outputPath, 'index.ts')
-		writeFileSync(
-			indexPath,
-			'export * from \'./api\'\nexport * from \'./types.d\'\n',
-		)
-		console.log('✅ Generated index.ts')
-
 		if (splitFiles) {
 			console.log('\n🔀 Splitting into organized files...')
 			console.log('ℹ️  File splitting requires @bagelink/sdk bin scripts')
@@ -125,8 +126,9 @@ export async function generateSDK(
 		}
 
 		console.log('\n✅ SDK generated successfully!')
-		console.log(`\nImport it in your code:`)
-		console.log(`  import { api } from '${outputDir.replace('./src/', './')}'`)
+		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) {
@@ -149,48 +151,87 @@ export async function generateSDK(
  * Generate SDK for all projects in workspace
  */
 export async function generateSDKForWorkspace(root: string = process.cwd()): Promise<void> {
-	console.log('\n🏢 Generating SDK for workspace projects...\n')
-
-	// Find all projects
-	const fs = await import('node:fs')
-	const items = fs.readdirSync(root, { withFileTypes: true })
-	const projects = items
-		.filter(
-			item => item.isDirectory()
-				&& item.name !== 'node_modules'
-				&& item.name !== 'shared'
-				&& item.name !== '.git'
-				&& !item.name.startsWith('.'),
-		)
-		.map(item => item.name)
-
-	if (projects.length === 0) {
-		console.log('No projects found in workspace')
-		return
+	console.log('\n🏢 Generating SDK for workspace...\n')
+
+	// Try to load config
+	let config: WorkspaceConfig | null = null
+	let openApiUrl: string | undefined
+
+	try {
+		const configPath = resolve(root, 'bgl.config.ts')
+		if (existsSync(configPath)) {
+			const module = await import(`file://${configPath}`)
+			const workspace = module.default
+			if (typeof workspace === 'function') {
+				config = workspace('development')
+				if (config?.openapi_url) {
+					openApiUrl = config.openapi_url
+				}
+			}
+		}
+	}
+	catch {
+		// Ignore config load errors
 	}
 
+	// Prompt for OpenAPI URL if not in config
 	const response = await prompts({
-		type: 'multiselect',
-		name: 'selectedProjects',
-		message: 'Select projects to generate SDK for:',
-		choices: projects.map(p => ({ title: p, value: p, selected: true })),
+		type: openApiUrl !== undefined ? null : 'text',
+		name: 'openApiUrl',
+		message: 'OpenAPI spec URL:',
+		initial: openApiUrl ?? 'http://localhost:8000/openapi.json',
 	})
 
-	if (!response || !response.selectedProjects || response.selectedProjects.length === 0) {
-		console.log('\n❌ No projects selected.\n')
-		return
+	if (response === undefined || (openApiUrl === undefined && !response.openApiUrl)) {
+		console.log('\n❌ SDK generation cancelled.\n')
+		process.exit(1)
 	}
 
-	for (const project of response.selectedProjects) {
-		console.log(`\n📦 Generating SDK for: ${project}`)
-		const projectPath = resolve(root, project)
-		try {
-			await generateSDK(projectPath)
+	const finalUrl = openApiUrl ?? response.openApiUrl
+	const outputDir = './shared'
+
+	console.log(`\n📡 Fetching OpenAPI spec from: ${finalUrl}`)
+	console.log(`📁 Output directory: ${outputDir}\n`)
+
+	try {
+		// Dynamic import of @bagelink/sdk
+		const { openAPI } = await import('@bagelink/sdk')
+
+		const { types, code } = await openAPI(finalUrl, '/api')
+
+		const outputPath = resolve(root, outputDir)
+		if (!existsSync(outputPath)) {
+			mkdirSync(outputPath, { recursive: true })
+		}
+
+		// Write types
+		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('\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'`)
+		console.log('')
+	}
+	catch (error: unknown) {
+		console.error('\n❌ Failed to generate SDK:')
+		if (error instanceof Error) {
+			console.error(error.message)
 		}
-		catch {
-			console.error(`Failed to generate SDK for ${project}`)
+		else {
+			console.error(error)
 		}
+		console.log('\nMake sure:')
+		console.log('  1. @bagelink/sdk is installed: bun add -D @bagelink/sdk')
+		console.log('  2. OpenAPI URL is accessible')
+		console.log('  3. API server is running (if using localhost)')
+		process.exit(1)
 	}
-
-	console.log('\n✅ All SDKs generated!')
 }