@agentuity/cli 0.0.31 → 0.0.33

package/dist/cmd/bundle/ast.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/ast.ts"],"names":[],"mappings":"AAqJA,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACd,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0E/B"}
+{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/ast.ts"],"names":[],"mappings":"AAwJA,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACd,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA0E/B"}

package/dist/cmd/bundle/bundler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/bundler.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,MAAM,CAAC,EAAE,GAAW,EAAE,OAAO,EAAE,EAAE,aAAa,iBA8HnE"}
+{"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/bundler.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;CACd;AAED,wBAAsB,MAAM,CAAC,EAAE,GAAW,EAAE,OAAO,EAAE,EAAE,aAAa,iBAgInE"}

package/dist/cmd/bundle/patch/_util.d.ts

@@ -0,0 +1,20 @@
+export interface PatchFunctionAction {
+    before?: string;
+    after?: string;
+}
+export interface PatchClassAction {
+    methods: Record<string, PatchFunctionAction>;
+}
+export interface PatchModule {
+    module: string;
+    filename?: string;
+    functions?: Record<string, PatchFunctionAction>;
+    classes?: Record<string, PatchClassAction>;
+    body?: PatchFunctionAction;
+}
+export declare function generateEnvWarning(envkey: string): string;
+export declare function generateJSArgsPatch(index: number, inject: string): string;
+export declare function generateEnvGuard(name: string, inject: string, alt?: string): string;
+export declare function generateGatewayEnvGuard(apikey: string, apikeyval: string, apibase: string, provider: string): string;
+export declare function searchBackwards(contents: string, offset: number, val: string): number;
+//# sourceMappingURL=_util.d.ts.map

package/dist/cmd/bundle/patch/_util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_util.d.ts","sourceRoot":"","sources":["../../../../src/cmd/bundle/patch/_util.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,WAAW;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC3C,IAAI,CAAC,EAAE,mBAAmB,CAAC;CAC3B;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAOzD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAIzE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAKnF;AAED,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GACd,MAAM,CAaR;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAOrF"}

package/dist/cmd/bundle/patch/aisdk.d.ts

@@ -0,0 +1,3 @@
+import { type PatchModule } from './_util';
+export declare function generatePatches(): Map<string, PatchModule>;
+//# sourceMappingURL=aisdk.d.ts.map

package/dist/cmd/bundle/patch/aisdk.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aisdk.d.ts","sourceRoot":"","sources":["../../../../src/cmd/bundle/patch/aisdk.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,SAAS,CAAC;AA6BjB,wBAAgB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAuD1D"}

package/dist/cmd/bundle/patch/index.d.ts

@@ -0,0 +1,4 @@
+import { type PatchModule } from './_util';
+export declare function generatePatches(): Map<string, PatchModule>;
+export declare function applyPatch(filename: string, patch: PatchModule): Promise<[string, Bun.Loader]>;
+//# sourceMappingURL=index.d.ts.map

package/dist/cmd/bundle/patch/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cmd/bundle/patch/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,SAAS,CAAC;AAE5D,wBAAgB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAM1D;AAED,wBAAsB,UAAU,CAC/B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,WAAW,GAChB,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAkF/B"}

package/dist/cmd/bundle/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAwGrC,QAAA,MAAM,gBAAgB,EAAE,SAgJvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cmd/bundle/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAyGrC,QAAA,MAAM,gBAAgB,EAAE,SAwKvB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/cmd/dev/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,mCAiXlB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmd/dev/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,OAAO,mCAsXlB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/cli",
-	"version": "0.0.31",
+	"version": "0.0.33",
 	"type": "module",
 	"main": "./src/index.ts",
 	"types": "./dist/index.d.ts",
@@ -28,7 +28,7 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/core": "0.0.29",
+		"@agentuity/core": "0.0.31",
 		"acorn-loose": "^8.5.2",
 		"astring": "^1.9.0",
 		"commander": "^14.0.2",

package/src/cmd/bundle/ast.ts

@@ -22,6 +22,9 @@ interface ASTPropertyNode {
 	kind: string;
 	key: ASTNodeIdentifier;
 	value: ASTNode;
+	shorthand?: boolean;
+	method?: boolean;
+	computed?: boolean;
 }
 
 interface ASTObjectExpression extends ASTNode {

package/src/cmd/bundle/bundler.ts

@@ -58,7 +58,7 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 			outdir: outDir,
 			define,
 			sourcemap: dev ? 'inline' : 'external',
-			env: 'AGENTUITY_CLOUD_*',
+			env: 'disable',
 			plugins: [AgentuityBundler],
 			target: 'bun',
 			format: 'esm',
@@ -79,7 +79,7 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 		// Find workspace root for monorepo support
 		let workspaceRoot = rootDir;
 		let currentDir = rootDir;
-		while (currentDir !== '/') {
+		while (true) {
 			const pkgPath = join(currentDir, 'package.json');
 			if (existsSync(pkgPath)) {
 				const pkg = JSON.parse(await Bun.file(pkgPath).text());
@@ -88,7 +88,9 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 					break;
 				}
 			}
-			currentDir = resolve(currentDir, '..');
+			const parent = resolve(currentDir, '..');
+			if (parent === currentDir) break; // reached filesystem root
+			currentDir = parent;
 		}
 
 		// Make webEntrypoints - just the HTML files themselves
@@ -102,7 +104,7 @@ export async function bundle({ dev = false, rootDir }: BundleOptions) {
 			outdir: join(outDir, 'web'),
 			define,
 			sourcemap: dev ? 'inline' : 'linked',
-			env: 'AGENTUITY_CLOUD_*',
+			env: 'AGENTUITY_PUBLIC_*',
 			plugins: [AgentuityBundler],
 			target: 'browser',
 			format: 'cjs',

package/src/cmd/bundle/patch/_util.ts

@@ -0,0 +1,67 @@
+export interface PatchFunctionAction {
+	before?: string;
+	after?: string;
+}
+
+export interface PatchClassAction {
+	methods: Record<string, PatchFunctionAction>;
+}
+
+export interface PatchModule {
+	module: string;
+	filename?: string;
+	functions?: Record<string, PatchFunctionAction>;
+	classes?: Record<string, PatchClassAction>;
+	body?: PatchFunctionAction;
+}
+
+export function generateEnvWarning(envkey: string): string {
+	return `if (process.env.AGENTUITY_ENVIRONMENT === 'development' || process.env.NODE_ENV !== 'production') {
+      console.error('The required environment variable ${envkey} must be set in your project .env file or in your local system environment.');
+     } else {
+      console.error('The required environment variable ${envkey} is required for this project. Use "agentuity env set ${envkey}" to set it and redeploy your project.');
+     }
+`;
+}
+
+export function generateJSArgsPatch(index: number, inject: string): string {
+	return `const _newargs = [...(_args ?? [])];
+_newargs[${index}] = {..._newargs[${index}], ${inject}};
+_args = _newargs;`;
+}
+
+export function generateEnvGuard(name: string, inject: string, alt?: string): string {
+	return `if (!process.env.${name} || process.env.${name}  ===  process.env.AGENTUITY_SDK_KEY) {
+${inject}
+} else {
+	${alt ?? ''}}`;
+}
+
+export function generateGatewayEnvGuard(
+	apikey: string,
+	apikeyval: string,
+	apibase: string,
+	provider: string
+): string {
+	return `{
+    const apikey = process.env.AGENTUITY_SDK_KEY;
+    const url = process.env.AGENTUITY_AIGATEWAY_URL || process.env.AGENTUITY_TRANSPORT_URL || (apikey ? 'https://agentuity.ai' : '');
+    if (url && apikey) {
+        process.env.${apikey} = ${apikeyval};
+        process.env.${apibase} = url + '/gateway/${provider}';
+        console.debug('Enabled Agentuity AI Gateway for ${provider}');
+    } else {
+     ${generateEnvWarning(apikey)}
+    }
+}
+`;
+}
+
+export function searchBackwards(contents: string, offset: number, val: string): number {
+	for (let i = offset; i >= 0; i--) {
+		if (contents.charAt(i) == val) {
+			return i;
+		}
+	}
+	return -1;
+}

package/src/cmd/bundle/patch/aisdk.ts

@@ -0,0 +1,130 @@
+import {
+	type PatchModule,
+	generateEnvWarning,
+	generateEnvGuard,
+	generateJSArgsPatch,
+} from './_util';
+
+function generateAISDKPatch(patches: Map<string, PatchModule>) {
+	const vercelTelemetryPatch = generateJSArgsPatch(0, ` ` + '');
+
+	const enableTelemetryPatch = `
+		// Enable experimental telemetry to capture response text
+		const opts = {...(_args[0] ?? {}) };
+		opts.experimental_telemetry = { isEnabled: true };
+		_args[0] = opts;
+		`;
+
+	const comboPatch = vercelTelemetryPatch + enableTelemetryPatch;
+	const functionPatch = { before: comboPatch };
+
+	const patch: PatchModule = {
+		module: 'ai',
+		functions: {
+			generateText: functionPatch,
+			streamText: functionPatch,
+			generateObject: functionPatch,
+			streamObject: functionPatch,
+			embed: functionPatch,
+			embedMany: functionPatch,
+		},
+	};
+	patches.set('@vercel/ai', patch);
+}
+
+export function generatePatches(): Map<string, PatchModule> {
+	const patches = new Map<string, PatchModule>();
+	generateAISDKPatch(patches);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/openai',
+		'createOpenAI',
+		'OPENAI_API_KEY',
+		'openai'
+	);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/anthropic',
+		'createAnthropic',
+		'ANTHROPIC_API_KEY',
+		'anthropic'
+	);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/cohere',
+		'createCohere',
+		'COHERE_API_KEY',
+		'cohere'
+	);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/deepseek',
+		'createDeepSeek',
+		'DEEPSEEK_API_KEY',
+		'deepseek'
+	);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/google',
+		'createGoogleGenerativeAI',
+		'GOOGLE_GENERATIVE_AI_API_KEY',
+		'google-ai-studio'
+	);
+	createVercelAIProviderPatch(patches, '@ai-sdk/xai', 'createXai', 'XAI_API_KEY', 'grok');
+	createVercelAIProviderPatch(patches, '@ai-sdk/groq', 'createGroq', 'GROQ_API_KEY', 'groq');
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/mistral',
+		'createMistral',
+		'MISTRAL_API_KEY',
+		'mistral'
+	);
+	createVercelAIProviderPatch(
+		patches,
+		'@ai-sdk/perplexity',
+		'createPerplexity',
+		'PERPLEXITY_API_KEY',
+		'perplexity-ai'
+	);
+	return patches;
+}
+
+function generateVercelAIProvider(name: string, envkey: string): string {
+	return (
+		generateJSArgsPatch(0, '') +
+		`const opts = {...(_args[0] ?? {}) };
+if (!opts.baseURL) {
+	const apikey = process.env.AGENTUITY_SDK_KEY;
+	const url = process.env.AGENTUITY_TRANSPORT_URL;
+	if (url && apikey) {
+		opts.apiKey = apikey;
+		opts.baseURL = url + '/gateway/${name}';
+		_args[0] = opts;
+	} else {
+	  ${generateEnvWarning(envkey)}
+	}
+}`
+	);
+}
+
+function createVercelAIProviderPatch(
+	patches: Map<string, PatchModule>,
+	module: string,
+	createFn: string,
+	envkey: string,
+	provider: string
+) {
+	const patch = {
+		module: module,
+		functions: {
+			[createFn]: {
+				before: generateEnvGuard(
+					envkey,
+					generateVercelAIProvider(provider, envkey),
+					`console.log("User provided API Key set for ${provider}. Switch to Agentuity AI Gateway for better logs, metrics and billing.");`
+				),
+			},
+		},
+	};
+	patches.set(module, patch);
+}

