@agentuity/cli 1.0.59 → 2.0.0-beta.1

package/src/cmd/cloud/sandbox/exec.ts

@@ -98,8 +98,6 @@ export const execSubcommand = createCommand({
 		process.on('SIGTERM', handleSignal);
 
 		try {
-			logger.debug('[exec] calling sandboxExecute for %s', args.sandboxId);
-			const executeStart = Date.now();
 			const execution = await sandboxExecute(client, {
 				sandboxId: args.sandboxId,
 				options: {
@@ -109,13 +107,6 @@ export const execSubcommand = createCommand({
 				},
 				orgId,
 			});
-			logger.debug(
-				'[exec] sandboxExecute returned in %dms: executionId=%s, stdoutUrl=%s, stderrUrl=%s',
-				Date.now() - executeStart,
-				execution.executionId,
-				execution.stdoutStreamUrl ?? 'none',
-				execution.stderrStreamUrl ?? 'none'
-			);
 
 			if (execution.autoResumed && !options.json) {
 				tui.warning('Sandbox was automatically resumed from suspended state');
@@ -125,17 +116,10 @@ export const execSubcommand = createCommand({
 			const stderrStreamUrl = execution.stderrStreamUrl;
 			const streamAbortController = new AbortController();
 			const streamPromises: Promise<void>[] = [];
-			const streamLabels: string[] = [];
 
 			// Check if stdout and stderr are the same stream (combined output)
 			const isCombinedOutput =
 				stdoutStreamUrl && stderrStreamUrl && stdoutStreamUrl === stderrStreamUrl;
-			logger.debug(
-				'[exec] stream mode: combined=%s, stdoutUrl=%s, stderrUrl=%s',
-				isCombinedOutput,
-				stdoutStreamUrl ?? 'none',
-				stderrStreamUrl ?? 'none'
-			);
 
 			// Set up stream capture — in JSON mode, capture to buffers;
 			// when streams are separate, capture stdout/stderr independently
@@ -169,11 +153,9 @@ export const execSubcommand = createCommand({
 
 			if (isCombinedOutput) {
 				// Stream combined output to stdout only to avoid duplicates
-				logger.debug('[exec] starting combined stream: %s', stdoutStreamUrl);
-				streamLabels.push('combined');
+				logger.debug('using combined output stream (stdout === stderr): %s', stdoutStreamUrl);
 				streamPromises.push(
 					streamUrlToWritable(
-						'combined',
 						stdoutStreamUrl,
 						stdoutWritable,
 						streamAbortController.signal,
@@ -182,11 +164,9 @@ export const execSubcommand = createCommand({
 				);
 			} else {
 				if (stdoutStreamUrl) {
-					logger.debug('[exec] starting stdout stream: %s', stdoutStreamUrl);
-					streamLabels.push('stdout');
+					logger.debug('starting stdout stream from: %s', stdoutStreamUrl);
 					streamPromises.push(
 						streamUrlToWritable(
-							'stdout',
 							stdoutStreamUrl,
 							stdoutWritable,
 							streamAbortController.signal,
@@ -196,11 +176,9 @@ export const execSubcommand = createCommand({
 				}
 
 				if (stderrStreamUrl) {
-					logger.debug('[exec] starting stderr stream: %s', stderrStreamUrl);
-					streamLabels.push('stderr');
+					logger.debug('starting stderr stream from: %s', stderrStreamUrl);
 					streamPromises.push(
 						streamUrlToWritable(
-							'stderr',
 							stderrStreamUrl,
 							stderrWritable,
 							streamAbortController.signal,
@@ -210,63 +188,17 @@ export const execSubcommand = createCommand({
 				}
 			}
 
-			logger.debug(
-				'[exec] %d stream(s) started [%s], now long-polling executionGet',
-				streamPromises.length,
-				streamLabels.join(', ')
-			);
-
 			// Use server-side long-polling to wait for execution completion
 			// This is more efficient than client-side polling and provides immediate
 			// error detection if the sandbox is terminated
-			let finalExecution: Awaited<ReturnType<typeof executionGet>>;
-			const pollStart = Date.now();
-			try {
-				finalExecution = await executionGet(client, {
-					executionId: execution.executionId,
-					orgId,
-					wait: EXECUTION_WAIT_DURATION,
-				});
-			} catch (err) {
-				// Abort any active stream readers before rethrowing so they
-				// don't keep running after the execution poll has failed.
-				streamAbortController.abort();
-				throw err;
-			}
-			logger.debug(
-				'[exec] executionGet returned in %dms: status=%s, exitCode=%s',
-				Date.now() - pollStart,
-				finalExecution.status,
-				finalExecution.exitCode ?? 'undefined'
-			);
+			const finalExecution = await executionGet(client, {
+				executionId: execution.executionId,
+				orgId,
+				wait: EXECUTION_WAIT_DURATION,
+			});
 
-			// Wait for all streams to reach EOF (Pulse blocks until true EOF).
-			// Safety: execution is confirmed complete so all data has been written
-			// and complete/v2 sent. If Pulse doesn't close the response within
-			// a grace period (e.g. cross-server routing delay, stale metadata
-			// cache), abort the streams to prevent an indefinite hang.
-			if (streamPromises.length > 0) {
-				logger.debug('[exec] waiting for %d stream(s) to EOF', streamPromises.length);
-				const streamWaitStart = Date.now();
-				let graceTriggered = false;
-				const streamGrace = setTimeout(() => {
-					graceTriggered = true;
-					logger.debug(
-						'[exec] stream grace period (5s) expired after execution complete — aborting streams'
-					);
-					streamAbortController.abort();
-				}, 5_000);
-				try {
-					await Promise.all(streamPromises);
-				} finally {
-					clearTimeout(streamGrace);
-				}
-				logger.debug(
-					'[exec] all streams done in %dms (graceTriggered=%s)',
-					Date.now() - streamWaitStart,
-					graceTriggered
-				);
-			}
+			// Wait for all streams to reach EOF (Pulse blocks until true EOF)
+			await Promise.all(streamPromises);
 
 			// Ensure stdout is fully flushed before continuing
 			if (!options.json && process.stdout.writable) {
@@ -286,21 +218,12 @@ export const execSubcommand = createCommand({
 			const stderrOutput =
 				!isCombinedOutput && stderrStreamUrl ? stderrChunks.join('') : undefined;
 
-			if (finalExecution.exitCode !== undefined && finalExecution.exitCode !== 0) {
-				if (!options.json) {
+			if (!options.json) {
+				if (finalExecution.exitCode === 0) {
+					// no op
+				} else if (finalExecution.exitCode !== undefined) {
 					tui.error(`failed with exit code ${finalExecution.exitCode} in ${duration}ms`);
-				}
-				process.exitCode = finalExecution.exitCode;
-			} else if (finalExecution.exitCode === undefined) {
-				const failStatuses = ['failed', 'error', 'timeout', 'killed'];
-				if (failStatuses.includes(finalExecution.status)) {
-					if (!options.json) {
-						tui.error(
-							`Execution ${tui.bold(finalExecution.executionId)} ${finalExecution.status} in ${duration}ms`
-						);
-					}
-					process.exitCode = 1;
-				} else if (!options.json) {
+				} else {
 					tui.info(
 						`Execution ${tui.bold(finalExecution.executionId)} - Status: ${finalExecution.status}`
 					);
@@ -326,72 +249,42 @@ export const execSubcommand = createCommand({
 });
 
 async function streamUrlToWritable(
-	label: string,
 	url: string,
 	writable: NodeJS.WritableStream,
 	signal: AbortSignal,
 	logger: Logger
 ): Promise<void> {
-	const streamStart = Date.now();
 	try {
-		// Signal to Pulse that this is a v2 stream so it waits for v2 metadata
-		// instead of falling back to the legacy download path on a short timeout.
-		const v2Url = new URL(url);
-		v2Url.searchParams.set('v', '2');
-		logger.debug('[stream:%s] fetching: %s', label, v2Url.href);
-		const response = await fetch(v2Url.href, { signal });
-		logger.debug(
-			'[stream:%s] response status=%d in %dms',
-			label,
-			response.status,
-			Date.now() - streamStart
-		);
+		logger.debug('fetching stream: %s', url);
+		const response = await fetch(url, { signal });
+		logger.debug('stream response status: %d', response.status);
 
 		if (!response.ok || !response.body) {
-			logger.debug('[stream:%s] not ok or no body — returning', label);
+			logger.debug('stream response not ok or no body');
 			return;
 		}
 
 		const reader = response.body.getReader();
-		let chunks = 0;
-		let totalBytes = 0;
 
 		// Read until EOF - Pulse will block until data is available
 		while (true) {
 			const { done, value } = await reader.read();
 			if (done) {
-				logger.debug(
-					'[stream:%s] EOF after %dms (%d chunks, %d bytes)',
-					label,
-					Date.now() - streamStart,
-					chunks,
-					totalBytes
-				);
+				logger.debug('stream EOF');
 				break;
 			}
 
 			if (value) {
-				chunks++;
-				totalBytes += value.length;
-				if (chunks <= 3 || chunks % 100 === 0) {
-					logger.debug(
-						'[stream:%s] chunk #%d: %d bytes (total: %d bytes, +%dms)',
-						label,
-						chunks,
-						value.length,
-						totalBytes,
-						Date.now() - streamStart
-					);
-				}
+				logger.debug('stream chunk: %d bytes', value.length);
 				await writeAndDrain(writable, value);
 			}
 		}
 	} catch (err) {
 		if (err instanceof Error && err.name === 'AbortError') {
-			logger.debug('[stream:%s] aborted after %dms', label, Date.now() - streamStart);
+			logger.debug('stream aborted');
 			return;
 		}
-		logger.debug('[stream:%s] error after %dms: %s', label, Date.now() - streamStart, err);
+		logger.debug('stream error: %s', err);
 	}
 }
 

package/src/cmd/cloud/sandbox/run.ts

@@ -194,17 +194,10 @@ export const runSubcommand = createCommand({
 			const duration = Date.now() - started;
 			const output = outputChunks.join('');
 
-			if (result.exitCode !== 0) {
-				if (!options.json) {
+			if (!options.json) {
+				if (result.exitCode !== 0) {
 					tui.error(`failed with exit code ${result.exitCode} in ${duration}ms`);
 				}
-				// Use process.exit() directly rather than process.exitCode to ensure
-				// the exit code propagates reliably across all runtimes (Bun/Node).
-				// process.exitCode can be overwritten by later async cleanup.
-				if (!options.json) {
-					process.exit(result.exitCode);
-				}
-				process.exitCode = result.exitCode;
 			}
 
 			return {

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

@@ -17,7 +17,7 @@ import { z } from 'zod';
 import { getCommand } from '../../../../command-prefix';
 import { getCatalystAPIClient } from '../../../../config';
 import { encryptFIPSKEMDEMStream } from '../../../../crypto/box';
-import { ErrorCode, getExitCode } from '../../../../errors';
+import { ErrorCode } from '../../../../errors';
 import * as tui from '../../../../tui';
 import { createCommand } from '../../../../types';
 import { validateAptDependencies } from '../../../../utils/apt-validator';
@@ -941,7 +941,7 @@ export const buildSubcommand = createCommand({
 									2
 								)
 							);
-							process.exit(getExitCode(ErrorCode.MALWARE_DETECTED));
+							process.exit(ErrorCode.MALWARE_DETECTED);
 						}
 
 						console.log('');

package/src/cmd/coder/hub-url.ts

@@ -58,10 +58,8 @@ function normalizeToHttp(url: string): string {
 	if (normalized.startsWith('ws://')) normalized = 'http://' + normalized.slice(5);
 	else if (normalized.startsWith('wss://')) normalized = 'https://' + normalized.slice(6);
 
-	// Strip known Hub transport/helper paths to get the HTTP base URL.
-	// Accept `/ws` as a convenience alias because users often copy the raw route name.
+	// Strip /api/ws or /api/hub/* paths to get base URL
 	normalized = normalized.replace(/\/api\/ws\b.*$/, '');
-	normalized = normalized.replace(/\/ws\b.*$/, '');
 	normalized = normalized.replace(/\/api\/hub\b.*$/, '');
 
 	return normalized.replace(/\/+$/, '');

package/src/cmd/coder/start.ts

@@ -6,7 +6,7 @@ import * as tui from '../../tui';
 import { getCommand } from '../../command-prefix';
 import { ErrorCode } from '../../errors';
 import { toHubWsUrl, resolveHubUrl, hubFetchHeaders } from './hub-url';
-import { probeHubInitAccess } from './tui-init';
+import { probeTuiInitAccess } from './tui-init';
 
 /**
  * Resolve the Coder extension path.
@@ -140,18 +140,18 @@ export const startSubcommand = createSubcommand({
 		}
 		const hubWsUrl = toHubWsUrl(hubHttpUrl);
 
-		const initProbe = await probeHubInitAccess(hubHttpUrl);
-		if (!initProbe.ok) {
-			if (initProbe.code === 'unauthorized') {
+		const tuiInitProbe = await probeTuiInitAccess(hubHttpUrl);
+		if (!tuiInitProbe.ok) {
+			if (tuiInitProbe.code === 'unauthorized') {
 				tui.fatal(
-					`Coder Hub at ${hubHttpUrl} requires authentication.\n\nSet AGENTUITY_CODER_API_KEY in your shell and retry.\n\nServer said: ${initProbe.message}`,
+					`Coder Hub at ${hubHttpUrl} requires authentication.\n\nSet AGENTUITY_CODER_API_KEY in your shell and retry.\n\nServer said: ${tuiInitProbe.message}`,
 					ErrorCode.NETWORK_ERROR
 				);
 				return;
 			}
 
 			tui.fatal(
-				`Could not bootstrap the Coder Hub at ${hubHttpUrl}: ${initProbe.message}`,
+				`Could not bootstrap the Coder Hub at ${hubHttpUrl}: ${tuiInitProbe.message}`,
 				ErrorCode.NETWORK_ERROR
 			);
 			return;

package/src/cmd/coder/tui-init.ts

@@ -1,6 +1,6 @@
 import { hubFetchHeaders } from './hub-url';
 
-export type HubInitProbeResult =
+export type TuiInitProbeResult =
 	| { ok: true }
 	| {
 			ok: false;
@@ -19,12 +19,12 @@ function normalizeErrorMessage(payload: unknown, fallback: string): string {
 	return fallback;
 }
 
-export async function probeHubInitAccess(
+export async function probeTuiInitAccess(
 	hubHttpUrl: string,
 	fetchImpl: typeof fetch = fetch
-): Promise<HubInitProbeResult> {
+): Promise<TuiInitProbeResult> {
 	try {
-		const response = await fetchImpl(`${hubHttpUrl}/api/hub/init`, {
+		const response = await fetchImpl(`${hubHttpUrl}/api/hub/tui/init`, {
 			headers: hubFetchHeaders({ accept: 'application/json' }),
 			signal: AbortSignal.timeout(5_000),
 		});

package/src/cmd/dev/file-watcher.ts

@@ -8,7 +8,7 @@
 import { watch, type FSWatcher, statSync, readdirSync, lstatSync } from 'node:fs';
 import { resolve, relative } from 'node:path';
 import type { Logger } from '../../types';
-import { createAgentTemplates, createAPITemplates } from './templates';
+import { createAgentTemplates } from './templates';
 
 export interface FileWatcherOptions {
 	rootDir: string;
@@ -219,7 +219,7 @@ export function createFileWatcher(options: FileWatcherOptions): FileWatcherManag
 			isDirectory = false;
 		}
 
-		// Check if an empty directory was created in src/agent/ or src/api/
+		// Check if an empty directory was created in src/agent/
 		// This helps with developer experience by auto-scaffolding template files
 		if (changedFile && eventType === 'rename' && isDirectory) {
 			try {
@@ -229,19 +229,12 @@ export function createFileWatcher(options: FileWatcherOptions): FileWatcherManag
 				// Check if it's empty
 				const contents = readdirSync(absPath);
 				if (contents.length === 0) {
-					// Check if this is an agent or API directory
 					if (
 						normalizedPath.startsWith('src/agent/') ||
 						normalizedPath.includes('/src/agent/')
 					) {
 						logger.debug('Agent directory created: %s', changedFile);
 						createAgentTemplates(absPath);
-					} else if (
-						normalizedPath.startsWith('src/api/') ||
-						normalizedPath.includes('/src/api/')
-					) {
-						logger.debug('API directory created: %s', changedFile);
-						createAPITemplates(absPath);
 					}
 				}
 			} catch (error) {