@solidxai/solidctl 0.1.27 → 0.1.28-beta.10

package/dist/commands/agent-helper.d.ts

@@ -0,0 +1,2 @@
+export declare function ensureAgentInstalled(): string;
+export declare function ensureAgentUIInstalled(): string;

package/dist/commands/agent-helper.js

@@ -0,0 +1,209 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAgentInstalled = ensureAgentInstalled;
+exports.ensureAgentUIInstalled = ensureAgentUIInstalled;
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const AGENT_PACKAGE = 'solidx-ai-agent';
+const AGENT_UI_PACKAGE = '@solidxai/agent-ui';
+const VENV_DIR = path_1.default.join(os_1.default.homedir(), '.solidx', 'venv');
+const VENV_BIN = path_1.default.join(VENV_DIR, process.platform === 'win32' ? 'Scripts' : 'bin');
+const VENV_AGENT_BIN = path_1.default.join(VENV_BIN, process.platform === 'win32' ? 'solidx-agent.exe' : 'solidx-agent');
+const AGENT_UI_DIR = path_1.default.join(os_1.default.homedir(), '.solidx', 'agent-ui');
+const AGENT_UI_PKG_DIR = path_1.default.join(AGENT_UI_DIR, 'node_modules', '@solidxai', 'agent-ui');
+const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+function commandExists(cmd) {
+    const result = (0, child_process_1.spawnSync)(process.platform === 'win32' ? 'where' : 'which', [cmd], { stdio: 'pipe' });
+    return result.status === 0;
+}
+function findAgentBinary() {
+    const pathBinary = process.platform === 'win32' ? 'solidx-agent.cmd' : 'solidx-agent';
+    if (commandExists(pathBinary)) {
+        return pathBinary;
+    }
+    if (fs_1.default.existsSync(VENV_AGENT_BIN)) {
+        return VENV_AGENT_BIN;
+    }
+    return null;
+}
+function findPython() {
+    for (const cmd of ['python3', 'python']) {
+        const result = (0, child_process_1.spawnSync)(cmd, ['--version'], { stdio: 'pipe' });
+        if (result.status === 0) {
+            const output = (result.stdout?.toString() || '') + (result.stderr?.toString() || '');
+            const match = output.match(/Python\s+(\d+)\.(\d+)/);
+            if (match && (+match[1] > 3 || (+match[1] === 3 && +match[2] >= 11))) {
+                return cmd;
+            }
+        }
+    }
+    return null;
+}
+function findUv() {
+    if (commandExists('uv')) {
+        return 'uv';
+    }
+    return null;
+}
+function ensureVenv(pythonCmd, uvCmd) {
+    if (fs_1.default.existsSync(path_1.default.join(VENV_DIR, 'pyvenv.cfg'))) {
+        return true;
+    }
+    fs_1.default.mkdirSync(path_1.default.dirname(VENV_DIR), { recursive: true });
+    console.log(`📦 Creating virtual environment at ${VENV_DIR}`);
+    if (uvCmd) {
+        const result = (0, child_process_1.spawnSync)(uvCmd, ['venv', VENV_DIR, '--python', pythonCmd], {
+            stdio: 'inherit',
+        });
+        if (result.status === 0)
+            return true;
+        console.warn('⚠ uv venv failed, falling back to python -m venv');
+    }
+    const result = (0, child_process_1.spawnSync)(pythonCmd, ['-m', 'venv', VENV_DIR], {
+        stdio: 'inherit',
+    });
+    return result.status === 0;
+}
+function installAgent(pythonCmd, uvCmd) {
+    const pipBin = path_1.default.join(VENV_BIN, process.platform === 'win32' ? 'pip.exe' : 'pip');
+    console.log(`📦 Installing ${AGENT_PACKAGE}...`);
+    if (uvCmd) {
+        const result = (0, child_process_1.spawnSync)(uvCmd, ['pip', 'install', AGENT_PACKAGE, '--python', pipBin], {
+            stdio: 'inherit',
+        });
+        if (result.status === 0)
+            return true;
+        console.warn('⚠ uv pip install failed, falling back to pip');
+    }
+    const result = (0, child_process_1.spawnSync)(pipBin, ['install', AGENT_PACKAGE], {
+        stdio: 'inherit',
+        shell: process.platform === 'win32',
+    });
+    return result.status === 0;
+}
+function ensureAgentInstalled() {
+    const existing = findAgentBinary();
+    if (existing) {
+        return existing;
+    }
+    console.log(`⚠ solidx-agent not found in PATH`);
+    const pythonCmd = findPython();
+    if (!pythonCmd) {
+        console.error('❌ Python 3.11+ is required but not found.\n' +
+            '   Install Python 3.11+ and try again, or manually run:\n' +
+            `   pip install ${AGENT_PACKAGE}`);
+        process.exit(1);
+    }
+    const uvCmd = findUv();
+    if (!ensureVenv(pythonCmd, uvCmd)) {
+        console.error('❌ Failed to create virtual environment at ' + VENV_DIR + '\n' +
+            '   Try creating it manually:\n' +
+            `   ${pythonCmd} -m venv ${VENV_DIR}`);
+        process.exit(1);
+    }
+    if (!installAgent(pythonCmd, uvCmd)) {
+        console.error('❌ Failed to install ' + AGENT_PACKAGE + '\n' +
+            '   Try installing manually:\n' +
+            `   ${VENV_BIN}/pip install ${AGENT_PACKAGE}`);
+        process.exit(1);
+    }
+    if (!fs_1.default.existsSync(VENV_AGENT_BIN)) {
+        console.error('❌ Package installed but solidx-agent binary not found at ' + VENV_AGENT_BIN + '\n' +
+            '   The package may not have installed correctly. Try:\n' +
+            `   ${VENV_BIN}/pip install --force-reinstall ${AGENT_PACKAGE}`);
+        process.exit(1);
+    }
+    console.log(`✔ ${AGENT_PACKAGE} installed successfully`);
+    return VENV_AGENT_BIN;
+}
+const MIN_AGENT_UI_VERSION = '0.1.2';
+function parseVersion(version) {
+    const match = version.replace(/^v/, '').match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (!match)
+        return [0, 0, 0];
+    return [+match[1], +match[2], +match[3]];
+}
+function isVersionSatisfied(installedVersion, minVersion) {
+    const installed = parseVersion(installedVersion);
+    const min = parseVersion(minVersion);
+    for (let i = 0; i < 3; i++) {
+        if (installed[i] > min[i])
+            return true;
+        if (installed[i] < min[i])
+            return false;
+    }
+    return true;
+}
+function ensureAgentUIInstalled() {
+    const markerFile = path_1.default.join(AGENT_UI_DIR, 'node_modules', '.package-lock.json');
+    const packageJsonPath = path_1.default.join(AGENT_UI_DIR, 'package.json');
+    const installedAgentUiPkgJson = path_1.default.join(AGENT_UI_PKG_DIR, 'package.json');
+    const runnerPackageJson = {
+        name: 'solidx-agent-ui-runner',
+        private: true,
+        scripts: {
+            dev: 'vite --port 8768 --host --config ./node_modules/@solidxai/agent-ui/vite.config.ts',
+        },
+    };
+    let needsInstall = false;
+    if (!fs_1.default.existsSync(packageJsonPath)) {
+        needsInstall = true;
+    }
+    else {
+        try {
+            const existing = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
+            if (JSON.stringify(existing.scripts) !== JSON.stringify(runnerPackageJson.scripts)) {
+                needsInstall = true;
+            }
+        }
+        catch {
+            needsInstall = true;
+        }
+    }
+    if (!needsInstall && fs_1.default.existsSync(installedAgentUiPkgJson)) {
+        try {
+            const installed = JSON.parse(fs_1.default.readFileSync(installedAgentUiPkgJson, 'utf-8'));
+            if (!isVersionSatisfied(installed.version || '0.0.0', MIN_AGENT_UI_VERSION)) {
+                console.log(`📦 ${AGENT_UI_PACKAGE} v${installed.version} is outdated (need >= ${MIN_AGENT_UI_VERSION}), updating...`);
+                needsInstall = true;
+            }
+        }
+        catch {
+            needsInstall = true;
+        }
+    }
+    if (!needsInstall && fs_1.default.existsSync(markerFile)) {
+        return AGENT_UI_DIR;
+    }
+    console.log(`📦 Installing ${AGENT_UI_PACKAGE}...`);
+    fs_1.default.mkdirSync(AGENT_UI_DIR, { recursive: true });
+    fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(runnerPackageJson, null, 2));
+    const staleRunnerConfig = path_1.default.join(AGENT_UI_DIR, 'vite.config.ts');
+    if (fs_1.default.existsSync(staleRunnerConfig)) {
+        fs_1.default.unlinkSync(staleRunnerConfig);
+    }
+    const result = (0, child_process_1.spawnSync)(npmCommand, ['install', `${AGENT_UI_PACKAGE}@latest`], {
+        cwd: AGENT_UI_DIR,
+        stdio: 'inherit',
+    });
+    if (result.status !== 0) {
+        console.error(`❌ Failed to install ${AGENT_UI_PACKAGE}\n` +
+            '   Try installing manually:\n' +
+            `   cd ${AGENT_UI_DIR} && npm install ${AGENT_UI_PACKAGE}@latest`);
+        process.exit(1);
+    }
+    if (!fs_1.default.existsSync(AGENT_UI_PKG_DIR)) {
+        console.error(`❌ Package installed but not found at ${AGENT_UI_PKG_DIR}\n` +
+            '   Try reinstalling:\n' +
+            `   cd ${AGENT_UI_DIR} && npm install ${AGENT_UI_PACKAGE}@latest`);
+        process.exit(1);
+    }
+    console.log(`✔ ${AGENT_UI_PACKAGE} installed successfully`);
+    return AGENT_UI_DIR;
+}
+//# sourceMappingURL=agent-helper.js.map

