@agentuity/cli 0.1.11 → 0.1.12

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

@@ -29,6 +29,7 @@ const SandboxGetResponseSchema = z.object({
 	dependencies: z.array(z.string()).optional().describe('Apt packages installed'),
 	metadata: z.record(z.string(), z.unknown()).optional().describe('User-defined metadata'),
 	resources: SandboxResourcesSchema.optional().describe('Resource limits'),
+	url: z.string().optional().describe('Public URL for the sandbox (if network port configured)'),
 });
 
 export const getSubcommand = createCommand({
@@ -72,57 +73,65 @@ export const getSubcommand = createCommand({
 							? tui.colorError
 							: tui.colorMuted;
 
-			console.log(`${tui.muted('Sandbox:')}         ${tui.bold(result.sandboxId)}`);
-			if (result.name) {
-				console.log(`${tui.muted('Name:')}            ${result.name}`);
-			}
-			if (result.description) {
-				console.log(`${tui.muted('Description:')}     ${result.description}`);
-			}
-			console.log(`${tui.muted('Status:')}          ${statusColor(result.status)}`);
-			console.log(`${tui.muted('Created:')}         ${result.createdAt}`);
-			if (result.runtimeName) {
-				console.log(`${tui.muted('Runtime:')}         ${result.runtimeName}`);
-			}
-			if (result.region) {
-				console.log(`${tui.muted('Region:')}          ${result.region}`);
-			}
-			if (result.snapshotId || result.snapshotTag) {
-				const snapshotDisplay = result.snapshotTag
-					? `${result.snapshotTag} ${tui.muted('(' + result.snapshotId + ')')}`
-					: result.snapshotId;
-				console.log(`${tui.muted('Snapshot:')}        ${snapshotDisplay}`);
-			}
-			console.log(`${tui.muted('Executions:')}      ${result.executions}`);
+			const snapshotDisplay =
+				result.snapshotId || result.snapshotTag
+					? result.snapshotTag
+						? result.snapshotId
+							? `${result.snapshotTag} ${tui.muted('(' + result.snapshotId + ')')}`
+							: result.snapshotTag
+						: result.snapshotId
+					: undefined;
+
+			let streamDisplay: string | undefined;
 			if (
 				result.stdoutStreamUrl &&
 				result.stderrStreamUrl &&
 				result.stdoutStreamUrl === result.stderrStreamUrl
 			) {
-				console.log(`${tui.muted('Stream:')}          ${tui.link(result.stdoutStreamUrl)}`);
-			} else {
-				if (result.stdoutStreamUrl) {
-					console.log(`${tui.muted('Stream (stdout):')} ${tui.link(result.stdoutStreamUrl)}`);
-				}
-				if (result.stderrStreamUrl) {
-					console.log(`${tui.muted('Stream (stderr):')} ${tui.link(result.stderrStreamUrl)}`);
-				}
-			}
-			if (result.dependencies && result.dependencies.length > 0) {
-				console.log(`${tui.muted('Dependencies:')}    ${result.dependencies.join(', ')}`);
+				streamDisplay = tui.link(result.stdoutStreamUrl);
 			}
+
+			const resourceParts: string[] = [];
 			if (result.resources) {
-				const resourceParts: string[] = [];
 				if (result.resources.memory) resourceParts.push(`memory=${result.resources.memory}`);
 				if (result.resources.cpu) resourceParts.push(`cpu=${result.resources.cpu}`);
 				if (result.resources.disk) resourceParts.push(`disk=${result.resources.disk}`);
-				if (resourceParts.length > 0) {
-					console.log(`${tui.muted('Resources:')}       ${resourceParts.join(', ')}`);
-				}
+			}
+
+			const tableData: Record<string, string | number> = {
+				Sandbox: tui.bold(result.sandboxId),
+			};
+
+			if (result.name) tableData['Name'] = result.name;
+			if (result.description) tableData['Description'] = result.description;
+			tableData['Status'] = statusColor(result.status);
+			tableData['Created'] = result.createdAt;
+			if (result.runtimeName) tableData['Runtime'] = result.runtimeName;
+			if (result.region) tableData['Region'] = result.region;
+			if (snapshotDisplay) tableData['Snapshot'] = snapshotDisplay;
+			tableData['Executions'] = result.executions;
+			if (streamDisplay) {
+				tableData['Stream'] = streamDisplay;
+			} else {
+				if (result.stdoutStreamUrl)
+					tableData['Stream (stdout)'] = tui.link(result.stdoutStreamUrl);
+				if (result.stderrStreamUrl)
+					tableData['Stream (stderr)'] = tui.link(result.stderrStreamUrl);
+			}
+			if (result.dependencies && result.dependencies.length > 0) {
+				tableData['Dependencies'] = result.dependencies.join(', ');
+			}
+			if (resourceParts.length > 0) {
+				tableData['Resources'] = resourceParts.join(', ');
 			}
 			if (result.metadata && Object.keys(result.metadata).length > 0) {
-				console.log(`${tui.muted('Metadata:')}        ${JSON.stringify(result.metadata)}`);
+				tableData['Metadata'] = JSON.stringify(result.metadata);
 			}
+			if (result.url) {
+				tableData['URL'] = tui.link(result.url);
+			}
+
+			tui.table([tableData], Object.keys(tableData), { layout: 'vertical', padStart: '  ' });
 		}
 
 		return {
@@ -142,6 +151,7 @@ export const getSubcommand = createCommand({
 			dependencies: result.dependencies,
 			metadata: result.metadata,
 			resources: result.resources,
+			url: result.url,
 		};
 	},
 });

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

@@ -59,6 +59,10 @@ export const listSubcommand = createCommand({
 			command: getCommand('cloud sandbox list --limit 10 --offset 20'),
 			description: 'List with pagination',
 		},
+		{
+			command: getCommand('cloud sandbox list --all'),
+			description: 'List all sandboxes regardless of project context',
+		},
 	],
 	schema: {
 		options: z.object({
@@ -67,6 +71,7 @@ export const listSubcommand = createCommand({
 				.optional()
 				.describe('Filter by status'),
 			projectId: z.string().optional().describe('Filter by project ID'),
+			all: z.boolean().optional().describe('List all sandboxes regardless of project context'),
 			limit: z.number().optional().describe('Maximum number of results (default: 50, max: 100)'),
 			offset: z.number().optional().describe('Pagination offset'),
 		}),
@@ -77,7 +82,7 @@ export const listSubcommand = createCommand({
 		const { opts, options, auth, project, logger, orgId, config } = ctx;
 		const client = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
-		const projectId = opts.projectId || project?.projectId;
+		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
 
 		const result = await sandboxList(client, {
 			orgId,

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

@@ -20,6 +20,7 @@ export const runSubcommand = createCommand({
 	description: 'Run a one-shot command in a sandbox (creates, executes, destroys)',
 	tags: ['slow', 'requires-auth'],
 	requires: { auth: true, region: true, org: true },
+	optional: { project: true },
 	examples: [
 		{
 			command: getCommand('cloud sandbox run -- echo "hello world"'),
@@ -63,12 +64,14 @@ export const runSubcommand = createCommand({
 				.array(z.string())
 				.optional()
 				.describe('Apt packages to install (can be specified multiple times)'),
+			projectId: z.string().optional().describe('Project ID to associate this sandbox with'),
 		}),
 		response: SandboxRunResponseSchema,
 	},
 
 	async handler(ctx) {
-		const { args, opts, options, auth, region, config, logger, orgId } = ctx;
+		const { args, opts, options, auth, region, config, logger, orgId, project } = ctx;
+		const projectId = opts.projectId || project?.projectId;
 		const client = createSandboxClient(logger, auth, region);
 		const started = Date.now();
 
@@ -151,6 +154,7 @@ export const runSubcommand = createCommand({
 		try {
 			const result = await sandboxRun(client, {
 				options: {
+					projectId,
 					runtime: opts.runtime,
 					runtimeId: opts.runtimeId,
 					name: opts.name,

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

@@ -190,7 +190,18 @@ async function resolveFileGlobs(
 		}
 	}
 
-	for (const pattern of exclusions) {
+	for (let pattern of exclusions) {
+		// If the pattern refers to a directory, auto-append /** to exclude all contents
+		const patternPath = join(directory, pattern);
+		try {
+			const stat = statSync(patternPath);
+			if (stat.isDirectory()) {
+				pattern = pattern.endsWith('/') ? `${pattern}**` : `${pattern}/**`;
+			}
+		} catch {
+			// Path doesn't exist or can't be stat'd, use pattern as-is
+		}
+
 		const glob = new Bun.Glob(pattern);
 		for await (const file of glob.scan({ cwd: directory, dot: true })) {
 			files.delete(file);
@@ -473,16 +484,20 @@ export const buildSubcommand = createCommand({
 			if (!options.json) {
 				tui.info(`${tui.bold('Dry Run')} - No upload will be performed`);
 				console.log('');
-				if (finalName) {
-					console.log(`  ${tui.muted('Name:'.padEnd(13))}         ${finalName}`);
-				}
-				console.log(`  ${tui.muted('Runtime:'.padEnd(13))}      ${buildConfig.runtime}`);
-				console.log(`  ${tui.muted('Tag:'.padEnd(13))}          ${opts.tag ?? 'latest'}`);
-				if (finalDescription) {
-					console.log(`  ${tui.muted('Description:'.padEnd(13))} ${finalDescription}`);
-				}
-				console.log(`  ${tui.muted('Size:'.padEnd(13))}         ${tui.formatBytes(totalSize)}`);
-				console.log(`  ${tui.muted('Files:'.padEnd(13))}        ${fileList.length}`);
+				tui.table(
+					[
+						{
+							Name: finalName,
+							Description: finalDescription ?? '-',
+							Runtime: buildConfig.runtime,
+							Tag: opts.tag ?? 'latest',
+							Size: tui.formatBytes(totalSize),
+							Files: fileList.length.toFixed(),
+						},
+					],
+					['Name', 'Description', 'Runtime', 'Tag', 'Size', 'Files'],
+					{ layout: 'vertical', padStart: '  ' }
+				);
 
 				if (buildConfig.dependencies && buildConfig.dependencies.length > 0) {
 					console.log('');
@@ -569,9 +584,16 @@ export const buildSubcommand = createCommand({
 				if (!options.json) {
 					tui.success(`Snapshot unchanged ${tui.bold(initResult.existingId!)}`);
 					console.log('');
-					console.log(`  ${tui.muted('Name:'.padEnd(13))}    ${initResult.existingName}`);
-					console.log(`  ${tui.muted('Tag:'.padEnd(13))}     ${initResult.existingTag ?? 'latest'}`);
-					console.log(`  ${tui.muted('Runtime:'.padEnd(13))} ${buildConfig.runtime}`);
+					tui.table(
+						[
+							{
+								Name: finalName,
+								Tag: opts.tag ?? 'latest',
+							},
+						],
+						['Name', 'Tag'],
+						{ layout: 'vertical', padStart: '  ' }
+					);
 				}
 
 				return {
@@ -630,17 +652,22 @@ export const buildSubcommand = createCommand({
 			if (!options.json) {
 				tui.success(`Created snapshot ${tui.bold(snapshot.snapshotId)}`);
 				console.log('');
-				console.log(`  ${tui.muted('Name:'.padEnd(13))}    ${snapshot.name}`);
-				console.log(`  ${tui.muted('Tag:'.padEnd(13))}     ${snapshot.tag ?? 'latest'}`);
-				console.log(`  ${tui.muted('Runtime:'.padEnd(13))} ${buildConfig.runtime}`);
-				if (snapshot.description) {
-					console.log(`  ${tui.muted('Description:'.padEnd(13))} ${snapshot.description}`);
-				}
-				console.log(
-					`  ${tui.muted('Size:'.padEnd(13))}    ${tui.formatBytes(snapshot.sizeBytes)}`
+
+				tui.table(
+					[
+						{
+							Name: snapshot.name,
+							Description: snapshot.description ?? '-',
+							Runtime: buildConfig.runtime,
+							Tag: snapshot.tag ?? 'latest',
+							Size: tui.formatBytes(snapshot.sizeBytes),
+							Files: snapshot.fileCount.toFixed(),
+							Created: snapshot.createdAt,
+						},
+					],
+					['Name', 'Description', 'Runtime', 'Tag', 'Size', 'Files', 'Created'],
+					{ layout: 'vertical', padStart: '  ' }
 				);
-				console.log(`  ${tui.muted('Files:'.padEnd(13))}   ${snapshot.fileCount}`);
-				console.log(`  ${tui.muted('Created:'.padEnd(13))} ${snapshot.createdAt}`);
 
 				if (buildConfig.dependencies && buildConfig.dependencies.length > 0) {
 					console.log('');

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

@@ -88,6 +88,8 @@ export const generateSubcommand = createCommand({
 	description: 'Generate a template snapshot build file',
 	tags: [],
 	requires: {},
+	skipUpgradeCheck: true,
+	skipSkill: true,
 	examples: [
 		{
 			command: getCommand('cloud sandbox snapshot generate'),

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

@@ -78,18 +78,22 @@ export const getSubcommand = createCommand({
 		);
 
 		if (!options.json) {
-			tui.info(`Snapshot: ${tui.bold(snapshot.snapshotId)}`);
-			console.log(`  ${tui.muted('Name:')}    ${snapshot.name}`);
+			const tableData: Record<string, string | number> = {
+				Snapshot: tui.bold(snapshot.snapshotId),
+				Name: snapshot.name,
+			};
 			if (snapshot.tag) {
-				console.log(`  ${tui.muted('Tag:')}     ${snapshot.tag}`);
+				tableData['Tag'] = snapshot.tag;
 			}
-			console.log(`  ${tui.muted('Size:')}    ${tui.formatBytes(snapshot.sizeBytes)}`);
-			console.log(`  ${tui.muted('Files:')}   ${snapshot.fileCount}`);
-			console.log(`  ${tui.muted('Created:')} ${snapshot.createdAt}`);
+			tableData['Size'] = tui.formatBytes(snapshot.sizeBytes);
+			tableData['Files'] = snapshot.fileCount;
+			tableData['Created'] = snapshot.createdAt;
 			if (snapshot.parentSnapshotId) {
-				console.log(`  ${tui.muted('Parent:')}  ${snapshot.parentSnapshotId}`);
+				tableData['Parent'] = snapshot.parentSnapshotId;
 			}
 
+			tui.table([tableData], Object.keys(tableData), { layout: 'vertical', padStart: '  ' });
+
 			if (
 				snapshot.userMetadata &&
 				typeof snapshot.userMetadata === 'object' &&

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

@@ -67,7 +67,7 @@ const SessionGetResponseSchema = z.object({
 				pending: z.boolean(),
 				success: z.boolean(),
 				error: z.string().nullable(),
-				result: z.string().nullable(),
+				result: z.record(z.string(), z.unknown()).nullable(),
 			})
 		)
 		.describe('Eval runs'),
@@ -171,48 +171,44 @@ export const getSubcommand = createSubcommand({
 				return result;
 			}
 
-			console.log(tui.bold('ID:          ') + session.id);
-			console.log(tui.bold('Project:     ') + session.project_id);
-			console.log(tui.bold('Deployment:  ') + (session.deployment_id || '-'));
-			console.log(tui.bold('Start:       ') + new Date(session.start_time).toLocaleString());
+			const tableData: Record<string, string> = {
+				ID: session.id,
+				Project: session.project_id,
+				Deployment: session.deployment_id || '-',
+				Start: new Date(session.start_time).toLocaleString(),
+			};
 			if (session.end_time) {
-				console.log(tui.bold('End:         ') + new Date(session.end_time).toLocaleString());
+				tableData['End'] = new Date(session.end_time).toLocaleString();
 			}
-			if (session.duration && session.end_time) {
-				console.log(
-					tui.bold('Duration:    ') + `${(session.duration / 1_000_000).toFixed(0)}ms`
-				);
+			if (session.duration != null && session.end_time != null) {
+				tableData['Duration'] = `${(session.duration / 1_000_000).toFixed(0)}ms`;
 			}
-			console.log(tui.bold('Method:      ') + session.method);
-			console.log(tui.bold('URL:         ') + tui.link(session.url, session.url));
-			console.log(tui.bold('Trigger:     ') + session.trigger);
+			tableData['Method'] = session.method;
+			tableData['URL'] = tui.link(session.url, session.url);
+			tableData['Trigger'] = session.trigger;
 			if (session.env !== 'production') {
-				console.log(tui.bold('Environment: ') + session.env);
+				tableData['Environment'] = session.env;
 			}
-			console.log(tui.bold('Dev Mode:    ') + (session.devmode ? 'Yes' : 'No'));
-			console.log(
-				tui.bold('Success:     ') +
-					(session.success ? tui.colorSuccess('✓') : tui.colorError('✗'))
-			);
-			console.log(tui.bold('Pending:     ') + (session.pending ? 'Yes' : 'No'));
+			tableData['Dev Mode'] = session.devmode ? 'Yes' : 'No';
+			tableData['Success'] = session.success ? tui.colorSuccess('✓') : tui.colorError('✗');
+			tableData['Pending'] = session.pending ? 'Yes' : 'No';
 			if (session.error) {
-				console.log(tui.bold('Error:       ') + tui.error(session.error));
+				tableData['Error'] = tui.colorError(session.error);
 			}
 			if (enriched.agents.length > 0) {
-				const agentDisplay = enriched.agents
+				tableData['Agents'] = enriched.agents
 					.map((agent: AgentInfo) => `${agent.name} ${tui.muted(`(${agent.identifier})`)}`)
 					.join(', ');
-				console.log(tui.bold('Agents:      ') + agentDisplay);
 			}
 			if (enriched.route) {
-				console.log(
-					tui.bold('Route:       ') +
-						`${enriched.route.method.toUpperCase()} ${enriched.route.path} ${tui.muted(`(${enriched.route.id})`)}`
-				);
+				tableData['Route'] =
+					`${enriched.route.method.toUpperCase()} ${enriched.route.path} ${tui.muted(`(${enriched.route.id})`)}`;
 			} else {
-				console.log(tui.bold('Route ID:    ') + session.route_id);
+				tableData['Route ID'] = session.route_id;
 			}
-			console.log(tui.bold('Thread ID:   ') + session.thread_id);
+			tableData['Thread ID'] = session.thread_id;
+
+			tui.table([tableData], Object.keys(tableData), { layout: 'vertical', padStart: '  ' });
 
 			if (enriched.evalRuns.length > 0) {
 				console.log('');

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

@@ -53,6 +53,10 @@ export const listSubcommand = createSubcommand({
 			command: getCommand('cloud session list --env=production'),
 			description: 'Only production environment',
 		},
+		{
+			command: getCommand('cloud session list --all'),
+			description: 'List all sessions regardless of project context',
+		},
 	],
 	aliases: ['ls'],
 	requires: { auth: true },
@@ -76,6 +80,7 @@ export const listSubcommand = createSubcommand({
 				.default(10)
 				.describe('Number of sessions to list (1–100)'),
 			projectId: z.string().optional().describe('Filter by project ID'),
+			all: z.boolean().optional().describe('List all sessions regardless of project context'),
 			deploymentId: z.string().optional().describe('Filter by deployment ID'),
 			trigger: z.string().optional().describe('Filter by trigger type (api, cron, webhook)'),
 			env: z.string().optional().describe('Filter by environment'),
@@ -89,14 +94,14 @@ export const listSubcommand = createSubcommand({
 		response: SessionListResponseSchema,
 	},
 	webUrl: (ctx) => {
-		const projectId = ctx.opts?.projectId || ctx.project?.projectId;
+		const projectId = ctx.opts?.all ? undefined : ctx.opts?.projectId || ctx.project?.projectId;
 		return projectId ? `/projects/${encodeURIComponent(projectId)}/sessions` : undefined;
 	},
 	async handler(ctx) {
 		const { logger, auth, project, opts, options, config } = ctx;
 		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
-		const projectId = opts.projectId || project?.projectId;
+		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
 
 		try {
 			const sessions = await sessionList(catalystClient, {

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

@@ -59,21 +59,25 @@ export const getSubcommand = createSubcommand({
 				return result;
 			}
 
-			console.log(tui.bold('ID:          ') + thread.id);
-			console.log(tui.bold('Project:     ') + thread.project_id);
-			console.log(tui.bold('Created:     ') + new Date(thread.created_at).toLocaleString());
-			console.log(tui.bold('Updated:     ') + new Date(thread.updated_at).toLocaleString());
-			console.log(tui.bold('Deleted:     ') + (thread.deleted ? 'Yes' : 'No'));
+			const tableData: Record<string, string> = {
+				ID: thread.id,
+				Project: thread.project_id,
+				Created: new Date(thread.created_at).toLocaleString(),
+				Updated: new Date(thread.updated_at).toLocaleString(),
+				Deleted: thread.deleted ? 'Yes' : 'No',
+			};
 			if (thread.deleted_at) {
-				console.log(tui.bold('Deleted At:  ') + new Date(thread.deleted_at).toLocaleString());
+				tableData['Deleted At'] = new Date(thread.deleted_at).toLocaleString();
 			}
 			if (thread.deleted_by) {
-				console.log(tui.bold('Deleted By:  ') + thread.deleted_by);
+				tableData['Deleted By'] = thread.deleted_by;
 			}
 			if (thread.user_data) {
-				console.log(tui.bold('User Data:   ') + thread.user_data);
+				tableData['User Data'] = thread.user_data;
 			}
 
+			tui.table([tableData], Object.keys(tableData), { layout: 'vertical', padStart: '  ' });
+
 			return result;
 		} catch (ex) {
 			if (ex instanceof APIError && ex.status === 404) {

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

@@ -34,6 +34,10 @@ export const listSubcommand = createSubcommand({
 			command: getCommand('cloud thread list --org-id=org_*'),
 			description: 'Filter by organization',
 		},
+		{
+			command: getCommand('cloud thread list --all'),
+			description: 'List all threads regardless of project context',
+		},
 	],
 	aliases: ['ls'],
 	requires: { auth: true },
@@ -58,6 +62,7 @@ export const listSubcommand = createSubcommand({
 				.describe('Number of threads to list (1–100)'),
 			orgId: z.string().optional().describe('Filter by organization ID'),
 			projectId: z.string().optional().describe('Filter by project ID'),
+			all: z.boolean().optional().describe('List all threads regardless of project context'),
 		}),
 		response: ThreadListResponseSchema,
 	},
@@ -65,7 +70,7 @@ export const listSubcommand = createSubcommand({
 		const { logger, auth, project, opts, options, config } = ctx;
 		const catalystClient = await getGlobalCatalystAPIClient(logger, auth, config?.name);
 
-		const projectId = opts.projectId || project?.projectId;
+		const projectId = opts.all ? undefined : opts.projectId || project?.projectId;
 		const orgId = opts.orgId;
 
 		try {

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

@@ -55,6 +55,7 @@ export function createFileWatcher(options: FileWatcherOptions): FileWatcherManag
 		'.idea',
 		'.DS_Store',
 		'.playwright',
+		'.bun',
 		'src/generated',
 	]);
 
@@ -76,6 +77,7 @@ export function createFileWatcher(options: FileWatcherOptions): FileWatcherManag
 		'.dist',
 		'.vscode',
 		'.idea',
+		'.bun',
 		'.DS_Store',
 		'.playwright',
 		'src/web', // Vite handles frontend with HMR - no backend restart needed

package/src/cmd/dev/index.ts

@@ -12,9 +12,10 @@ import { APIClient, getAPIBaseURL, getAppBaseURL, getGravityDevModeURL } from '.
 import { download } from './download';
 import { createDevmodeSyncService } from './sync';
 import { getDevmodeDeploymentId } from '../build/ast';
-import { getDefaultConfigDir, saveConfig, loadProjectSDKKey } from '../../config';
+import { getDefaultConfigDir, saveConfig, loadProjectSDKKey, getAuth } from '../../config';
 import type { Config } from '../../types';
 import { typecheck } from '../build/typecheck';
+import { isTTY, hasLoggedInBefore } from '../../auth';
 import { createFileWatcher } from './file-watcher';
 import { regenerateSkillsAsync } from './skills';
 import { prepareDevLock, releaseLockSync } from './dev-lock';
@@ -171,12 +172,15 @@ export const command = createCommand({
 				.describe('The TCP port to start the dev server (also reads from PORT env)'),
 		}),
 	},
-	optional: { auth: 'Continue without an account (local only)', project: true },
+	optional: { project: true },
 
 	async handler(ctx) {
-		const { opts, logger, project, projectDir, auth } = ctx;
+		const { opts, logger, project, projectDir } = ctx;
 		let { config } = ctx;
 
+		// Get auth state - we handle auth ourselves based on project state
+		let auth = await getAuth();
+
 		const rootDir = resolve(projectDir);
 		const appTs = join(rootDir, 'app.ts');
 		const srcDir = join(rootDir, 'src');
@@ -208,6 +212,71 @@ export const command = createCommand({
 			originalExit(1);
 		}
 
+		// Handle authentication state based on project registration
+		if (project) {
+			// Registered project (has agentuity.json) - check if user needs to login
+			const isValidAuth = auth && auth.expires > new Date();
+			if (!isValidAuth) {
+				if (isTTY()) {
+					const hasProfile = await hasLoggedInBefore();
+					const message = hasProfile
+						? 'Your session has expired or you are not logged in.'
+						: 'This project is registered with Agentuity Cloud but you are not logged in.';
+
+					tui.warning(message);
+					tui.newline();
+
+					const shouldLogin = await tui.confirm(
+						hasProfile ? 'Would you like to login now?' : 'Would you like to login or create an account?',
+						true
+					);
+
+					if (shouldLogin) {
+						tui.newline();
+
+						// Run login flow inline
+						const { loginCommand } = await import('../auth/login');
+
+						// Ensure apiClient is available for login handler
+						const loginCtx = ctx as unknown as Record<string, unknown>;
+						if (!loginCtx.apiClient) {
+							loginCtx.apiClient = new APIClient(getAPIBaseURL(config), logger, config);
+						}
+
+						if (loginCommand.handler) {
+							await loginCommand.handler(
+								loginCtx as Parameters<NonNullable<typeof loginCommand.handler>>[0]
+							);
+						}
+
+						// Refresh auth state after login
+						const freshAuth = await getAuth();
+						if (!freshAuth || freshAuth.expires <= new Date()) {
+							tui.fatal('Login was not completed successfully.', ErrorCode.AUTH_FAILED);
+						}
+						auth = freshAuth;
+						tui.newline();
+						tui.success('Login successful! Continuing with dev server...');
+						tui.newline();
+					} else {
+						// User chose not to login - show warning about disabled features
+						tui.newline();
+						tui.showLoggedOutMessage(getAppBaseURL(config), hasProfile);
+					}
+				} else {
+					// Non-TTY: fatal error with instruction
+					logger.fatal(
+						`Authentication required for this project.\n` +
+							`Run "${getCommand('auth login')}" to login to Agentuity`,
+						ErrorCode.AUTH_REQUIRED
+					);
+				}
+			}
+		} else {
+			// No agentuity.json - local-only mode, ignore auth state
+			tui.showLocalOnlyWarning();
+		}
+
 		// Prepare dev lock: cleans up stale processes from previous sessions
 		// and creates a new lockfile for this session
 		const devLock = await prepareDevLock(rootDir, opts.port, logger);
@@ -229,7 +298,10 @@ export const command = createCommand({
 		try {
 			// Setup devmode and gravity (if using public URL)
 			const useMockService = process.env.DEVMODE_SYNC_SERVICE_MOCK === 'true';
-			const apiClient = auth ? new APIClient(getAPIBaseURL(config), logger, config) : null;
+			// Create apiClient with fresh auth API key (important after inline login)
+			const apiClient = auth
+				? new APIClient(getAPIBaseURL(config), logger, auth.apiKey, config)
+				: null;
 			const syncService = apiClient
 				? createDevmodeSyncService({
 						logger,