@agentuity/cli 0.1.40 → 0.1.42

package/src/cmd/cloud/sandbox/snapshot/build.ts

@@ -65,23 +65,26 @@ function buildFileTree(files: SnapshotFileInfo[]): TreeNode {
 		const parts = file.path.split('/');
 		let current = root;
 
-		for (let i = 0; i < parts.length; i++) {
-			const part = parts[i];
-			if (!current.children.has(part)) {
-				current.children.set(part, {
-					name: part,
-					isFile: i === parts.length - 1,
-					children: new Map(),
-				});
-			}
-			current = current.children.get(part)!;
+	for (let i = 0; i < parts.length; i++) {
+		const part = parts[i];
+		if (!part) continue;
+		if (!current.children.has(part)) {
+			current.children.set(part, {
+				name: part,
+				isFile: i === parts.length - 1,
+				children: new Map(),
+			});
+		}
+		const child = current.children.get(part);
+		if (!child) continue;
+		current = child;
 
-			if (i === parts.length - 1) {
-				current.size = file.size;
-				current.isFile = true;
-			}
+		if (i === parts.length - 1) {
+			current.size = file.size;
+			current.isFile = true;
 		}
 	}
+	}
 
 	return root;
 }
@@ -100,7 +103,9 @@ function printTreeNode(node: TreeNode, prefix: string): void {
 	});
 
 	for (let i = 0; i < entries.length; i++) {
-		const [, child] = entries[i];
+		const entry = entries[i];
+		if (!entry) continue;
+		const [, child] = entry;
 		const isLast = i === entries.length - 1;
 		const connector = tui.muted(isLast ? '└── ' : '├── ');
 		const sizeStr =
@@ -146,17 +151,21 @@ function substituteVariables(
 
 	for (const [key, value] of Object.entries(values)) {
 		let substituted = value;
-		let match: RegExpExecArray | null;
 
 		varPattern.lastIndex = 0;
-		while ((match = varPattern.exec(value)) !== null) {
+		let match = varPattern.exec(value);
+		while (match !== null) {
 			const varName = match[1];
-			if (!(varName in variables)) {
+			if (!varName || !(varName in variables)) {
 				throw new Error(
 					`Variable "\${${varName}}" in "${key}" is not defined. Use --${flagName} ${varName}=value to provide it.`
 				);
 			}
-			substituted = substituted.replace(match[0], variables[varName]);
+			const varValue = variables[varName];
+			if (varValue !== undefined) {
+				substituted = substituted.replace(match[0], varValue);
+			}
+			match = varPattern.exec(value);
 		}
 		result[key] = substituted;
 	}
@@ -638,15 +647,15 @@ export const buildSubcommand = createCommand({
 					}
 				}
 
-				if (finalEnv && Object.keys(finalEnv).length > 0) {
-					console.log('');
-					tui.info('Environment:');
-					for (const key of Object.keys(finalEnv)) {
-						console.log(`  ${tui.muted('•')} ${key}=${tui.maskSecret(finalEnv[key])}`);
-					}
+			if (finalEnv && Object.keys(finalEnv).length > 0) {
+				console.log('');
+				tui.info('Environment:');
+				for (const [envKey, envValue] of Object.entries(finalEnv)) {
+					console.log(`  ${tui.muted('•')} ${envKey}=${tui.maskSecret(envValue)}`);
 				}
+			}
 
-				if (fileList.length > 0) {
+			if (fileList.length > 0) {
 					console.log('');
 					tui.info('Files:');
 					printFileTree(fileList);
@@ -940,15 +949,15 @@ export const buildSubcommand = createCommand({
 					}
 				}
 
-				if (finalEnv && Object.keys(finalEnv).length > 0) {
-					console.log('');
-					tui.info('Environment:');
-					for (const key of Object.keys(finalEnv)) {
-						console.log(`  ${tui.muted('•')} ${key}=${tui.maskSecret(finalEnv[key])}`);
-					}
+			if (finalEnv && Object.keys(finalEnv).length > 0) {
+				console.log('');
+				tui.info('Environment:');
+				for (const [envKey, envValue] of Object.entries(finalEnv)) {
+					console.log(`  ${tui.muted('•')} ${envKey}=${tui.maskSecret(envValue)}`);
 				}
+			}
 
-				if (finalMetadata && Object.keys(finalMetadata).length > 0) {
+			if (finalMetadata && Object.keys(finalMetadata).length > 0) {
 					console.log('');
 					tui.info('Metadata:');
 					for (const key of Object.keys(finalMetadata)) {

package/src/cmd/cloud/sandbox/snapshot/get.ts

@@ -183,23 +183,26 @@ function buildFileTree(files: SnapshotFileInfo[]): TreeNode {
 		const parts = file.path.split('/');
 		let current = root;
 
-		for (let i = 0; i < parts.length; i++) {
-			const part = parts[i];
-			if (!current.children.has(part)) {
-				current.children.set(part, {
-					name: part,
-					isFile: i === parts.length - 1,
-					children: new Map(),
-				});
-			}
-			current = current.children.get(part)!;
+	for (let i = 0; i < parts.length; i++) {
+		const part = parts[i];
+		if (!part) continue;
+		if (!current.children.has(part)) {
+			current.children.set(part, {
+				name: part,
+				isFile: i === parts.length - 1,
+				children: new Map(),
+			});
+		}
+		const child = current.children.get(part);
+		if (!child) continue;
+		current = child;
 
-			if (i === parts.length - 1) {
-				current.size = file.size;
-				current.isFile = true;
-			}
+		if (i === parts.length - 1) {
+			current.size = file.size;
+			current.isFile = true;
 		}
 	}
+	}
 
 	return root;
 }
@@ -218,7 +221,9 @@ function printTreeNode(node: TreeNode, prefix: string): void {
 	});
 
 	for (let i = 0; i < entries.length; i++) {
-		const [, child] = entries[i];
+		const entry = entries[i];
+		if (!entry) continue;
+		const [, child] = entry;
 		const isLast = i === entries.length - 1;
 		const connector = tui.muted(isLast ? '└── ' : '├── ');
 		const sizeStr =
@@ -237,6 +242,7 @@ function printSandboxTree(sandboxes: SandboxInfo[]): void {
 	const sorted = [...sandboxes].sort((a, b) => a.sandboxId.localeCompare(b.sandboxId));
 	for (let i = 0; i < sorted.length; i++) {
 		const sandbox = sorted[i];
+		if (!sandbox) continue;
 		const isLast = i === sorted.length - 1;
 		const connector = tui.muted(isLast ? '└── ' : '├── ');
 		const statusColor = sandbox.status === 'running' ? tui.success : tui.muted;

package/src/cmd/cloud/storage/create.ts

@@ -67,25 +67,24 @@ export const createSubcommand = defineSubcommand({
 			},
 		});
 
-		if (created.length > 0) {
-			const resource = created[0];
-
-			// Write environment variables to .env if running inside a project
-			if (ctx.projectDir && resource.env && Object.keys(resource.env).length > 0) {
-				await addResourceEnvVars(ctx.projectDir, resource.env);
-				if (!options.json) {
-					tui.info('Environment variables written to .env');
-				}
-			}
-
+	const resource = created[0];
+	if (resource) {
+		// Write environment variables to .env if running inside a project
+		if (ctx.projectDir && resource.env && Object.keys(resource.env).length > 0) {
+			await addResourceEnvVars(ctx.projectDir, resource.env);
 			if (!options.json) {
-				tui.success(`Created storage: ${tui.bold(resource.name)}`);
+				tui.info('Environment variables written to .env');
 			}
-			return {
-				success: true,
-				name: resource.name,
-			};
-		} else {
+		}
+
+		if (!options.json) {
+			tui.success(`Created storage: ${tui.bold(resource.name)}`);
+		}
+		return {
+			success: true,
+			name: resource.name,
+		};
+	} else {
 			tui.fatal('Failed to create storage');
 		}
 	},

package/src/cmd/cloud/storage/delete.ts

@@ -242,28 +242,27 @@ export const deleteSubcommand = createSubcommand({
 			},
 		});
 
-		if (deleted.length > 0) {
-			const resource = deleted[0];
-
-			// Clear cache entry for deleted bucket
-			await deleteResourceRegion('bucket', profileName, resource.name);
-
-			// Remove env vars from .env if running inside a project
-			if (ctx.projectDir && resource.env_keys.length > 0) {
-				await removeResourceEnvVars(ctx.projectDir, resource.env_keys);
-				if (!options.json) {
-					tui.info(`Removed ${resource.env_keys.join(', ')} from .env`);
-				}
-			}
-
+	const resource = deleted[0];
+	if (resource) {
+		// Clear cache entry for deleted bucket
+		await deleteResourceRegion('bucket', profileName, resource.name);
+
+		// Remove env vars from .env if running inside a project
+		if (ctx.projectDir && resource.env_keys.length > 0) {
+			await removeResourceEnvVars(ctx.projectDir, resource.env_keys);
 			if (!options.json) {
-				tui.success(`Deleted storage bucket: ${tui.bold(resource.name)}`);
+				tui.info(`Removed ${resource.env_keys.join(', ')} from .env`);
 			}
-			return {
-				success: true,
-				name: resource.name,
-			};
-		} else {
+		}
+
+		if (!options.json) {
+			tui.success(`Deleted storage bucket: ${tui.bold(resource.name)}`);
+		}
+		return {
+			success: true,
+			name: resource.name,
+		};
+	} else {
 			tui.error('Failed to delete storage bucket');
 			return { success: false, name: bucketName };
 		}

package/src/cmd/cloud/stream/get.ts

@@ -6,7 +6,7 @@ import { getCommand } from '../../../command-prefix';
 
 const GetStreamResponseSchema = z.object({
 	id: z.string().describe('Stream ID'),
-	name: z.string().describe('Stream name'),
+	namespace: z.string().describe('Stream namespace'),
 	metadata: z.record(z.string(), z.string()).describe('Stream metadata'),
 	url: z.string().describe('Public URL'),
 	sizeBytes: z.number().describe('Size in bytes'),
@@ -70,7 +70,7 @@ export const getSubcommand = createCommand({
 				const stream = await storage.get(args.id);
 				return {
 					id: args.id,
-					name: stream.name ?? '',
+					namespace: stream.namespace ?? '',
 					metadata: stream.metadata ?? {},
 					url: stream.url ?? '',
 					sizeBytes: stats.size,
@@ -91,10 +91,10 @@ export const getSubcommand = createCommand({
 
 			const sizeBytes = stream.sizeBytes ?? 0;
 
-			console.log(`Name:     ${tui.bold(stream.name ?? 'unknown')}`);
-			console.log(`ID:       ${stream.id}`);
-			console.log(`Size:     ${tui.formatBytes(sizeBytes)}`);
-			console.log(`URL:      ${tui.link(stream.url ?? 'unknown')}`);
+			console.log(`Namespace: ${tui.bold(stream.namespace ?? 'unknown')}`);
+			console.log(`ID:        ${stream.id}`);
+			console.log(`Size:      ${tui.formatBytes(sizeBytes)}`);
+			console.log(`URL:       ${tui.link(stream.url ?? 'unknown')}`);
 			if (stream.metadata && Object.keys(stream.metadata).length > 0) {
 				console.log(`Metadata:`);
 				for (const [key, value] of Object.entries(stream.metadata)) {
@@ -106,7 +106,7 @@ export const getSubcommand = createCommand({
 
 		return {
 			id: stream.id,
-			name: stream.name,
+			namespace: stream.namespace,
 			metadata: stream.metadata,
 			url: stream.url,
 			sizeBytes: stream.sizeBytes,

package/src/cmd/cloud/stream/list.ts

@@ -6,7 +6,7 @@ import { getCommand } from '../../../command-prefix';
 
 const StreamInfoSchema = z.object({
 	id: z.string().describe('Stream ID'),
-	name: z.string().describe('Stream name'),
+	namespace: z.string().describe('Stream namespace'),
 	metadata: z.record(z.string(), z.string()).describe('Stream metadata'),
 	url: z.string().describe('Public URL'),
 	sizeBytes: z.number().describe('Size in bytes'),
@@ -30,7 +30,10 @@ export const listSubcommand = createCommand({
 			command: getCommand('cloud stream ls --size 50'),
 			description: 'List 50 most recent streams',
 		},
-		{ command: getCommand('cloud stream list --name agent-logs'), description: 'Filter by name' },
+		{
+			command: getCommand('cloud stream list --namespace agent-logs'),
+			description: 'Filter by namespace',
+		},
 		{
 			command: getCommand('cloud stream list --metadata type=export'),
 			description: 'Filter by metadata',
@@ -41,7 +44,7 @@ export const listSubcommand = createCommand({
 		options: z.object({
 			size: z.number().optional().describe('maximum number of streams to return (default: 100)'),
 			offset: z.number().optional().describe('number of streams to skip for pagination'),
-			name: z.string().optional().describe('filter by stream name'),
+			namespace: z.string().optional().describe('filter by stream namespace'),
 			metadata: z
 				.string()
 				.optional()
@@ -95,7 +98,7 @@ export const listSubcommand = createCommand({
 		const result = await storage.list({
 			limit: opts.size,
 			offset: opts.offset,
-			name: opts.name,
+			namespace: opts.namespace,
 			metadata: metadataFilter,
 		});
 
@@ -115,7 +118,7 @@ export const listSubcommand = createCommand({
 				const metadataStr =
 					Object.keys(stream.metadata).length > 0 ? JSON.stringify(stream.metadata) : '-';
 				return {
-					Name: stream.name,
+					Namespace: stream.namespace,
 					ID: stream.id,
 					Size: tui.formatBytes(sizeBytes),
 					Metadata:
@@ -125,7 +128,7 @@ export const listSubcommand = createCommand({
 			});
 
 			tui.table(tableData, [
-				{ name: 'Name', alignment: 'left' },
+				{ name: 'Namespace', alignment: 'left' },
 				{ name: 'ID', alignment: 'left' },
 				{ name: 'Size', alignment: 'right' },
 				{ name: 'Metadata', alignment: 'left' },

package/src/cmd/dev/download.ts

@@ -54,7 +54,7 @@ export async function download(gravityDir: string): Promise<GravityClient> {
 	})) as { release: string; assetFileNames: string[] };
 
 	const versionTok = res.release.split('@');
-	const version = versionTok[1];
+	const version = versionTok[1] ?? 'unknown';
 	const releaseFilename = join(gravityDir, version, 'gravity');
 	const mustDownload = !existsSync(releaseFilename);
 
@@ -76,7 +76,11 @@ export async function download(gravityDir: string): Promise<GravityClient> {
 				false,
 				''
 			)) as string[];
-			return res[0] as string;
+			const file = res[0];
+			if (!file) {
+				throw new Error('No file downloaded from release');
+			}
+			return file;
 		},
 		clearOnSuccess: true,
 	});
@@ -107,5 +111,9 @@ export async function download(gravityDir: string): Promise<GravityClient> {
 		rmSync(outputdir, { recursive: true });
 	}
 
+	if (!existsSync(releaseFilename)) {
+		throw new Error(`Failed to extract gravity binary to ${releaseFilename}`);
+	}
+
 	return { filename: releaseFilename, version };
 }

package/src/cmd/dev/index.ts

@@ -1177,10 +1177,10 @@ export const command = createCommand({
 										const text = new TextDecoder().decode(chunk);
 										const trimmed = text.trim();
 
-										// Check for heartbeat port announcement
-										const match = trimmed.match(/^HEARTBEAT_PORT=(\d+)$/m);
-										if (match) {
-											const heartbeatPort = parseInt(match[1], 10);
+								// Check for heartbeat port announcement
+								const match = trimmed.match(/^HEARTBEAT_PORT=(\d+)$/m);
+								if (match?.[1]) {
+									const heartbeatPort = parseInt(match[1], 10);
 											logger.debug('Gravity heartbeat port detected: %d', heartbeatPort);
 
 											// Start sending heartbeats every 5 seconds

package/src/cmd/git/account/add.ts

@@ -252,10 +252,11 @@ export const addSubcommand = createSubcommand({
 
 				const sortedOrgs = [...orgStatuses].sort((a, b) => a.name.localeCompare(b.name));
 
-				if (orgs.length === 1) {
-					orgId = orgs[0].id;
-					selectedOrg = orgs[0];
-				} else {
+			const firstOrg = orgs[0];
+			if (orgs.length === 1 && firstOrg) {
+				orgId = firstOrg.id;
+				selectedOrg = firstOrg;
+			} else {
 					const choices = sortedOrgs.map((org) => {
 						const count = org.integrations.length;
 						const suffix =

package/src/cmd/git/link.ts

@@ -36,10 +36,10 @@ export function detectGitInfo(): DetectedGitInfo {
 			// https://github.com/owner/repo.git
 			// git@github.com:owner/repo.git
 			const httpsMatch = url.match(/github\.com\/([^/]+\/[^/]+?)(?:\.git)?$/);
-			if (httpsMatch) repo = httpsMatch[1];
+			if (httpsMatch?.[1]) repo = httpsMatch[1];
 
 			const sshMatch = url.match(/github\.com:([^/]+\/[^/]+?)(?:\.git)?$/);
-			if (sshMatch) repo = sshMatch[1];
+			if (sshMatch?.[1]) repo = sshMatch[1];
 		}
 
 		// Detect current branch

package/src/cmd/git/list.ts

@@ -53,12 +53,13 @@ export const listSubcommand = createSubcommand({
 				return [];
 			}
 
-			// Select org
-			let orgId = opts.org;
-			if (!orgId) {
-				if (orgs.length === 1) {
-					orgId = orgs[0].id;
-				} else {
+		// Select org
+		let orgId = opts.org;
+		if (!orgId) {
+			const firstOrg = orgs[0];
+			if (orgs.length === 1 && firstOrg) {
+				orgId = firstOrg.id;
+			} else {
 					tui.newline();
 					const orgChoices = orgs.map((o) => ({
 						name: o.id,

package/src/cmd/project/auth/init.ts

@@ -73,14 +73,14 @@ export const initSubcommand = createSubcommand({
 		if (!databaseUrl) {
 			// Check .env file
 			const envPath = path.join(projectDir, '.env');
-			if (fs.existsSync(envPath)) {
-				const envContent = fs.readFileSync(envPath, 'utf-8');
-				const match = envContent.match(/^DATABASE_URL=(.+)$/m);
-				if (match) {
-					databaseUrl = match[1].trim().replace(/^["']|["']$/g, '');
-				}
+		if (fs.existsSync(envPath)) {
+			const envContent = fs.readFileSync(envPath, 'utf-8');
+			const match = envContent.match(/^DATABASE_URL=(.+)$/m);
+			if (match?.[1]) {
+				databaseUrl = match[1].trim().replace(/^["']|["']$/g, '');
 			}
 		}
+		}
 
 		// Show database picker (with existing as first option if configured)
 		const dbInfo = await selectOrCreateDatabase({

package/src/cmd/project/auth/shared.ts

@@ -117,7 +117,8 @@ export async function selectOrCreateDatabase(options: {
 		}
 
 		if (!region) {
-			region = databases.length > 0 ? databases[0].cloud_region : 'usc';
+			const firstDb = databases[0];
+			region = firstDb ? firstDb.cloud_region : 'usc';
 			logger.trace(`[auth init] Using fallback region: ${region}`);
 		}
 
@@ -129,11 +130,11 @@ export async function selectOrCreateDatabase(options: {
 			callback: async () => createResources(regionalClient, orgId, region, [{ type: 'db' }]),
 		});
 
-		if (created.length === 0) {
+		const newDb = created[0];
+		if (!newDb) {
 			tui.fatal('Failed to create database');
 		}
 
-		const newDb = created[0];
 		tui.success(`Created database: ${tui.bold(newDb.name)}`);
 
 		// Fetch updated list to get the URL
@@ -142,6 +143,8 @@ export async function selectOrCreateDatabase(options: {
 
 		if (!dbInfo?.url) {
 			tui.fatal('Failed to retrieve database connection URL');
+			// TypeScript doesn't know fatal never returns, so we need this
+			throw new Error('Unreachable');
 		}
 
 		return { name: newDb.name, url: dbInfo.url, region };
@@ -150,6 +153,8 @@ export async function selectOrCreateDatabase(options: {
 	const selectedDb = databases.find((d) => d.name === response.database);
 	if (!selectedDb?.url) {
 		tui.fatal('Failed to retrieve database connection URL');
+		// TypeScript doesn't know fatal never returns, so we need this
+		throw new Error('Unreachable');
 	}
 
 	return { name: selectedDb.name, url: selectedDb.url, region: selectedDb.cloud_region };

package/src/cmd/project/delete.ts

@@ -144,9 +144,10 @@ export const deleteSubcommand = createSubcommand({
 
 		// Confirm deletion
 		if (!skipConfirm) {
+			const firstProject = projectsToDelete[0];
 			const projectDisplay =
-				projectsToDelete.length === 1
-					? formatProjectDisplay(projectsToDelete[0])
+				projectsToDelete.length === 1 && firstProject
+					? formatProjectDisplay(firstProject)
 					: projectsToDelete.map((p) => `\n  • ${formatProjectDisplay(p)}`).join('');
 			tui.warning(`You are about to delete: ${tui.bold(projectDisplay)}`);
 

package/src/cmd/project/reconcile.ts

@@ -217,8 +217,9 @@ async function selectRegion(regions: RegionList, defaultRegion?: string): Promis
 		throw new Error('No cloud regions available');
 	}
 
-	if (regions.length === 1) {
-		return regions[0].region;
+	const firstRegion = regions[0];
+	if (regions.length === 1 && firstRegion) {
+		return firstRegion.region;
 	}
 
 	// Build options from API regions
@@ -228,18 +229,21 @@ async function selectRegion(regions: RegionList, defaultRegion?: string): Promis
 	}));
 
 	// Move default to top if found
-	const defaultValue = defaultRegion ?? regions[0].region;
+	const defaultValue = defaultRegion ?? firstRegion?.region ?? '';
 	const defaultIndex = options.findIndex((r) => r.value === defaultValue);
 	if (defaultIndex > 0) {
 		const [defaultItem] = options.splice(defaultIndex, 1);
-		options.unshift(defaultItem);
+		if (defaultItem) {
+			options.unshift(defaultItem);
+		}
 	}
 
 	const prompt = createPrompt();
+	const firstOption = options[0];
 	return prompt.select({
 		message: 'Select a region:',
 		options,
-		initial: options[0].value,
+		initial: firstOption?.value ?? '',
 	});
 }
 

package/src/cmd/project/template-flow.ts

@@ -220,7 +220,12 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<CreateF
 		}
 		selectedTemplate = found;
 	} else if (!isInteractive || templates.length === 1) {
-		selectedTemplate = templates[0];
+		const firstTemplate = templates[0];
+		if (!firstTemplate) {
+			logger.fatal('No templates available', ErrorCode.RESOURCE_NOT_FOUND);
+			return undefined as never;
+		}
+		selectedTemplate = firstTemplate;
 	} else {
 		let maxLength = 15;
 		templates.forEach((t) => {
@@ -572,14 +577,19 @@ export async function runCreateFlow(options: CreateFlowOptions): Promise<CreateF
 					return createResources(catalystClient!, orgId!, region!, [{ type: 'db' }]);
 				},
 			});
-			authDatabaseName = created[0].name;
+			const createdDb = created[0];
+			if (!createdDb) {
+				logger.fatal('Failed to create database for auth', ErrorCode.RESOURCE_NOT_FOUND);
+				return undefined as never;
+			}
+			authDatabaseName = createdDb.name;
 
 			// Get env vars from created resource
-			if (created[0]?.env) {
-				authDatabaseUrl = created[0].env.DATABASE_URL;
+			if (createdDb.env) {
+				authDatabaseUrl = createdDb.env.DATABASE_URL;
 				// Also add to resourceEnvVars if not already set
 				if (!resourceEnvVars.DATABASE_URL) {
-					Object.assign(resourceEnvVars, created[0].env);
+					Object.assign(resourceEnvVars, createdDb.env);
 				}
 			}
 		}

package/src/config.ts

@@ -789,8 +789,9 @@ export async function getDefaultRegion(
 		const file = Bun.file(cachePath);
 		if (await file.exists()) {
 			const data: RegionsCacheData = await file.json();
-			if (data.regions && data.regions.length > 0) {
-				return data.regions[0].region;
+			const firstRegion = data.regions?.[0];
+			if (firstRegion) {
+				return firstRegion.region;
 			}
 		}
 	} catch {

package/src/domain.ts

@@ -79,8 +79,9 @@ async function fetchDNSRecord(name: string, type: string): Promise<string | null
 	});
 	if (res.ok) {
 		const result = (await res.json()) as CFRecord;
-		if (result?.Answer?.length) {
-			return result.Answer[0].data.replace(/\.$/, ''); // DNS records end with . so we remove that
+		const firstAnswer = result?.Answer?.[0];
+		if (firstAnswer) {
+			return firstAnswer.data.replace(/\.$/, ''); // DNS records end with . so we remove that
 		}
 	}
 	return null;
@@ -104,7 +105,7 @@ export async function checkCustomDomainForDNS(
 	config?: Config | null
 ): Promise<DNSResult[]> {
 	const suffix = config?.overrides?.api_url?.includes('agentuity.io') ? LOCAL_DNS : PRODUCTION_DNS;
-	const id = Bun.hash.xxHash64(projectId).toString(16);
+	const id = Bun.hash.xxHash64(projectId).toString(16).padStart(16, '0');
 	const proxy = `p${id}.${suffix}`;
 
 	return Promise.all(