package/dist/commands/agent-helper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-helper.js","sourceRoot":"","sources":["../../src/commands/agent-helper.ts"],"names":[],"mappings":"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"}

package/dist/commands/agent.command.js

@@ -5,9 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerAgentCommand = registerAgentCommand;
 const child_process_1 = require("child_process");
+const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
+const readline_1 = __importDefault(require("readline"));
 const dotenv_1 = require("dotenv");
 const helper_1 = require("../helper");
+const agent_helper_1 = require("./agent-helper");
 function resolveDatabaseUrl() {
     if (process.env.DATABASE_URL)
         return process.env.DATABASE_URL;
@@ -21,24 +24,128 @@ function resolveDatabaseUrl() {
     }
     return undefined;
 }
-function registerAgentCommand(program) {
-    const agent = program
-        .command('agent')
-        .description('SolidX AI Agent — start the server or run a single task');
-    agent
-        .command('start')
-        .description('Start the AI agent server')
-        .option('-p, --port <port>', 'Port number', '8765')
-        .option('-H, --host <host>', 'Host to bind', '0.0.0.0')
-        .option('-l, --log-level <level>', 'Logging level', 'INFO')
-        .action((options) => {
-        (0, helper_1.validateProjectRoot)();
-        const projectRoot = process.cwd();
-        (0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
+class AgentSupervisor {
+    serviceConfigs;
+    serviceStates;
+    isInteractive;
+    npmCommand;
+    projectRoot;
+    agentCommand;
+    agentUiDir;
+    agentPort;
+    agentHost;
+    agentLogLevel;
+    shuttingDown = false;
+    exitCode = 0;
+    stdinWasRaw = false;
+    constructor(projectRoot, agentCommand, agentUiDir, options) {
+        this.projectRoot = projectRoot;
+        this.agentCommand = agentCommand;
+        this.agentUiDir = agentUiDir;
+        this.agentPort = options.port;
+        this.agentHost = options.host;
+        this.agentLogLevel = options.logLevel;
+        this.isInteractive = Boolean(process.stdout.isTTY && process.stdin.isTTY && !options.plain);
+        this.npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+        this.serviceConfigs = {
+            agent: {
+                cwd: projectRoot,
+                label: 'agent',
+                color: chalk_1.default.green,
+            },
+            ui: {
+                cwd: agentUiDir,
+                label: 'ui',
+                color: chalk_1.default.magenta,
+            },
+        };
+        this.serviceStates = {
+            agent: this.createInitialState(),
+            ui: this.createInitialState(),
+        };
+    }
+    async start() {
+        this.attachSignalHandlers();
+        this.attachKeyboardControls();
+        this.printStatus('Starting SolidX Agent processes');
+        this.spawnService('agent');
+        this.spawnService('ui');
+        this.renderFooter();
+        await new Promise((resolve) => {
+            const poll = setInterval(() => {
+                if (!this.hasRunningChildren()) {
+                    clearInterval(poll);
+                    this.cleanupTerminal();
+                    resolve();
+                }
+            }, 100);
+        });
+        process.exit(this.exitCode);
+    }
+    createInitialState() {
+        return {
+            child: null,
+            restartRequested: false,
+            stoppingForShutdown: false,
+            outputBuffer: '',
+        };
+    }
+    spawnService(serviceName) {
+        const config = this.serviceConfigs[serviceName];
+        const state = this.serviceStates[serviceName];
+        state.restartRequested = false;
+        state.stoppingForShutdown = false;
+        let child;
+        if (serviceName === 'agent') {
+            child = (0, child_process_1.spawn)(this.agentCommand, ['serve', '--port', this.agentPort, '--host', this.agentHost, '--log-level', this.agentLogLevel], {
+                cwd: config.cwd,
+                env: this.getAgentEnv(),
+                stdio: ['ignore', 'pipe', 'pipe'],
+                shell: process.platform === 'win32',
+            });
+        }
+        else {
+            child = (0, child_process_1.spawn)(this.npmCommand, ['run', 'dev'], {
+                cwd: config.cwd,
+                env: this.getUiEnv(),
+                stdio: ['ignore', 'pipe', 'pipe'],
+                shell: false,
+            });
+        }
+        state.child = child;
+        this.printStatus(`Started ${config.label}`);
+        child.stdout?.on('data', (chunk) => {
+            this.handleChunk(serviceName, String(chunk), false);
+        });
+        child.stderr?.on('data', (chunk) => {
+            this.handleChunk(serviceName, String(chunk), true);
+        });
+        child.on('error', (error) => {
+            this.printLog(serviceName, `Failed to start: ${error.message}`, true);
+            this.handleUnexpectedExit(serviceName, 1);
+        });
+        child.on('exit', (code, signal) => {
+            this.flushBuffer(serviceName);
+            state.child = null;
+            if (this.shuttingDown || state.stoppingForShutdown) {
+                this.printStatus(`${config.label} stopped`);
+                return;
+            }
+            if (state.restartRequested) {
+                this.printStatus(`Restarting ${config.label}`);
+                this.spawnService(serviceName);
+                return;
+            }
+            const reason = signal ? `signal ${signal}` : `code ${code ?? 0}`;
+            this.printLog(serviceName, `Exited unexpectedly with ${reason}`, true);
+            this.handleUnexpectedExit(serviceName, typeof code === 'number' ? code : 1);
+        });
+    }
+    getAgentEnv() {
         const databaseUrl = resolveDatabaseUrl();
         const env = {
             ...process.env,
-            SOLIDX_PROJECT_ROOT: projectRoot,
+            SOLIDX_PROJECT_ROOT: this.projectRoot,
             ...(databaseUrl ? { DATABASE_URL: databaseUrl } : {}),
             ...(process.env.BASE_URL ? { BASE_URL: process.env.BASE_URL } : {}),
             ...(process.env.APP_ENCRYPTION_KEY ? { APP_ENCRYPTION_KEY: process.env.APP_ENCRYPTION_KEY } : {}),
@@ -46,25 +153,258 @@ function registerAgentCommand(program) {
         const bridgedKeys = ['DATABASE_URL', 'SOLIDX_PROJECT_ROOT', 'BASE_URL', 'APP_ENCRYPTION_KEY'];
         const bridged = bridgedKeys.filter((k) => env[k]);
         const missing = bridgedKeys.filter((k) => !env[k]);
-        console.log(`✔ Bridged env: ${bridged.join(', ') || 'none'}`);
+        this.printStatus(`Agent bridged env: ${bridged.join(', ') || 'none'}`);
         if (missing.length)
-            console.warn(`⚠ Missing env: ${missing.join(', ')}`);
-        console.log(`▶ Starting SolidX AI Agent server on ${options.host}:${options.port}`);
-        const agentCommand = process.platform === 'win32' ? 'solidx-agent.cmd' : 'solidx-agent';
-        const result = (0, child_process_1.spawnSync)(agentCommand, ['serve', '--port', options.port, '--host', options.host, '--log-level', options.logLevel], {
-            cwd: projectRoot,
-            stdio: 'inherit',
-            env,
-            shell: process.platform === 'win32',
+            this.printStatus(`Agent missing env: ${missing.join(', ')}`);
+        return env;
+    }
+    getUiEnv() {
+        return {
+            ...process.env,
+            SOLIDX_AGENT_URL: `http://localhost:${this.agentPort}`,
+        };
+    }
+    handleChunk(serviceName, chunk, isError) {
+        const state = this.serviceStates[serviceName];
+        state.outputBuffer += chunk;
+        const lines = state.outputBuffer.split(/\r?\n/);
+        state.outputBuffer = lines.pop() ?? '';
+        for (const line of lines) {
+            this.printLog(serviceName, line, isError);
+        }
+    }
+    flushBuffer(serviceName) {
+        const state = this.serviceStates[serviceName];
+        if (!state.outputBuffer) {
+            return;
+        }
+        this.printLog(serviceName, state.outputBuffer, false);
+        state.outputBuffer = '';
+    }
+    printLog(serviceName, message, isError) {
+        const config = this.serviceConfigs[serviceName];
+        const prefix = config.color(`[${config.label}]`);
+        const line = `${prefix} ${message}`;
+        this.writeWithFooter(line, isError ? process.stderr : process.stdout);
+    }
+    printStatus(message) {
+        this.writeWithFooter(chalk_1.default.dim(`[solidctl] ${message}`), process.stdout);
+    }
+    writeWithFooter(line, stream) {
+        if (!this.isInteractive) {
+            stream.write(`${line}\n`);
+            return;
+        }
+        readline_1.default.clearLine(process.stdout, 0);
+        readline_1.default.cursorTo(process.stdout, 0);
+        stream.write(`${line}\n`);
+        this.renderFooter();
+    }
+    renderFooter() {
+        if (!this.isInteractive) {
+            return;
+        }
+        const footer = [
+            chalk_1.default.bold('Controls'),
+            'q quit',
+            'c clear',
+            'r restart both',
+            'a restart Agent',
+            'u restart UI',
+        ].join(chalk_1.default.dim(' | '));
+        const terminalWidth = process.stdout.columns || 80;
+        const renderedFooter = chalk_1.default.inverse(` ${footer} `);
+        const safeFooter = this.truncateAnsiText(renderedFooter, terminalWidth);
+        readline_1.default.clearLine(process.stdout, 0);
+        readline_1.default.cursorTo(process.stdout, 0);
+        process.stdout.write(safeFooter);
+    }
+    truncateAnsiText(text, maxWidth) {
+        if (maxWidth <= 0) {
+            return '';
+        }
+        let visibleWidth = 0;
+        let index = 0;
+        let output = '';
+        let lastEscapeIndex = -1;
+        while (index < text.length) {
+            if (text[index] === '\u001b') {
+                const match = /\u001b\[[0-9;]*m/.exec(text.slice(index));
+                if (!match) {
+                    break;
+                }
+                output += match[0];
+                lastEscapeIndex = output.length;
+                index += match[0].length;
+                continue;
+            }
+            if (visibleWidth >= maxWidth) {
+                break;
+            }
+            output += text[index];
+            visibleWidth += 1;
+            index += 1;
+        }
+        if (index < text.length && maxWidth >= 1) {
+            let visibleChars = 0;
+            let truncated = '';
+            let cursor = 0;
+            while (cursor < output.length) {
+                if (output[cursor] === '\u001b') {
+                    const match = /\u001b\[[0-9;]*m/.exec(output.slice(cursor));
+                    if (!match) {
+                        break;
+                    }
+                    truncated += match[0];
+                    cursor += match[0].length;
+                    continue;
+                }
+                if (visibleChars >= Math.max(0, maxWidth - 1)) {
+                    break;
+                }
+                truncated += output[cursor];
+                visibleChars += 1;
+                cursor += 1;
+            }
+            output = `${truncated}\u2026`;
+            if (lastEscapeIndex !== -1 && !output.endsWith('\u001b[0m')) {
+                output += '\u001b[0m';
+            }
+        }
+        return output;
+    }
+    attachSignalHandlers() {
+        process.on('SIGINT', () => {
+            this.shutdown(0);
         });
-        if (result.error) {
-            console.error('❌ Failed to start agent server:', result.error.message);
-            process.exit(1);
+        process.on('SIGTERM', () => {
+            this.shutdown(0);
+        });
+    }
+    attachKeyboardControls() {
+        if (!this.isInteractive) {
+            return;
         }
-        if (result.status !== 0) {
-            console.error('❌ Agent server exited with code', result.status);
-            process.exit(result.status ?? 1);
+        readline_1.default.emitKeypressEvents(process.stdin);
+        this.stdinWasRaw = Boolean(process.stdin.isRaw);
+        process.stdin.setRawMode?.(true);
+        process.stdin.resume();
+        process.stdin.on('keypress', (_str, key) => {
+            if (key.ctrl && key.name === 'c') {
+                this.shutdown(0);
+                return;
+            }
+            switch (key.name) {
+                case 'a':
+                    this.restartService('agent');
+                    break;
+                case 'u':
+                    this.restartService('ui');
+                    break;
+                case 'r':
+                    this.restartService('agent');
+                    this.restartService('ui');
+                    break;
+                case 'c':
+                    console.clear();
+                    this.renderFooter();
+                    break;
+                case 'q':
+                    this.shutdown(0);
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+    restartService(serviceName) {
+        const state = this.serviceStates[serviceName];
+        if (!state.child) {
+            this.printStatus(`${this.serviceConfigs[serviceName].label} is not running, starting it now`);
+            this.spawnService(serviceName);
+            this.renderFooter();
+            return;
+        }
+        state.restartRequested = true;
+        this.printStatus(`Stopping ${this.serviceConfigs[serviceName].label} for restart`);
+        this.stopChild(serviceName);
+    }
+    stopChild(serviceName) {
+        const state = this.serviceStates[serviceName];
+        if (!state.child) {
+            return;
+        }
+        state.child.kill('SIGTERM');
+    }
+    handleUnexpectedExit(serviceName, code) {
+        if (this.shuttingDown) {
+            return;
+        }
+        this.exitCode = code === 0 ? 1 : code;
+        this.shuttingDown = true;
+        for (const otherServiceName of Object.keys(this.serviceStates)) {
+            if (otherServiceName === serviceName) {
+                continue;
+            }
+            const otherState = this.serviceStates[otherServiceName];
+            if (otherState.child) {
+                otherState.stoppingForShutdown = true;
+                this.stopChild(otherServiceName);
+            }
         }
+        this.renderFooter();
+    }
+    shutdown(code) {
+        if (this.shuttingDown) {
+            return;
+        }
+        this.exitCode = code;
+        this.shuttingDown = true;
+        this.printStatus('Shutting down');
+        for (const serviceName of Object.keys(this.serviceStates)) {
+            const state = this.serviceStates[serviceName];
+            state.stoppingForShutdown = true;
+            state.restartRequested = false;
+            this.stopChild(serviceName);
+        }
+        this.renderFooter();
+    }
+    hasRunningChildren() {
+        return Object.keys(this.serviceStates).some((serviceName) => {
+            return this.serviceStates[serviceName].child !== null;
+        });
+    }
+    cleanupTerminal() {
+        if (!this.isInteractive) {
+            return;
+        }
+        readline_1.default.clearLine(process.stdout, 0);
+        readline_1.default.cursorTo(process.stdout, 0);
+        if (!this.stdinWasRaw) {
+            process.stdin.setRawMode?.(false);
+        }
+        process.stdout.write('\n');
+    }
+}
+function registerAgentCommand(program) {
+    const agent = program
+        .command('agent')
+        .description('SolidX AI Agent — start the server or run a single task');
+    agent
+        .command('start')
+        .description('Start the AI agent server and chat UI in a single supervisor')
+        .option('-p, --port <port>', 'Agent backend port', '8765')
+        .option('-H, --host <host>', 'Host to bind', '0.0.0.0')
+        .option('-l, --log-level <level>', 'Logging level', 'INFO')
+        .option('--plain', 'Disable interactive controls and print merged logs only')
+        .action(async (options) => {
+        (0, helper_1.validateProjectRoot)();
+        const projectRoot = process.cwd();
+        (0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
+        const agentCommand = (0, agent_helper_1.ensureAgentInstalled)();
+        const agentUiDir = (0, agent_helper_1.ensureAgentUIInstalled)();
+        const supervisor = new AgentSupervisor(projectRoot, agentCommand, agentUiDir, options);
+        await supervisor.start();
     });
     agent
         .command('run')
@@ -96,7 +436,7 @@ function registerAgentCommand(program) {
         if (missing.length)
             console.warn(`⚠ Missing env: ${missing.join(', ')}`);
         console.log(`▶ Running SolidX AI Agent: ${task}`);
-        const agentCommand = process.platform === 'win32' ? 'solidx-agent.cmd' : 'solidx-agent';
+        const agentCommand = (0, agent_helper_1.ensureAgentInstalled)();
         const result = (0, child_process_1.spawnSync)(agentCommand, args, {
             cwd: projectRoot,
             stdio: 'inherit',