@townco/cli 0.1.12 → 0.1.14

package/dist/commands/create.d.ts

@@ -1,9 +1,8 @@
 interface CreateCommandProps {
-    name?: string;
-    model?: string;
-    tools?: readonly string[];
-    systemPrompt?: string;
-    overwrite?: boolean;
+	name?: string;
+	model?: string;
+	tools?: readonly string[];
+	systemPrompt?: string;
+	overwrite?: boolean;
 }
 export declare function createCommand(props: CreateCommandProps): Promise<void>;
-export {};

package/dist/commands/create.js

@@ -1,13 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { spawn } from "node:child_process";
-import { readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
 import { scaffoldAgent } from "@townco/agent/scaffold";
 import { InputBox, MultiSelect, SingleSelect } from "@townco/ui/tui";
 import { Box, render, Text, useInput } from "ink";
 import TextInput from "ink-text-input";
 import { useEffect, useState } from "react";
+import { openInEditor } from "../lib/editor-utils";
 const AVAILABLE_MODELS = [
     {
         label: "Claude Sonnet 4.5",
@@ -55,70 +52,6 @@ function NameInput({ nameInput, setNameInput, onSubmit }) {
     });
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, children: "Enter agent name:" }) }), _jsxs(Box, { children: [_jsxs(Text, { children: [">", " "] }), _jsx(TextInput, { value: nameInput, onChange: setNameInput, onSubmit: onSubmit })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Enter: Continue \u2022 Esc: Cancel" }) })] }));
 }
-async function openEditor(initialContent) {
-    const tempFile = join(tmpdir(), `agent-prompt-${Date.now()}.txt`);
-    try {
-        // Write initial content
-        writeFileSync(tempFile, initialContent, "utf-8");
-        // Try $EDITOR first
-        const editor = process.env.EDITOR;
-        if (editor) {
-            try {
-                await new Promise((resolve, reject) => {
-                    const child = spawn(editor, [tempFile], {
-                        stdio: "inherit",
-                    });
-                    child.on("close", (code) => {
-                        if (code === 0)
-                            resolve();
-                        else
-                            reject(new Error(`Editor exited with code ${code}`));
-                    });
-                    child.on("error", reject);
-                });
-                const content = readFileSync(tempFile, "utf-8");
-                unlinkSync(tempFile);
-                return content;
-            }
-            catch (_error) {
-                // Fall through to try 'code'
-            }
-        }
-        // Try 'code' (VS Code) as fallback
-        try {
-            await new Promise((resolve, reject) => {
-                const child = spawn("code", ["--wait", tempFile], {
-                    stdio: "inherit",
-                });
-                child.on("close", (code) => {
-                    if (code === 0)
-                        resolve();
-                    else
-                        reject(new Error(`Code exited with code ${code}`));
-                });
-                child.on("error", reject);
-            });
-            const content = readFileSync(tempFile, "utf-8");
-            unlinkSync(tempFile);
-            return content;
-        }
-        catch (_error) {
-            // Clean up and return null to signal fallback to inline
-            unlinkSync(tempFile);
-            return null;
-        }
-    }
-    catch (_error) {
-        // Clean up temp file if it exists
-        try {
-            unlinkSync(tempFile);
-        }
-        catch {
-            // Ignore cleanup errors
-        }
-        return null;
-    }
-}
 function CreateApp({ name: initialName, model: initialModel, tools: initialTools, systemPrompt: initialSystemPrompt, overwrite = false, }) {
     // Determine the starting stage based on what's provided
     const determineInitialStage = () => {
@@ -150,13 +83,14 @@ function CreateApp({ name: initialName, model: initialModel, tools: initialTools
     const [agentPath, setAgentPath] = useState(null);
     // Handle opening editor when systemPrompt stage is entered from review
     useEffect(() => {
-        if (stage === "systemPrompt" &&
-            isEditingFromReview &&
-            !isEditingPrompt &&
-            promptEditMode === null) {
-            // Trigger editor opening
-            setIsEditingPrompt(true);
-            openEditor(agentDef.systemPrompt || "You are a helpful assistant.").then((editorContent) => {
+        (async () => {
+            if (stage === "systemPrompt" &&
+                isEditingFromReview &&
+                !isEditingPrompt &&
+                promptEditMode === null) {
+                // Trigger editor opening
+                setIsEditingPrompt(true);
+                const editorContent = await openInEditor(agentDef.systemPrompt || "You are a helpful assistant.");
                 if (editorContent !== null) {
                     // Editor worked
                     setAgentDef({ ...agentDef, systemPrompt: editorContent });
@@ -170,8 +104,8 @@ function CreateApp({ name: initialName, model: initialModel, tools: initialTools
                     setIsEditingPrompt(false);
                     setSystemPromptInput(agentDef.systemPrompt || "You are a helpful assistant.");
                 }
-            });
-        }
+            }
+        })();
     }, [stage, isEditingFromReview, isEditingPrompt, promptEditMode, agentDef]);
     // Handle scaffolding when entering "done" stage
     useEffect(() => {
@@ -197,20 +131,10 @@ function CreateApp({ name: initialName, model: initialModel, tools: initialTools
                 if (result.success) {
                     setScaffoldStatus("done");
                     setAgentPath(result.path);
-                    // Output in the same format as 'town list'
-                    const modelLabel = model.replace("claude-", "");
-                    console.log(`\n\x1b[1mAgent created successfully!\x1b[0m\n`);
-                    console.log(`  \x1b[32m●\x1b[0m \x1b[1m${name}\x1b[0m`);
-                    console.log(`    \x1b[2mModel: ${modelLabel}\x1b[0m`);
-                    if (agentDef.tools && agentDef.tools.length > 0) {
-                        console.log(`    \x1b[2mTools: ${agentDef.tools.join(", ")}\x1b[0m`);
-                    }
-                    console.log(`    \x1b[2mPath: ${result.path}\x1b[0m`);
-                    console.log();
-                    console.log(`\x1b[2mRun an agent with: town run ${agentDef.name}\x1b[0m`);
-                    console.log(`\x1b[2mTUI mode (default), --gui for web interface, --http for API server\x1b[0m`);
-                    // Exit immediately
-                    process.exit(0);
+                    // Exit after showing the done message
+                    setTimeout(() => {
+                        process.exit(0);
+                    }, 100);
                 }
                 else {
                     setScaffoldStatus("error");
@@ -271,7 +195,7 @@ function CreateApp({ name: initialName, model: initialModel, tools: initialTools
                         setStage("systemPrompt");
                         // Attempt to open editor
                         setIsEditingPrompt(true);
-                        const editorContent = await openEditor(agentDef.systemPrompt || "You are a helpful assistant.");
+                        const editorContent = await openInEditor(agentDef.systemPrompt || "You are a helpful assistant.");
                         if (editorContent !== null) {
                             // Editor worked
                             setAgentDef({ ...agentDef, systemPrompt: editorContent });
@@ -363,13 +287,14 @@ function CreateApp({ name: initialName, model: initialModel, tools: initialTools
     // Done stage
     if (stage === "done") {
         if (scaffoldStatus === "scaffolding") {
-            return (_jsx(Box, { flexDirection: "column", children: _jsx(Text, { children: "\u23F3 Creating agent package..." }) }));
+            return (_jsx(Box, { flexDirection: "column", children: _jsxs(Text, { children: ["\u23F3 Creating agent ", agentDef.name, "..."] }) }));
         }
         if (scaffoldStatus === "error") {
             return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "red", children: "\u2717 Error creating agent package" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { children: scaffoldError }) })] }));
         }
         if (scaffoldStatus === "done") {
-            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: "green", children: "\u2713 Agent package created successfully!" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Path: ", agentPath] }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["You can run the agent with:", " ", _jsxs(Text, { bold: true, color: "cyan", children: ["town run ", agentDef.name] })] }) })] }));
+            const modelLabel = agentDef.model?.replace("claude-", "") || "";
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { bold: true, children: "Agent created successfully!" }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { children: [_jsx(Text, { color: "green", children: "\u25CF" }), " ", _jsx(Text, { bold: true, children: agentDef.name })] }), _jsxs(Text, { dimColor: true, children: [" Model: ", modelLabel] }), agentDef.tools && agentDef.tools.length > 0 && (_jsxs(Text, { dimColor: true, children: [" Tools: ", agentDef.tools.join(", ")] })), _jsxs(Text, { dimColor: true, children: [" Path: ", agentPath] })] }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Run an agent with: town run ", agentDef.name] }), _jsx(Text, { dimColor: true, children: "TUI mode (default), --gui for web interface, --http for API server" })] })] }));
         }
     }
     return null;

package/dist/commands/mcp-add.d.ts

@@ -1,9 +1,14 @@
 interface MCPAddProps {
-    name?: string;
-    url?: string;
-    command?: string;
-    args?: readonly string[];
+	name?: string;
+	url?: string;
+	command?: string;
+	args?: readonly string[];
 }
-declare function MCPAddApp({ name: initialName, url: initialUrl, command: initialCommand, args: initialArgs, }: MCPAddProps): import("react/jsx-runtime").JSX.Element | null;
+declare function MCPAddApp({
+	name: initialName,
+	url: initialUrl,
+	command: initialCommand,
+	args: initialArgs,
+}: MCPAddProps): import("react/jsx-runtime").JSX.Element | null;
 export default MCPAddApp;
 export declare function runMCPAdd(props?: MCPAddProps): Promise<void>;

package/dist/commands/mcp-list.js

@@ -1,61 +1,188 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Box, render, Text, useApp, useInput } from "ink";
 import { useEffect, useState } from "react";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { listMCPConfigs } from "../lib/mcp-storage";
+
 // ============================================================================
 // Main Component
 // ============================================================================
 function MCPListApp() {
-    const [result, setResult] = useState(null);
-    const [loading, setLoading] = useState(true);
-    const { exit } = useApp();
-    useEffect(() => {
-        function loadConfigs() {
-            try {
-                const configs = listMCPConfigs();
-                setResult({ configs });
-            }
-            catch (error) {
-                const errorMsg = error instanceof Error ? error.message : String(error);
-                setResult({ configs: [], error: errorMsg });
-            }
-            finally {
-                setLoading(false);
-            }
-        }
-        loadConfigs();
-    }, []);
-    // Exit on any key press when not loading
-    useInput((_input, key) => {
-        if (!loading) {
-            if (key.return || key.escape || _input === "q") {
-                exit();
-            }
-        }
-    });
-    if (loading) {
-        return (_jsx(Box, { children: _jsx(Text, { children: "Loading MCP servers..." }) }));
-    }
-    if (result?.error) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "red", children: "\u274C Error loading MCP servers" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { children: result.error }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "Press Enter or Q to exit" }) })] }));
-    }
-    if (!result || result.configs.length === 0) {
-        return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, children: "No MCP servers configured" }) }), _jsx(Box, { marginBottom: 1, children: _jsx(Text, { dimColor: true, children: "Add one with: town mcp add" }) }), _jsx(Box, { children: _jsx(Text, { dimColor: true, children: "Press Enter or Q to exit" }) })] }));
-    }
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { bold: true, children: ["Configured MCP Servers (", result.configs.length, ")"] }) }), result.configs.map((config, index) => (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Box, { children: _jsxs(Text, { bold: true, color: "cyan", children: [index + 1, ". ", config.name] }) }), _jsx(Box, { paddingLeft: 3, children: config.transport === "http" ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Transport: ", _jsx(Text, { color: "green", children: "HTTP" })] }), _jsxs(Text, { children: ["URL: ", config.url] })] })) : (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { children: ["Transport: ", _jsx(Text, { color: "blue", children: "stdio" })] }), _jsxs(Text, { children: ["Command: ", config.command] }), config.args && config.args.length > 0 && (_jsxs(Text, { children: ["Args: ", config.args.join(" ")] }))] })) })] }, config.name))), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Use `town mcp remove` to remove a server or `town mcp add` to add one" }) }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Press Enter or Q to exit" }) })] }));
+	const [result, setResult] = useState(null);
+	const [loading, setLoading] = useState(true);
+	const { exit } = useApp();
+	useEffect(() => {
+		function loadConfigs() {
+			try {
+				const configs = listMCPConfigs();
+				setResult({ configs });
+			} catch (error) {
+				const errorMsg = error instanceof Error ? error.message : String(error);
+				setResult({ configs: [], error: errorMsg });
+			} finally {
+				setLoading(false);
+			}
+		}
+		loadConfigs();
+	}, []);
+	// Exit on any key press when not loading
+	useInput((_input, key) => {
+		if (!loading) {
+			if (key.return || key.escape || _input === "q") {
+				exit();
+			}
+		}
+	});
+	if (loading) {
+		return _jsx(Box, {
+			children: _jsx(Text, { children: "Loading MCP servers..." }),
+		});
+	}
+	if (result?.error) {
+		return _jsxs(Box, {
+			flexDirection: "column",
+			children: [
+				_jsx(Box, {
+					marginBottom: 1,
+					children: _jsx(Text, {
+						bold: true,
+						color: "red",
+						children: "\u274C Error loading MCP servers",
+					}),
+				}),
+				_jsx(Box, {
+					marginBottom: 1,
+					children: _jsx(Text, { children: result.error }),
+				}),
+				_jsx(Box, {
+					children: _jsx(Text, {
+						dimColor: true,
+						children: "Press Enter or Q to exit",
+					}),
+				}),
+			],
+		});
+	}
+	if (!result || result.configs.length === 0) {
+		return _jsxs(Box, {
+			flexDirection: "column",
+			children: [
+				_jsx(Box, {
+					marginBottom: 1,
+					children: _jsx(Text, {
+						bold: true,
+						children: "No MCP servers configured",
+					}),
+				}),
+				_jsx(Box, {
+					marginBottom: 1,
+					children: _jsx(Text, {
+						dimColor: true,
+						children: "Add one with: town mcp add",
+					}),
+				}),
+				_jsx(Box, {
+					children: _jsx(Text, {
+						dimColor: true,
+						children: "Press Enter or Q to exit",
+					}),
+				}),
+			],
+		});
+	}
+	return _jsxs(Box, {
+		flexDirection: "column",
+		children: [
+			_jsx(Box, {
+				marginBottom: 1,
+				children: _jsxs(Text, {
+					bold: true,
+					children: ["Configured MCP Servers (", result.configs.length, ")"],
+				}),
+			}),
+			result.configs.map((config, index) =>
+				_jsxs(
+					Box,
+					{
+						flexDirection: "column",
+						marginBottom: 1,
+						children: [
+							_jsx(Box, {
+								children: _jsxs(Text, {
+									bold: true,
+									color: "cyan",
+									children: [index + 1, ". ", config.name],
+								}),
+							}),
+							_jsx(Box, {
+								paddingLeft: 3,
+								children:
+									config.transport === "http"
+										? _jsxs(Box, {
+												flexDirection: "column",
+												children: [
+													_jsxs(Text, {
+														children: [
+															"Transport: ",
+															_jsx(Text, { color: "green", children: "HTTP" }),
+														],
+													}),
+													_jsxs(Text, { children: ["URL: ", config.url] }),
+												],
+											})
+										: _jsxs(Box, {
+												flexDirection: "column",
+												children: [
+													_jsxs(Text, {
+														children: [
+															"Transport: ",
+															_jsx(Text, { color: "blue", children: "stdio" }),
+														],
+													}),
+													_jsxs(Text, {
+														children: ["Command: ", config.command],
+													}),
+													config.args &&
+														config.args.length > 0 &&
+														_jsxs(Text, {
+															children: ["Args: ", config.args.join(" ")],
+														}),
+												],
+											}),
+							}),
+						],
+					},
+					config.name,
+				),
+			),
+			_jsx(Box, {
+				marginTop: 1,
+				children: _jsx(Text, {
+					dimColor: true,
+					children:
+						"Use `town mcp remove` to remove a server or `town mcp add` to add one",
+				}),
+			}),
+			_jsx(Box, {
+				marginTop: 1,
+				children: _jsx(Text, {
+					dimColor: true,
+					children: "Press Enter or Q to exit",
+				}),
+			}),
+		],
+	});
 }
 // ============================================================================
 // Export and Runner
 // ============================================================================
 export default MCPListApp;
 export async function runMCPList() {
-    const { waitUntilExit, clear } = render(_jsx(MCPListApp, {}));
-    try {
-        await waitUntilExit();
-    }
-    finally {
-        clear();
-        // Ensure cursor is visible
-        process.stdout.write("\x1B[?25h");
-    }
+	const { waitUntilExit, clear } = render(_jsx(MCPListApp, {}));
+	try {
+		await waitUntilExit();
+	} finally {
+		clear();
+		// Ensure cursor is visible
+		process.stdout.write("\x1B[?25h");
+	}
 }

