@solidxai/solidctl 0.1.28-beta.9 → 0.1.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/agent-helper.d.ts +0 -1
- package/dist/commands/agent-helper.js +0 -90
- package/dist/commands/agent-helper.js.map +1 -1
- package/dist/commands/agent.command.js +30 -369
- package/dist/commands/agent.command.js.map +1 -1
- package/dist/commands/create-app/create-app.command.js +8 -2
- package/dist/commands/create-app/create-app.command.js.map +1 -1
- package/dist/commands/create-app/setup-questions.d.ts +3 -7
- package/dist/commands/create-app/setup-questions.js +6 -3
- package/dist/commands/create-app/setup-questions.js.map +1 -1
- package/dist/commands/start.command.js +41 -135
- package/dist/commands/start.command.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -4,19 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ensureAgentInstalled = ensureAgentInstalled;
|
|
7
|
-
exports.ensureAgentUIInstalled = ensureAgentUIInstalled;
|
|
8
7
|
const child_process_1 = require("child_process");
|
|
9
8
|
const fs_1 = __importDefault(require("fs"));
|
|
10
9
|
const path_1 = __importDefault(require("path"));
|
|
11
10
|
const os_1 = __importDefault(require("os"));
|
|
12
11
|
const AGENT_PACKAGE = 'solidx-ai-agent';
|
|
13
|
-
const AGENT_UI_PACKAGE = '@solidxai/agent-ui';
|
|
14
12
|
const VENV_DIR = path_1.default.join(os_1.default.homedir(), '.solidx', 'venv');
|
|
15
13
|
const VENV_BIN = path_1.default.join(VENV_DIR, process.platform === 'win32' ? 'Scripts' : 'bin');
|
|
16
14
|
const VENV_AGENT_BIN = path_1.default.join(VENV_BIN, process.platform === 'win32' ? 'solidx-agent.exe' : 'solidx-agent');
|
|
17
|
-
const AGENT_UI_DIR = path_1.default.join(os_1.default.homedir(), '.solidx', 'agent-ui');
|
|
18
|
-
const AGENT_UI_PKG_DIR = path_1.default.join(AGENT_UI_DIR, 'node_modules', '@solidxai', 'agent-ui');
|
|
19
|
-
const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
20
15
|
function commandExists(cmd) {
|
|
21
16
|
const result = (0, child_process_1.spawnSync)(process.platform === 'win32' ? 'where' : 'which', [cmd], { stdio: 'pipe' });
|
|
22
17
|
return result.status === 0;
|
|
@@ -121,89 +116,4 @@ function ensureAgentInstalled() {
|
|
|
121
116
|
console.log(`✔ ${AGENT_PACKAGE} installed successfully`);
|
|
122
117
|
return VENV_AGENT_BIN;
|
|
123
118
|
}
|
|
124
|
-
const MIN_AGENT_UI_VERSION = '0.1.2';
|
|
125
|
-
function parseVersion(version) {
|
|
126
|
-
const match = version.replace(/^v/, '').match(/^(\d+)\.(\d+)\.(\d+)/);
|
|
127
|
-
if (!match)
|
|
128
|
-
return [0, 0, 0];
|
|
129
|
-
return [+match[1], +match[2], +match[3]];
|
|
130
|
-
}
|
|
131
|
-
function isVersionSatisfied(installedVersion, minVersion) {
|
|
132
|
-
const installed = parseVersion(installedVersion);
|
|
133
|
-
const min = parseVersion(minVersion);
|
|
134
|
-
for (let i = 0; i < 3; i++) {
|
|
135
|
-
if (installed[i] > min[i])
|
|
136
|
-
return true;
|
|
137
|
-
if (installed[i] < min[i])
|
|
138
|
-
return false;
|
|
139
|
-
}
|
|
140
|
-
return true;
|
|
141
|
-
}
|
|
142
|
-
function ensureAgentUIInstalled() {
|
|
143
|
-
const markerFile = path_1.default.join(AGENT_UI_DIR, 'node_modules', '.package-lock.json');
|
|
144
|
-
const packageJsonPath = path_1.default.join(AGENT_UI_DIR, 'package.json');
|
|
145
|
-
const installedAgentUiPkgJson = path_1.default.join(AGENT_UI_PKG_DIR, 'package.json');
|
|
146
|
-
const runnerPackageJson = {
|
|
147
|
-
name: 'solidx-agent-ui-runner',
|
|
148
|
-
private: true,
|
|
149
|
-
scripts: {
|
|
150
|
-
dev: 'vite --port 8768 --host --config ./node_modules/@solidxai/agent-ui/vite.config.ts',
|
|
151
|
-
},
|
|
152
|
-
};
|
|
153
|
-
let needsInstall = false;
|
|
154
|
-
if (!fs_1.default.existsSync(packageJsonPath)) {
|
|
155
|
-
needsInstall = true;
|
|
156
|
-
}
|
|
157
|
-
else {
|
|
158
|
-
try {
|
|
159
|
-
const existing = JSON.parse(fs_1.default.readFileSync(packageJsonPath, 'utf-8'));
|
|
160
|
-
if (JSON.stringify(existing.scripts) !== JSON.stringify(runnerPackageJson.scripts)) {
|
|
161
|
-
needsInstall = true;
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
catch {
|
|
165
|
-
needsInstall = true;
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
if (!needsInstall && fs_1.default.existsSync(installedAgentUiPkgJson)) {
|
|
169
|
-
try {
|
|
170
|
-
const installed = JSON.parse(fs_1.default.readFileSync(installedAgentUiPkgJson, 'utf-8'));
|
|
171
|
-
if (!isVersionSatisfied(installed.version || '0.0.0', MIN_AGENT_UI_VERSION)) {
|
|
172
|
-
console.log(`📦 ${AGENT_UI_PACKAGE} v${installed.version} is outdated (need >= ${MIN_AGENT_UI_VERSION}), updating...`);
|
|
173
|
-
needsInstall = true;
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
catch {
|
|
177
|
-
needsInstall = true;
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
if (!needsInstall && fs_1.default.existsSync(markerFile)) {
|
|
181
|
-
return AGENT_UI_DIR;
|
|
182
|
-
}
|
|
183
|
-
console.log(`📦 Installing ${AGENT_UI_PACKAGE}...`);
|
|
184
|
-
fs_1.default.mkdirSync(AGENT_UI_DIR, { recursive: true });
|
|
185
|
-
fs_1.default.writeFileSync(packageJsonPath, JSON.stringify(runnerPackageJson, null, 2));
|
|
186
|
-
const staleRunnerConfig = path_1.default.join(AGENT_UI_DIR, 'vite.config.ts');
|
|
187
|
-
if (fs_1.default.existsSync(staleRunnerConfig)) {
|
|
188
|
-
fs_1.default.unlinkSync(staleRunnerConfig);
|
|
189
|
-
}
|
|
190
|
-
const result = (0, child_process_1.spawnSync)(npmCommand, ['install', `${AGENT_UI_PACKAGE}@latest`], {
|
|
191
|
-
cwd: AGENT_UI_DIR,
|
|
192
|
-
stdio: 'inherit',
|
|
193
|
-
});
|
|
194
|
-
if (result.status !== 0) {
|
|
195
|
-
console.error(`❌ Failed to install ${AGENT_UI_PACKAGE}\n` +
|
|
196
|
-
' Try installing manually:\n' +
|
|
197
|
-
` cd ${AGENT_UI_DIR} && npm install ${AGENT_UI_PACKAGE}@latest`);
|
|
198
|
-
process.exit(1);
|
|
199
|
-
}
|
|
200
|
-
if (!fs_1.default.existsSync(AGENT_UI_PKG_DIR)) {
|
|
201
|
-
console.error(`❌ Package installed but not found at ${AGENT_UI_PKG_DIR}\n` +
|
|
202
|
-
' Try reinstalling:\n' +
|
|
203
|
-
` cd ${AGENT_UI_DIR} && npm install ${AGENT_UI_PACKAGE}@latest`);
|
|
204
|
-
process.exit(1);
|
|
205
|
-
}
|
|
206
|
-
console.log(`✔ ${AGENT_UI_PACKAGE} installed successfully`);
|
|
207
|
-
return AGENT_UI_DIR;
|
|
208
|
-
}
|
|
209
119
|
//# sourceMappingURL=agent-helper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-helper.js","sourceRoot":"","sources":["../../src/commands/agent-helper.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"agent-helper.js","sourceRoot":"","sources":["../../src/commands/agent-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.registerAgentCommand = registerAgentCommand;
|
|
7
7
|
const child_process_1 = require("child_process");
|
|
8
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
9
8
|
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const readline_1 = __importDefault(require("readline"));
|
|
11
9
|
const dotenv_1 = require("dotenv");
|
|
12
10
|
const helper_1 = require("../helper");
|
|
13
11
|
const agent_helper_1 = require("./agent-helper");
|
|
@@ -24,128 +22,24 @@ function resolveDatabaseUrl() {
|
|
|
24
22
|
}
|
|
25
23
|
return undefined;
|
|
26
24
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
constructor(projectRoot, agentCommand, agentUiDir, options) {
|
|
42
|
-
this.projectRoot = projectRoot;
|
|
43
|
-
this.agentCommand = agentCommand;
|
|
44
|
-
this.agentUiDir = agentUiDir;
|
|
45
|
-
this.agentPort = options.port;
|
|
46
|
-
this.agentHost = options.host;
|
|
47
|
-
this.agentLogLevel = options.logLevel;
|
|
48
|
-
this.isInteractive = Boolean(process.stdout.isTTY && process.stdin.isTTY && !options.plain);
|
|
49
|
-
this.npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
50
|
-
this.serviceConfigs = {
|
|
51
|
-
agent: {
|
|
52
|
-
cwd: projectRoot,
|
|
53
|
-
label: 'agent',
|
|
54
|
-
color: chalk_1.default.green,
|
|
55
|
-
},
|
|
56
|
-
ui: {
|
|
57
|
-
cwd: agentUiDir,
|
|
58
|
-
label: 'ui',
|
|
59
|
-
color: chalk_1.default.magenta,
|
|
60
|
-
},
|
|
61
|
-
};
|
|
62
|
-
this.serviceStates = {
|
|
63
|
-
agent: this.createInitialState(),
|
|
64
|
-
ui: this.createInitialState(),
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
async start() {
|
|
68
|
-
this.attachSignalHandlers();
|
|
69
|
-
this.attachKeyboardControls();
|
|
70
|
-
this.printStatus('Starting SolidX Agent processes');
|
|
71
|
-
this.spawnService('agent');
|
|
72
|
-
this.spawnService('ui');
|
|
73
|
-
this.renderFooter();
|
|
74
|
-
await new Promise((resolve) => {
|
|
75
|
-
const poll = setInterval(() => {
|
|
76
|
-
if (!this.hasRunningChildren()) {
|
|
77
|
-
clearInterval(poll);
|
|
78
|
-
this.cleanupTerminal();
|
|
79
|
-
resolve();
|
|
80
|
-
}
|
|
81
|
-
}, 100);
|
|
82
|
-
});
|
|
83
|
-
process.exit(this.exitCode);
|
|
84
|
-
}
|
|
85
|
-
createInitialState() {
|
|
86
|
-
return {
|
|
87
|
-
child: null,
|
|
88
|
-
restartRequested: false,
|
|
89
|
-
stoppingForShutdown: false,
|
|
90
|
-
outputBuffer: '',
|
|
91
|
-
};
|
|
92
|
-
}
|
|
93
|
-
spawnService(serviceName) {
|
|
94
|
-
const config = this.serviceConfigs[serviceName];
|
|
95
|
-
const state = this.serviceStates[serviceName];
|
|
96
|
-
state.restartRequested = false;
|
|
97
|
-
state.stoppingForShutdown = false;
|
|
98
|
-
let child;
|
|
99
|
-
if (serviceName === 'agent') {
|
|
100
|
-
child = (0, child_process_1.spawn)(this.agentCommand, ['serve', '--port', this.agentPort, '--host', this.agentHost, '--log-level', this.agentLogLevel], {
|
|
101
|
-
cwd: config.cwd,
|
|
102
|
-
env: this.getAgentEnv(),
|
|
103
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
104
|
-
shell: process.platform === 'win32',
|
|
105
|
-
});
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
child = (0, child_process_1.spawn)(this.npmCommand, ['run', 'dev'], {
|
|
109
|
-
cwd: config.cwd,
|
|
110
|
-
env: this.getUiEnv(),
|
|
111
|
-
stdio: ['ignore', 'pipe', 'pipe'],
|
|
112
|
-
shell: false,
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
|
-
state.child = child;
|
|
116
|
-
this.printStatus(`Started ${config.label}`);
|
|
117
|
-
child.stdout?.on('data', (chunk) => {
|
|
118
|
-
this.handleChunk(serviceName, String(chunk), false);
|
|
119
|
-
});
|
|
120
|
-
child.stderr?.on('data', (chunk) => {
|
|
121
|
-
this.handleChunk(serviceName, String(chunk), true);
|
|
122
|
-
});
|
|
123
|
-
child.on('error', (error) => {
|
|
124
|
-
this.printLog(serviceName, `Failed to start: ${error.message}`, true);
|
|
125
|
-
this.handleUnexpectedExit(serviceName, 1);
|
|
126
|
-
});
|
|
127
|
-
child.on('exit', (code, signal) => {
|
|
128
|
-
this.flushBuffer(serviceName);
|
|
129
|
-
state.child = null;
|
|
130
|
-
if (this.shuttingDown || state.stoppingForShutdown) {
|
|
131
|
-
this.printStatus(`${config.label} stopped`);
|
|
132
|
-
return;
|
|
133
|
-
}
|
|
134
|
-
if (state.restartRequested) {
|
|
135
|
-
this.printStatus(`Restarting ${config.label}`);
|
|
136
|
-
this.spawnService(serviceName);
|
|
137
|
-
return;
|
|
138
|
-
}
|
|
139
|
-
const reason = signal ? `signal ${signal}` : `code ${code ?? 0}`;
|
|
140
|
-
this.printLog(serviceName, `Exited unexpectedly with ${reason}`, true);
|
|
141
|
-
this.handleUnexpectedExit(serviceName, typeof code === 'number' ? code : 1);
|
|
142
|
-
});
|
|
143
|
-
}
|
|
144
|
-
getAgentEnv() {
|
|
25
|
+
function registerAgentCommand(program) {
|
|
26
|
+
const agent = program
|
|
27
|
+
.command('agent')
|
|
28
|
+
.description('SolidX AI Agent — start the server or run a single task');
|
|
29
|
+
agent
|
|
30
|
+
.command('start')
|
|
31
|
+
.description('Start the AI agent server')
|
|
32
|
+
.option('-p, --port <port>', 'Port number', '8765')
|
|
33
|
+
.option('-H, --host <host>', 'Host to bind', '0.0.0.0')
|
|
34
|
+
.option('-l, --log-level <level>', 'Logging level', 'INFO')
|
|
35
|
+
.action((options) => {
|
|
36
|
+
(0, helper_1.validateProjectRoot)();
|
|
37
|
+
const projectRoot = process.cwd();
|
|
38
|
+
(0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
|
|
145
39
|
const databaseUrl = resolveDatabaseUrl();
|
|
146
40
|
const env = {
|
|
147
41
|
...process.env,
|
|
148
|
-
SOLIDX_PROJECT_ROOT:
|
|
42
|
+
SOLIDX_PROJECT_ROOT: projectRoot,
|
|
149
43
|
...(databaseUrl ? { DATABASE_URL: databaseUrl } : {}),
|
|
150
44
|
...(process.env.BASE_URL ? { BASE_URL: process.env.BASE_URL } : {}),
|
|
151
45
|
...(process.env.APP_ENCRYPTION_KEY ? { APP_ENCRYPTION_KEY: process.env.APP_ENCRYPTION_KEY } : {}),
|
|
@@ -153,258 +47,25 @@ class AgentSupervisor {
|
|
|
153
47
|
const bridgedKeys = ['DATABASE_URL', 'SOLIDX_PROJECT_ROOT', 'BASE_URL', 'APP_ENCRYPTION_KEY'];
|
|
154
48
|
const bridged = bridgedKeys.filter((k) => env[k]);
|
|
155
49
|
const missing = bridgedKeys.filter((k) => !env[k]);
|
|
156
|
-
|
|
50
|
+
console.log(`✔ Bridged env: ${bridged.join(', ') || 'none'}`);
|
|
157
51
|
if (missing.length)
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
}
|
|
167
|
-
handleChunk(serviceName, chunk, isError) {
|
|
168
|
-
const state = this.serviceStates[serviceName];
|
|
169
|
-
state.outputBuffer += chunk;
|
|
170
|
-
const lines = state.outputBuffer.split(/\r?\n/);
|
|
171
|
-
state.outputBuffer = lines.pop() ?? '';
|
|
172
|
-
for (const line of lines) {
|
|
173
|
-
this.printLog(serviceName, line, isError);
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
flushBuffer(serviceName) {
|
|
177
|
-
const state = this.serviceStates[serviceName];
|
|
178
|
-
if (!state.outputBuffer) {
|
|
179
|
-
return;
|
|
180
|
-
}
|
|
181
|
-
this.printLog(serviceName, state.outputBuffer, false);
|
|
182
|
-
state.outputBuffer = '';
|
|
183
|
-
}
|
|
184
|
-
printLog(serviceName, message, isError) {
|
|
185
|
-
const config = this.serviceConfigs[serviceName];
|
|
186
|
-
const prefix = config.color(`[${config.label}]`);
|
|
187
|
-
const line = `${prefix} ${message}`;
|
|
188
|
-
this.writeWithFooter(line, isError ? process.stderr : process.stdout);
|
|
189
|
-
}
|
|
190
|
-
printStatus(message) {
|
|
191
|
-
this.writeWithFooter(chalk_1.default.dim(`[solidctl] ${message}`), process.stdout);
|
|
192
|
-
}
|
|
193
|
-
writeWithFooter(line, stream) {
|
|
194
|
-
if (!this.isInteractive) {
|
|
195
|
-
stream.write(`${line}\n`);
|
|
196
|
-
return;
|
|
197
|
-
}
|
|
198
|
-
readline_1.default.clearLine(process.stdout, 0);
|
|
199
|
-
readline_1.default.cursorTo(process.stdout, 0);
|
|
200
|
-
stream.write(`${line}\n`);
|
|
201
|
-
this.renderFooter();
|
|
202
|
-
}
|
|
203
|
-
renderFooter() {
|
|
204
|
-
if (!this.isInteractive) {
|
|
205
|
-
return;
|
|
206
|
-
}
|
|
207
|
-
const footer = [
|
|
208
|
-
chalk_1.default.bold('Controls'),
|
|
209
|
-
'q quit',
|
|
210
|
-
'c clear',
|
|
211
|
-
'r restart both',
|
|
212
|
-
'a restart Agent',
|
|
213
|
-
'u restart UI',
|
|
214
|
-
].join(chalk_1.default.dim(' | '));
|
|
215
|
-
const terminalWidth = process.stdout.columns || 80;
|
|
216
|
-
const renderedFooter = chalk_1.default.inverse(` ${footer} `);
|
|
217
|
-
const safeFooter = this.truncateAnsiText(renderedFooter, terminalWidth);
|
|
218
|
-
readline_1.default.clearLine(process.stdout, 0);
|
|
219
|
-
readline_1.default.cursorTo(process.stdout, 0);
|
|
220
|
-
process.stdout.write(safeFooter);
|
|
221
|
-
}
|
|
222
|
-
truncateAnsiText(text, maxWidth) {
|
|
223
|
-
if (maxWidth <= 0) {
|
|
224
|
-
return '';
|
|
225
|
-
}
|
|
226
|
-
let visibleWidth = 0;
|
|
227
|
-
let index = 0;
|
|
228
|
-
let output = '';
|
|
229
|
-
let lastEscapeIndex = -1;
|
|
230
|
-
while (index < text.length) {
|
|
231
|
-
if (text[index] === '\u001b') {
|
|
232
|
-
const match = /\u001b\[[0-9;]*m/.exec(text.slice(index));
|
|
233
|
-
if (!match) {
|
|
234
|
-
break;
|
|
235
|
-
}
|
|
236
|
-
output += match[0];
|
|
237
|
-
lastEscapeIndex = output.length;
|
|
238
|
-
index += match[0].length;
|
|
239
|
-
continue;
|
|
240
|
-
}
|
|
241
|
-
if (visibleWidth >= maxWidth) {
|
|
242
|
-
break;
|
|
243
|
-
}
|
|
244
|
-
output += text[index];
|
|
245
|
-
visibleWidth += 1;
|
|
246
|
-
index += 1;
|
|
247
|
-
}
|
|
248
|
-
if (index < text.length && maxWidth >= 1) {
|
|
249
|
-
let visibleChars = 0;
|
|
250
|
-
let truncated = '';
|
|
251
|
-
let cursor = 0;
|
|
252
|
-
while (cursor < output.length) {
|
|
253
|
-
if (output[cursor] === '\u001b') {
|
|
254
|
-
const match = /\u001b\[[0-9;]*m/.exec(output.slice(cursor));
|
|
255
|
-
if (!match) {
|
|
256
|
-
break;
|
|
257
|
-
}
|
|
258
|
-
truncated += match[0];
|
|
259
|
-
cursor += match[0].length;
|
|
260
|
-
continue;
|
|
261
|
-
}
|
|
262
|
-
if (visibleChars >= Math.max(0, maxWidth - 1)) {
|
|
263
|
-
break;
|
|
264
|
-
}
|
|
265
|
-
truncated += output[cursor];
|
|
266
|
-
visibleChars += 1;
|
|
267
|
-
cursor += 1;
|
|
268
|
-
}
|
|
269
|
-
output = `${truncated}\u2026`;
|
|
270
|
-
if (lastEscapeIndex !== -1 && !output.endsWith('\u001b[0m')) {
|
|
271
|
-
output += '\u001b[0m';
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
return output;
|
|
275
|
-
}
|
|
276
|
-
attachSignalHandlers() {
|
|
277
|
-
process.on('SIGINT', () => {
|
|
278
|
-
this.shutdown(0);
|
|
279
|
-
});
|
|
280
|
-
process.on('SIGTERM', () => {
|
|
281
|
-
this.shutdown(0);
|
|
282
|
-
});
|
|
283
|
-
}
|
|
284
|
-
attachKeyboardControls() {
|
|
285
|
-
if (!this.isInteractive) {
|
|
286
|
-
return;
|
|
287
|
-
}
|
|
288
|
-
readline_1.default.emitKeypressEvents(process.stdin);
|
|
289
|
-
this.stdinWasRaw = Boolean(process.stdin.isRaw);
|
|
290
|
-
process.stdin.setRawMode?.(true);
|
|
291
|
-
process.stdin.resume();
|
|
292
|
-
process.stdin.on('keypress', (_str, key) => {
|
|
293
|
-
if (key.ctrl && key.name === 'c') {
|
|
294
|
-
this.shutdown(0);
|
|
295
|
-
return;
|
|
296
|
-
}
|
|
297
|
-
switch (key.name) {
|
|
298
|
-
case 'a':
|
|
299
|
-
this.restartService('agent');
|
|
300
|
-
break;
|
|
301
|
-
case 'u':
|
|
302
|
-
this.restartService('ui');
|
|
303
|
-
break;
|
|
304
|
-
case 'r':
|
|
305
|
-
this.restartService('agent');
|
|
306
|
-
this.restartService('ui');
|
|
307
|
-
break;
|
|
308
|
-
case 'c':
|
|
309
|
-
console.clear();
|
|
310
|
-
this.renderFooter();
|
|
311
|
-
break;
|
|
312
|
-
case 'q':
|
|
313
|
-
this.shutdown(0);
|
|
314
|
-
break;
|
|
315
|
-
default:
|
|
316
|
-
break;
|
|
317
|
-
}
|
|
318
|
-
});
|
|
319
|
-
}
|
|
320
|
-
restartService(serviceName) {
|
|
321
|
-
const state = this.serviceStates[serviceName];
|
|
322
|
-
if (!state.child) {
|
|
323
|
-
this.printStatus(`${this.serviceConfigs[serviceName].label} is not running, starting it now`);
|
|
324
|
-
this.spawnService(serviceName);
|
|
325
|
-
this.renderFooter();
|
|
326
|
-
return;
|
|
327
|
-
}
|
|
328
|
-
state.restartRequested = true;
|
|
329
|
-
this.printStatus(`Stopping ${this.serviceConfigs[serviceName].label} for restart`);
|
|
330
|
-
this.stopChild(serviceName);
|
|
331
|
-
}
|
|
332
|
-
stopChild(serviceName) {
|
|
333
|
-
const state = this.serviceStates[serviceName];
|
|
334
|
-
if (!state.child) {
|
|
335
|
-
return;
|
|
336
|
-
}
|
|
337
|
-
state.child.kill('SIGTERM');
|
|
338
|
-
}
|
|
339
|
-
handleUnexpectedExit(serviceName, code) {
|
|
340
|
-
if (this.shuttingDown) {
|
|
341
|
-
return;
|
|
342
|
-
}
|
|
343
|
-
this.exitCode = code === 0 ? 1 : code;
|
|
344
|
-
this.shuttingDown = true;
|
|
345
|
-
for (const otherServiceName of Object.keys(this.serviceStates)) {
|
|
346
|
-
if (otherServiceName === serviceName) {
|
|
347
|
-
continue;
|
|
348
|
-
}
|
|
349
|
-
const otherState = this.serviceStates[otherServiceName];
|
|
350
|
-
if (otherState.child) {
|
|
351
|
-
otherState.stoppingForShutdown = true;
|
|
352
|
-
this.stopChild(otherServiceName);
|
|
353
|
-
}
|
|
354
|
-
}
|
|
355
|
-
this.renderFooter();
|
|
356
|
-
}
|
|
357
|
-
shutdown(code) {
|
|
358
|
-
if (this.shuttingDown) {
|
|
359
|
-
return;
|
|
360
|
-
}
|
|
361
|
-
this.exitCode = code;
|
|
362
|
-
this.shuttingDown = true;
|
|
363
|
-
this.printStatus('Shutting down');
|
|
364
|
-
for (const serviceName of Object.keys(this.serviceStates)) {
|
|
365
|
-
const state = this.serviceStates[serviceName];
|
|
366
|
-
state.stoppingForShutdown = true;
|
|
367
|
-
state.restartRequested = false;
|
|
368
|
-
this.stopChild(serviceName);
|
|
369
|
-
}
|
|
370
|
-
this.renderFooter();
|
|
371
|
-
}
|
|
372
|
-
hasRunningChildren() {
|
|
373
|
-
return Object.keys(this.serviceStates).some((serviceName) => {
|
|
374
|
-
return this.serviceStates[serviceName].child !== null;
|
|
52
|
+
console.warn(`⚠ Missing env: ${missing.join(', ')}`);
|
|
53
|
+
console.log(`▶ Starting SolidX AI Agent server on ${options.host}:${options.port}`);
|
|
54
|
+
const agentCommand = (0, agent_helper_1.ensureAgentInstalled)();
|
|
55
|
+
const result = (0, child_process_1.spawnSync)(agentCommand, ['serve', '--port', options.port, '--host', options.host, '--log-level', options.logLevel], {
|
|
56
|
+
cwd: projectRoot,
|
|
57
|
+
stdio: 'inherit',
|
|
58
|
+
env,
|
|
59
|
+
shell: process.platform === 'win32',
|
|
375
60
|
});
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
return;
|
|
61
|
+
if (result.error) {
|
|
62
|
+
console.error('❌ Failed to start agent server:', result.error.message);
|
|
63
|
+
process.exit(1);
|
|
380
64
|
}
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
process.stdin.setRawMode?.(false);
|
|
65
|
+
if (result.status !== 0) {
|
|
66
|
+
console.error('❌ Agent server exited with code', result.status);
|
|
67
|
+
process.exit(result.status ?? 1);
|
|
385
68
|
}
|
|
386
|
-
process.stdout.write('\n');
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
function registerAgentCommand(program) {
|
|
390
|
-
const agent = program
|
|
391
|
-
.command('agent')
|
|
392
|
-
.description('SolidX AI Agent — start the server or run a single task');
|
|
393
|
-
agent
|
|
394
|
-
.command('start')
|
|
395
|
-
.description('Start the AI agent server and chat UI in a single supervisor')
|
|
396
|
-
.option('-p, --port <port>', 'Agent backend port', '8765')
|
|
397
|
-
.option('-H, --host <host>', 'Host to bind', '0.0.0.0')
|
|
398
|
-
.option('-l, --log-level <level>', 'Logging level', 'INFO')
|
|
399
|
-
.option('--plain', 'Disable interactive controls and print merged logs only')
|
|
400
|
-
.action(async (options) => {
|
|
401
|
-
(0, helper_1.validateProjectRoot)();
|
|
402
|
-
const projectRoot = process.cwd();
|
|
403
|
-
(0, dotenv_1.config)({ path: path_1.default.join(projectRoot, 'solid-api', '.env') });
|
|
404
|
-
const agentCommand = (0, agent_helper_1.ensureAgentInstalled)();
|
|
405
|
-
const agentUiDir = (0, agent_helper_1.ensureAgentUIInstalled)();
|
|
406
|
-
const supervisor = new AgentSupervisor(projectRoot, agentCommand, agentUiDir, options);
|
|
407
|
-
await supervisor.start();
|
|
408
69
|
});
|
|
409
70
|
agent
|
|
410
71
|
.command('run')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.command.js","sourceRoot":"","sources":["../../src/commands/agent.command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"agent.command.js","sourceRoot":"","sources":["../../src/commands/agent.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,11 @@ function buildAnswersFromOptions(options) {
|
|
|
30
30
|
console.error(chalk_1.default.red(`Invalid --db-synchronize "${dbSynchronize}". Must be one of: ${setup_questions_1.SYNCHRONIZE_OPTIONS.join(', ')}`));
|
|
31
31
|
process.exit(1);
|
|
32
32
|
}
|
|
33
|
+
const dbExists = options.dbExists ?? setup_questions_1.SETUP_DEFAULTS.databaseExists;
|
|
34
|
+
if (options.dbExists !== undefined && !setup_questions_1.DATABASE_EXISTS_OPTIONS.includes(dbExists)) {
|
|
35
|
+
console.error(chalk_1.default.red(`Invalid --db-exists "${dbExists}". Must be one of: ${setup_questions_1.DATABASE_EXISTS_OPTIONS.join(', ')}`));
|
|
36
|
+
process.exit(1);
|
|
37
|
+
}
|
|
33
38
|
const dbPortDefault = dbClient === 'PostgreSQL'
|
|
34
39
|
? setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePortPostgres
|
|
35
40
|
: dbClient === 'MySQL'
|
|
@@ -51,7 +56,7 @@ function buildAnswersFromOptions(options) {
|
|
|
51
56
|
solidApiDatabaseUsername: options.dbUsername ?? setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseUsername,
|
|
52
57
|
solidApiDatabasePassword: options.dbPassword ?? setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePassword,
|
|
53
58
|
solidApiDatabaseSynchronize: dbSynchronize,
|
|
54
|
-
databaseExists:
|
|
59
|
+
databaseExists: dbExists,
|
|
55
60
|
solidUiPort: options.uiPort ?? setup_questions_1.SETUP_DEFAULTS.solidUiPort,
|
|
56
61
|
};
|
|
57
62
|
}
|
|
@@ -70,6 +75,7 @@ function registerCreateAppCommand(program) {
|
|
|
70
75
|
.option('--db-username <username>', `Database username (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseUsername})`)
|
|
71
76
|
.option('--db-password <password>', `Database password (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePassword})`)
|
|
72
77
|
.option('--db-synchronize <yes|no>', `Auto-sync DB schema: Yes or No (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseSynchronize})`)
|
|
78
|
+
.option('--db-exists <yes|no>', `Database already exists: Yes or No (default: ${setup_questions_1.SETUP_DEFAULTS.databaseExists})`)
|
|
73
79
|
.option('--ui-port <port>', `Frontend port (default: ${setup_questions_1.SETUP_DEFAULTS.solidUiPort})`)
|
|
74
80
|
.action(async (options) => {
|
|
75
81
|
try {
|
|
@@ -83,7 +89,7 @@ function registerCreateAppCommand(program) {
|
|
|
83
89
|
console.log(chalk_1.default.cyan("Hello, Let's setup your SolidX project!"));
|
|
84
90
|
answers = await inquirer_1.default.prompt(setup_questions_1.setupQuestions);
|
|
85
91
|
}
|
|
86
|
-
if (
|
|
92
|
+
if (answers.databaseExists === 'No') {
|
|
87
93
|
const dbSpinner = (0, ora_1.default)(`Creating database "${answers.solidApiDatabaseName}"...`).start();
|
|
88
94
|
try {
|
|
89
95
|
await (0, helpers_1.createDatabaseIfNotExists)(answers);
|