fix(coding-agent,ai): restore Bun binary lazy provider loading closes #2314

packages/coding-agent/package.json

@@ -32,7 +32,7 @@
 		"clean": "shx rm -rf dist",
 		"dev": "tsgo -p tsconfig.build.json --watch --preserveWatchOutput",
 		"build": "tsgo -p tsconfig.build.json && shx chmod +x dist/cli.js && npm run copy-assets",
-		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/cli.js --outfile dist/pi && npm run copy-binary-assets",
+		"build:binary": "npm --prefix ../tui run build && npm --prefix ../ai run build && npm --prefix ../agent run build && npm run build && bun build --compile ./dist/bun/cli.js --outfile dist/pi && npm run copy-binary-assets",
 		"copy-assets": "shx mkdir -p dist/modes/interactive/theme && shx cp src/modes/interactive/theme/*.json dist/modes/interactive/theme/ && shx mkdir -p dist/core/export-html/vendor && shx cp src/core/export-html/template.html src/core/export-html/template.css src/core/export-html/template.js dist/core/export-html/ && shx cp src/core/export-html/vendor/*.js dist/core/export-html/vendor/",
 		"copy-binary-assets": "shx cp package.json dist/ && shx cp README.md dist/ && shx cp CHANGELOG.md dist/ && shx mkdir -p dist/theme && shx cp src/modes/interactive/theme/*.json dist/theme/ && shx mkdir -p dist/export-html/vendor && shx cp src/core/export-html/template.html dist/export-html/ && shx cp src/core/export-html/vendor/*.js dist/export-html/vendor/ && shx cp -r docs dist/ && shx cp -r examples dist/ && shx cp ../../node_modules/@silvia-odwyer/photon-node/photon_rs_bg.wasm dist/",
 		"test": "vitest --run",

packages/coding-agent/src/bun/cli.ts

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+process.title = "pi";
+
+await import("./register-bedrock.js");
+await import("../cli.js");

packages/coding-agent/src/bun/register-bedrock.ts

@@ -0,0 +1,118 @@
+import {
+	type AssistantMessage,
+	type AssistantMessageEvent,
+	createAssistantMessageEventStream,
+	type Model,
+	registerApiProvider,
+	type SimpleStreamOptions,
+	type StreamFunction,
+	type StreamOptions,
+} from "@mariozechner/pi-ai";
+
+interface LazyBedrockProviderModule {
+	streamBedrock: StreamFunction<"bedrock-converse-stream", StreamOptions>;
+	streamSimpleBedrock: StreamFunction<"bedrock-converse-stream", SimpleStreamOptions>;
+}
+
+let bedrockProviderModulePromise: Promise<LazyBedrockProviderModule> | undefined;
+
+function forwardStream(
+	target: ReturnType<typeof createAssistantMessageEventStream>,
+	source: AsyncIterable<AssistantMessageEvent>,
+): void {
+	(async () => {
+		for await (const event of source) {
+			target.push(event);
+		}
+		target.end();
+	})();
+}
+
+function createLazyLoadErrorMessage(model: Model<"bedrock-converse-stream">, error: unknown): AssistantMessage {
+	return {
+		role: "assistant",
+		content: [],
+		api: model.api,
+		provider: model.provider,
+		model: model.id,
+		usage: {
+			input: 0,
+			output: 0,
+			cacheRead: 0,
+			cacheWrite: 0,
+			totalTokens: 0,
+			cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
+		},
+		stopReason: "error",
+		errorMessage: error instanceof Error ? error.message : String(error),
+		timestamp: Date.now(),
+	};
+}
+
+function loadBedrockProviderModule(): Promise<LazyBedrockProviderModule> {
+	if (!bedrockProviderModulePromise) {
+		bedrockProviderModulePromise = import("@mariozechner/pi-ai/bedrock-provider").then(
+			({ bedrockProviderModule }) => {
+				return {
+					streamBedrock: (model, context, options) => {
+						const outer = createAssistantMessageEventStream();
+						const inner = bedrockProviderModule.streamBedrock(model, context, options);
+						forwardStream(outer, inner);
+						return outer;
+					},
+					streamSimpleBedrock: (model, context, options) => {
+						const outer = createAssistantMessageEventStream();
+						const inner = bedrockProviderModule.streamSimpleBedrock(model, context, options);
+						forwardStream(outer, inner);
+						return outer;
+					},
+				};
+			},
+		);
+	}
+	return bedrockProviderModulePromise;
+}
+
+const streamBedrockLazy: StreamFunction<"bedrock-converse-stream", StreamOptions> = (model, context, options) => {
+	const outer = createAssistantMessageEventStream();
+
+	loadBedrockProviderModule()
+		.then((module) => {
+			const inner = module.streamBedrock(model, context, options);
+			forwardStream(outer, inner);
+		})
+		.catch((error) => {
+			const message = createLazyLoadErrorMessage(model, error);
+			outer.push({ type: "error", reason: "error", error: message });
+			outer.end(message);
+		});
+
+	return outer;
+};
+
+const streamSimpleBedrockLazy: StreamFunction<"bedrock-converse-stream", SimpleStreamOptions> = (
+	model,
+	context,
+	options,
+) => {
+	const outer = createAssistantMessageEventStream();
+
+	loadBedrockProviderModule()
+		.then((module) => {
+			const inner = module.streamSimpleBedrock(model, context, options);
+			forwardStream(outer, inner);
+		})
+		.catch((error) => {
+			const message = createLazyLoadErrorMessage(model, error);
+			outer.push({ type: "error", reason: "error", error: message });
+			outer.end(message);
+		});
+
+	return outer;
+};
+
+registerApiProvider({
+	api: "bedrock-converse-stream",
+	stream: streamBedrockLazy,
+	streamSimple: streamSimpleBedrockLazy,
+});

packages/coding-agent/src/cli.ts

@@ -7,12 +7,9 @@
  */
 process.title = "pi";
 
-import { setBedrockProviderModule } from "@mariozechner/pi-ai";
-import { bedrockProviderModule } from "@mariozechner/pi-ai/bedrock-provider";
 import { EnvHttpProxyAgent, setGlobalDispatcher } from "undici";
 import { main } from "./main.js";
 
 setGlobalDispatcher(new EnvHttpProxyAgent());
-setBedrockProviderModule(bedrockProviderModule);
 
 main(process.argv.slice(2));