package/dist/commands/run.js

@@ -1,10 +1,42 @@
+import { jsx as _jsx } from "react/jsx-runtime";
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { agentExists, getAgentPath } from "@townco/agent/storage";
+import { render } from "ink";
 import open from "open";
+import { useCallback, useMemo, useRef, useState } from "react";
+import { TabbedOutput } from "../components/TabbedOutput.js";
+import { findAvailablePort } from "../lib/port-utils.js";
+function GuiRunner({ agentProcess, guiProcess, agentPort, onExit, }) {
+    const [guiPort, setGuiPort] = useState(5173);
+    const browserOpenedRef = useRef(false);
+    const handlePortDetected = useCallback((processIndex, port) => {
+        // Process index 1 is the GUI process
+        if (processIndex === 1) {
+            setGuiPort(port);
+            // Open browser once we know the actual port
+            if (!browserOpenedRef.current) {
+                browserOpenedRef.current = true;
+                const guiUrl = `http://localhost:${port}`;
+                open(guiUrl).catch((error) => {
+                    // Silently fail - user can open manually
+                    console.warn(`Could not automatically open browser: ${error.message}`);
+                });
+            }
+        }
+    }, []);
+    // Memoize processes array based only on actual process objects and initial ports
+    // Don't include guiPort as dependency to prevent re-creating array when port is detected
+    // TabbedOutput will update the displayed port internally via onPortDetected callback
+    const processes = useMemo(() => [
+        { name: "Agent", process: agentProcess, port: agentPort },
+        { name: "GUI", process: guiProcess, port: guiPort },
+    ], [agentProcess, guiProcess, agentPort, guiPort]);
+    return (_jsx(TabbedOutput, { processes: processes, onExit: onExit, onPortDetected: handlePortDetected }));
+}
 async function loadEnvVars() {
     const envPath = join(homedir(), ".config", "town", ".env");
     const envVars = {};
@@ -42,7 +74,7 @@ export async function runCommand(options) {
     }
     const agentPath = getAgentPath(name);
     const binPath = join(agentPath, "bin.ts");
-    // If GUI or HTTP-only mode, run differently
+    // If GUI mode, run with tabbed interface
     if (gui) {
         const guiPath = join(agentPath, "gui");
         // Check if GUI exists
@@ -56,72 +88,58 @@ export async function runCommand(options) {
             console.log(`Recreate the agent with "town create" to include the GUI.`);
             process.exit(1);
         }
+        // Find an available port for the agent
+        const availablePort = await findAvailablePort(port);
+        if (availablePort !== port) {
+            console.log(`Port ${port} is in use, using port ${availablePort} instead`);
+        }
         console.log(`Starting agent "${name}" with GUI...`);
-        console.log(`Starting agent HTTP server on port ${port}...`);
-        console.log(`Starting GUI development server...\n`);
-        // Start the agent in HTTP mode first
+        console.log(`Agent HTTP server will run on port ${availablePort}`);
+        console.log(`GUI dev server will run on port 5173\n`);
+        // Set stdin to raw mode for Ink
+        if (process.stdin.isTTY) {
+            process.stdin.setRawMode(true);
+        }
+        // Start the agent in HTTP mode
         const agentProcess = spawn("bun", [binPath, "http"], {
             cwd: agentPath,
-            stdio: "pipe",
+            stdio: ["ignore", "pipe", "pipe"], // Pipe stdout/stderr for capture
             env: {
                 ...process.env,
                 ...configEnvVars,
                 NODE_ENV: process.env.NODE_ENV || "production",
-                PORT: port.toString(),
+                PORT: availablePort.toString(),
             },
         });
-        agentProcess.on("error", (error) => {
-            console.error(`Failed to start agent: ${error.message}`);
-            process.exit(1);
+        // Start the GUI dev server
+        const guiProcess = spawn("bun", ["run", "dev"], {
+            cwd: guiPath,
+            stdio: ["ignore", "pipe", "pipe"], // Pipe stdout/stderr for capture
+            env: {
+                ...process.env,
+                ...configEnvVars,
+                VITE_AGENT_URL: `http://localhost:${availablePort}`,
+            },
         });
-        // Wait a bit for agent to start, then start the GUI
-        setTimeout(() => {
-            // Start the GUI dev server
-            const guiProcess = spawn("bun", ["run", "dev"], {
-                cwd: guiPath,
-                stdio: "inherit",
-                env: {
-                    ...process.env,
-                    ...configEnvVars,
-                    VITE_AGENT_URL: `http://localhost:${port}`,
-                },
-            });
-            guiProcess.on("error", (error) => {
-                console.error(`Failed to start GUI: ${error.message}`);
-                agentProcess.kill();
-                process.exit(1);
-            });
-            guiProcess.on("close", (code) => {
+        // Render the tabbed UI with dynamic port detection
+        const { waitUntilExit } = render(_jsx(GuiRunner, { agentProcess: agentProcess, guiProcess: guiProcess, agentPort: availablePort, onExit: () => {
                 agentProcess.kill();
-                if (code !== 0 && code !== null) {
-                    console.error(`GUI exited with code ${code}`);
-                    process.exit(code);
-                }
-            });
-            // Open browser after GUI server has time to start (default Vite port is 5173)
-            setTimeout(() => {
-                const guiUrl = "http://localhost:5173";
-                console.log(`Opening browser at ${guiUrl}...`);
-                open(guiUrl).catch((error) => {
-                    console.warn(`Could not automatically open browser: ${error.message}`);
-                    console.log(`Please manually open: ${guiUrl}`);
-                });
-            }, 2000);
-        }, 1000);
-        agentProcess.on("close", (code) => {
-            if (code !== 0 && code !== null) {
-                console.error(`Agent exited with code ${code}`);
-                process.exit(code);
-            }
-        });
-        return;
+                guiProcess.kill();
+            } }));
+        await waitUntilExit();
+        process.exit(0);
     }
     else if (http) {
-        console.log(`Starting agent "${name}" in HTTP mode on port ${port}...`);
+        // Find an available port for the agent
+        const availablePort = await findAvailablePort(port);
+        if (availablePort !== port) {
+            console.log(`Port ${port} is in use, using port ${availablePort} instead\n`);
+        }
+        console.log(`Starting agent "${name}" in HTTP mode on port ${availablePort}...`);
         console.log(`\nEndpoints:`);
-        console.log(`  http://localhost:${port}/health - Health check`);
-        console.log(`  http://localhost:${port}/rpc - RPC endpoint`);
-        console.log(`  http://localhost:${port}/events - SSE event stream\n`);
+        console.log(`  http://localhost:${availablePort}/health - Health check`);
+        console.log(`  http://localhost:${availablePort}/rpc - RPC endpoint`);
+        console.log(`  http://localhost:${availablePort}/events - SSE event stream\n`);
         // Run the agent in HTTP mode
         const agentProcess = spawn("bun", [binPath, "http"], {
             cwd: agentPath,
@@ -130,7 +148,7 @@ export async function runCommand(options) {
                 ...process.env,
                 ...configEnvVars,
                 NODE_ENV: process.env.NODE_ENV || "production",
-                PORT: port.toString(),
+                PORT: availablePort.toString(),
             },
         });
         agentProcess.on("error", (error) => {