package/src/cmd/bundle/patch/index.ts

@@ -0,0 +1,97 @@
+import { generatePatches as aisdkGeneratePatches } from './aisdk';
+import { type PatchModule, searchBackwards } from './_util';
+
+export function generatePatches(): Map<string, PatchModule> {
+	const patches = new Map<string, PatchModule>();
+	for (const [name, patch] of aisdkGeneratePatches()) {
+		patches.set(name, patch);
+	}
+	return patches;
+}
+
+export async function applyPatch(
+	filename: string,
+	patch: PatchModule
+): Promise<[string, Bun.Loader]> {
+	let contents = await Bun.file(filename).text();
+	const isJS = filename.endsWith('.js') || filename.endsWith('.mjs');
+	let suffix = '';
+	if (patch.functions) {
+		for (const fn of Object.keys(patch.functions)) {
+			const mod = patch.functions[fn];
+			let fnname = `function ${fn}`;
+			let index = contents.indexOf(fnname);
+			let isConstVariable = false;
+			if (index === -1) {
+				fnname = 'const ' + fn + ' = ';
+				index = contents.indexOf(fnname);
+				isConstVariable = true;
+				if (index === -1) {
+					continue;
+				}
+			}
+			const eol = searchBackwards(contents, index, '\n');
+			if (eol < 0) {
+				continue;
+			}
+			const prefix = contents.substring(eol + 1, index).trim();
+			const isAsync = prefix.includes('async');
+			const isExport = prefix.includes('export');
+			const newname = '__agentuity_' + fn;
+			let newfnname: string;
+			if (isConstVariable) {
+				newfnname = 'const ' + newname + ' = ';
+			} else {
+				newfnname = 'function ' + newname;
+			}
+			let fnprefix = '';
+			if (isAsync) {
+				fnprefix = 'async ';
+			}
+			if (isExport) {
+				fnprefix += 'export ' + fnprefix;
+			}
+			contents = contents.replace(fnname, newfnname);
+			if (isJS) {
+				suffix += fnprefix + 'function ' + fn + '() {\n';
+				suffix += 'let args = arguments;\n';
+			} else {
+				suffix += fnprefix + fnname + '(...args) {\n';
+			}
+			suffix += '\tlet _args = args;\n';
+
+			if (mod.before) {
+				suffix += mod.before;
+				suffix += '\n';
+			}
+
+			if (isJS) {
+				// For JS: use .apply to preserve 'this' context
+				suffix += '\tlet result = ' + newname + '.apply(this, _args);\n';
+			} else {
+				// For TS: use spread operator
+				suffix += '\tlet result = ' + newname + '(..._args);\n';
+			}
+
+			if (isAsync) {
+				suffix += '\tif (result instanceof Promise) {\n';
+				suffix += '\t\tresult = await result;\n';
+				suffix += '\t}\n';
+			}
+			if (mod.after) {
+				suffix += mod.after;
+				suffix += '\n';
+			}
+			suffix += '\treturn result;\n';
+			suffix += '}\n';
+			contents = contents + '\n' + suffix;
+		}
+	}
+	if (patch.body?.before) {
+		contents = patch.body.before + '\n' + contents;
+	}
+	if (patch.body?.after) {
+		contents = contents + '\n' + patch.body.after;
+	}
+	return [contents, isJS ? 'js' : 'ts'];
+}

package/src/cmd/bundle/plugin.ts

@@ -2,6 +2,7 @@ import type { BunPlugin } from 'bun';
 import { dirname, basename, join } from 'node:path';
 import { existsSync, writeFileSync } from 'node:fs';
 import { parseAgentMetadata } from './ast';
+import { applyPatch, generatePatches } from './patch';
 
 function toCamelCase(str: string): string {
 	return str
@@ -140,6 +141,30 @@ const AgentuityBundler: BunPlugin = {
 			};
 		});
 
+		const patches = generatePatches();
+		for (const [, patch] of patches) {
+			let modulePath = join('node_modules', patch.module, '.*');
+			if (patch.filename) {
+				modulePath = join('node_modules', patch.module, patch.filename + '.*');
+			}
+			build.onLoad(
+				{
+					filter: new RegExp(modulePath),
+					namespace: 'file',
+				},
+				async (args) => {
+					if (build.config.target !== 'bun') {
+						return;
+					}
+					const [contents, loader] = await applyPatch(args.path, patch);
+					return {
+						contents,
+						loader,
+					};
+				}
+			);
+		}
+
 		build.onLoad(
 			{
 				filter: new RegExp(join(rootDir, 'app.ts')),

package/src/cmd/dev/index.ts

@@ -233,6 +233,11 @@ export const command = createCommand({
 							process.exit(exitCode);
 						}
 						// Non-zero exit codes are treated as restartable failures
+						// But if it's exit code 1 (common error exit), also exit the CLI
+						if (exitCode === 1 && !shuttingDownForRestart) {
+							logger.trace('Server exited with error code 1, stopping CLI');
+							process.exit(exitCode);
+						}
 					})
 					.catch((error) => {
 						logger.trace(