@appkit/llamacpp-cli 1.5.0 → 1.7.0
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/CHANGELOG.md +20 -0
- package/MONITORING-ACCURACY-FIX.md +199 -0
- package/PER-PROCESS-METRICS.md +190 -0
- package/README.md +124 -9
- package/dist/cli.js +32 -7
- package/dist/cli.js.map +1 -1
- package/dist/commands/config.d.ts.map +1 -1
- package/dist/commands/config.js +15 -1
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +12 -4
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/delete.js +12 -10
- package/dist/commands/delete.js.map +1 -1
- package/dist/commands/logs-all.d.ts +9 -0
- package/dist/commands/logs-all.d.ts.map +1 -0
- package/dist/commands/logs-all.js +209 -0
- package/dist/commands/logs-all.js.map +1 -0
- package/dist/commands/logs.d.ts +4 -0
- package/dist/commands/logs.d.ts.map +1 -1
- package/dist/commands/logs.js +108 -2
- package/dist/commands/logs.js.map +1 -1
- package/dist/commands/monitor.d.ts.map +1 -1
- package/dist/commands/monitor.js +51 -1
- package/dist/commands/monitor.js.map +1 -1
- package/dist/commands/ps.d.ts +3 -1
- package/dist/commands/ps.d.ts.map +1 -1
- package/dist/commands/ps.js +75 -5
- package/dist/commands/ps.js.map +1 -1
- package/dist/commands/rm.d.ts.map +1 -1
- package/dist/commands/rm.js +5 -12
- package/dist/commands/rm.js.map +1 -1
- package/dist/commands/server-show.d.ts.map +1 -1
- package/dist/commands/server-show.js +30 -3
- package/dist/commands/server-show.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +34 -7
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/stop.js +3 -3
- package/dist/commands/stop.js.map +1 -1
- package/dist/lib/history-manager.d.ts +46 -0
- package/dist/lib/history-manager.d.ts.map +1 -0
- package/dist/lib/history-manager.js +157 -0
- package/dist/lib/history-manager.js.map +1 -0
- package/dist/lib/metrics-aggregator.d.ts +2 -1
- package/dist/lib/metrics-aggregator.d.ts.map +1 -1
- package/dist/lib/metrics-aggregator.js +15 -4
- package/dist/lib/metrics-aggregator.js.map +1 -1
- package/dist/lib/system-collector.d.ts +9 -4
- package/dist/lib/system-collector.d.ts.map +1 -1
- package/dist/lib/system-collector.js +29 -28
- package/dist/lib/system-collector.js.map +1 -1
- package/dist/tui/HistoricalMonitorApp.d.ts +5 -0
- package/dist/tui/HistoricalMonitorApp.d.ts.map +1 -0
- package/dist/tui/HistoricalMonitorApp.js +490 -0
- package/dist/tui/HistoricalMonitorApp.js.map +1 -0
- package/dist/tui/MonitorApp.d.ts.map +1 -1
- package/dist/tui/MonitorApp.js +84 -62
- package/dist/tui/MonitorApp.js.map +1 -1
- package/dist/tui/MultiServerMonitorApp.d.ts +1 -1
- package/dist/tui/MultiServerMonitorApp.d.ts.map +1 -1
- package/dist/tui/MultiServerMonitorApp.js +293 -77
- package/dist/tui/MultiServerMonitorApp.js.map +1 -1
- package/dist/types/history-types.d.ts +30 -0
- package/dist/types/history-types.d.ts.map +1 -0
- package/dist/types/history-types.js +11 -0
- package/dist/types/history-types.js.map +1 -0
- package/dist/types/monitor-types.d.ts +1 -0
- package/dist/types/monitor-types.d.ts.map +1 -1
- package/dist/types/server-config.d.ts +1 -0
- package/dist/types/server-config.d.ts.map +1 -1
- package/dist/types/server-config.js.map +1 -1
- package/dist/utils/downsample-utils.d.ts +35 -0
- package/dist/utils/downsample-utils.d.ts.map +1 -0
- package/dist/utils/downsample-utils.js +107 -0
- package/dist/utils/downsample-utils.js.map +1 -0
- package/dist/utils/file-utils.d.ts +6 -0
- package/dist/utils/file-utils.d.ts.map +1 -1
- package/dist/utils/file-utils.js +38 -0
- package/dist/utils/file-utils.js.map +1 -1
- package/dist/utils/log-utils.d.ts +43 -0
- package/dist/utils/log-utils.d.ts.map +1 -0
- package/dist/utils/log-utils.js +190 -0
- package/dist/utils/log-utils.js.map +1 -0
- package/dist/utils/process-utils.d.ts +19 -1
- package/dist/utils/process-utils.d.ts.map +1 -1
- package/dist/utils/process-utils.js +79 -1
- package/dist/utils/process-utils.js.map +1 -1
- package/docs/images/.gitkeep +1 -0
- package/package.json +3 -1
- package/src/cli.ts +32 -7
- package/src/commands/config.ts +15 -1
- package/src/commands/create.ts +14 -5
- package/src/commands/delete.ts +10 -10
- package/src/commands/logs-all.ts +251 -0
- package/src/commands/logs.ts +138 -2
- package/src/commands/monitor.ts +21 -1
- package/src/commands/ps.ts +88 -5
- package/src/commands/rm.ts +5 -12
- package/src/commands/server-show.ts +35 -3
- package/src/commands/start.ts +35 -7
- package/src/commands/stop.ts +3 -3
- package/src/lib/history-manager.ts +172 -0
- package/src/lib/metrics-aggregator.ts +18 -5
- package/src/lib/system-collector.ts +31 -28
- package/src/tui/HistoricalMonitorApp.ts +548 -0
- package/src/tui/MonitorApp.ts +89 -64
- package/src/tui/MultiServerMonitorApp.ts +348 -103
- package/src/types/history-types.ts +39 -0
- package/src/types/monitor-types.ts +1 -0
- package/src/types/server-config.ts +1 -0
- package/src/utils/downsample-utils.ts +128 -0
- package/src/utils/file-utils.ts +40 -0
- package/src/utils/log-utils.ts +178 -0
- package/src/utils/process-utils.ts +85 -1
- package/test-load.sh +100 -0
- package/dist/tui/components/ErrorState.d.ts +0 -8
- package/dist/tui/components/ErrorState.d.ts.map +0 -1
- package/dist/tui/components/ErrorState.js +0 -22
- package/dist/tui/components/ErrorState.js.map +0 -1
- package/dist/tui/components/LoadingState.d.ts +0 -8
- package/dist/tui/components/LoadingState.d.ts.map +0 -1
- package/dist/tui/components/LoadingState.js +0 -21
- package/dist/tui/components/LoadingState.js.map +0 -1
package/dist/commands/logs.js
CHANGED
|
@@ -44,6 +44,7 @@ const state_manager_1 = require("../lib/state-manager");
|
|
|
44
44
|
const file_utils_1 = require("../utils/file-utils");
|
|
45
45
|
const process_utils_1 = require("../utils/process-utils");
|
|
46
46
|
const log_parser_1 = require("../utils/log-parser");
|
|
47
|
+
const log_utils_1 = require("../utils/log-utils");
|
|
47
48
|
async function logsCommand(identifier, options) {
|
|
48
49
|
// Find server
|
|
49
50
|
const server = await state_manager_1.stateManager.findServer(identifier);
|
|
@@ -53,6 +54,82 @@ async function logsCommand(identifier, options) {
|
|
|
53
54
|
// Determine log file (default to stderr where verbose logs go)
|
|
54
55
|
const logPath = options.stdout ? server.stdoutPath : server.stderrPath;
|
|
55
56
|
const logType = options.stdout ? 'stdout' : 'stderr';
|
|
57
|
+
// Handle --clear-archived option (deletes only archived logs)
|
|
58
|
+
if (options.clearArchived) {
|
|
59
|
+
const archivedInfo = await (0, log_utils_1.deleteArchivedLogs)(server.id);
|
|
60
|
+
if (archivedInfo.count === 0) {
|
|
61
|
+
console.log(chalk_1.default.yellow(`⚠️ No archived logs found for ${server.modelName}`));
|
|
62
|
+
console.log(chalk_1.default.dim(` Archived logs are created via --rotate or automatic rotation`));
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
console.log(chalk_1.default.green(`✅ Deleted archived logs for ${server.modelName}`));
|
|
66
|
+
console.log(chalk_1.default.dim(` Files deleted: ${archivedInfo.count}`));
|
|
67
|
+
console.log(chalk_1.default.dim(` Space freed: ${(0, log_utils_1.formatFileSize)(archivedInfo.totalSize)}`));
|
|
68
|
+
console.log(chalk_1.default.dim(` Current logs preserved`));
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
// Handle --clear-all option (clears both current and archived logs)
|
|
72
|
+
if (options.clearAll) {
|
|
73
|
+
let totalFreed = 0;
|
|
74
|
+
let currentSize = 0;
|
|
75
|
+
let archivedSize = 0;
|
|
76
|
+
// Clear current stderr
|
|
77
|
+
if (await (0, file_utils_1.fileExists)(server.stderrPath)) {
|
|
78
|
+
currentSize += await (0, log_utils_1.getFileSize)(server.stderrPath);
|
|
79
|
+
await (0, log_utils_1.clearLogFile)(server.stderrPath);
|
|
80
|
+
}
|
|
81
|
+
// Clear current stdout
|
|
82
|
+
if (await (0, file_utils_1.fileExists)(server.stdoutPath)) {
|
|
83
|
+
currentSize += await (0, log_utils_1.getFileSize)(server.stdoutPath);
|
|
84
|
+
await (0, log_utils_1.clearLogFile)(server.stdoutPath);
|
|
85
|
+
}
|
|
86
|
+
// Delete all archived logs
|
|
87
|
+
const archivedInfo = await (0, log_utils_1.deleteArchivedLogs)(server.id);
|
|
88
|
+
archivedSize = archivedInfo.totalSize;
|
|
89
|
+
totalFreed = currentSize + archivedSize;
|
|
90
|
+
console.log(chalk_1.default.green(`✅ Cleared all logs for ${server.modelName}`));
|
|
91
|
+
if (currentSize > 0) {
|
|
92
|
+
console.log(chalk_1.default.dim(` Current logs: ${(0, log_utils_1.formatFileSize)(currentSize)}`));
|
|
93
|
+
}
|
|
94
|
+
if (archivedSize > 0) {
|
|
95
|
+
console.log(chalk_1.default.dim(` Archived logs: ${(0, log_utils_1.formatFileSize)(archivedSize)} (${archivedInfo.count} file${archivedInfo.count > 1 ? 's' : ''})`));
|
|
96
|
+
}
|
|
97
|
+
console.log(chalk_1.default.dim(` Total freed: ${(0, log_utils_1.formatFileSize)(totalFreed)}`));
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
// Handle --clear option
|
|
101
|
+
if (options.clear) {
|
|
102
|
+
if (!(await (0, file_utils_1.fileExists)(logPath))) {
|
|
103
|
+
console.log(chalk_1.default.yellow(`⚠️ No ${logType} found for ${server.modelName}`));
|
|
104
|
+
console.log(chalk_1.default.dim(` Log file does not exist: ${logPath}`));
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const sizeBefore = await (0, log_utils_1.getFileSize)(logPath);
|
|
108
|
+
await (0, log_utils_1.clearLogFile)(logPath);
|
|
109
|
+
console.log(chalk_1.default.green(`✅ Cleared ${logType} for ${server.modelName}`));
|
|
110
|
+
console.log(chalk_1.default.dim(` Freed: ${(0, log_utils_1.formatFileSize)(sizeBefore)}`));
|
|
111
|
+
console.log(chalk_1.default.dim(` ${logPath}`));
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
// Handle --rotate option
|
|
115
|
+
if (options.rotate) {
|
|
116
|
+
if (!(await (0, file_utils_1.fileExists)(logPath))) {
|
|
117
|
+
console.log(chalk_1.default.yellow(`⚠️ No ${logType} found for ${server.modelName}`));
|
|
118
|
+
console.log(chalk_1.default.dim(` Log file does not exist: ${logPath}`));
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
try {
|
|
122
|
+
const archivedPath = await (0, log_utils_1.rotateLogFile)(logPath);
|
|
123
|
+
const size = await (0, log_utils_1.getFileSize)(archivedPath);
|
|
124
|
+
console.log(chalk_1.default.green(`✅ Rotated ${logType} for ${server.modelName}`));
|
|
125
|
+
console.log(chalk_1.default.dim(` Archived: ${(0, log_utils_1.formatFileSize)(size)}`));
|
|
126
|
+
console.log(chalk_1.default.dim(` → ${archivedPath}`));
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
throw new Error(`Failed to rotate log: ${error.message}`);
|
|
130
|
+
}
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
56
133
|
// Check if log file exists
|
|
57
134
|
if (!(await (0, file_utils_1.fileExists)(logPath))) {
|
|
58
135
|
console.log(chalk_1.default.yellow(`⚠️ No ${logType} found for ${server.modelName}`));
|
|
@@ -90,6 +167,15 @@ async function logsCommand(identifier, options) {
|
|
|
90
167
|
}
|
|
91
168
|
console.log(chalk_1.default.blue(`📋 Logs for ${server.modelName} (${logType}${filterDesc})`));
|
|
92
169
|
console.log(chalk_1.default.dim(` ${logPath}`));
|
|
170
|
+
// Show log size information
|
|
171
|
+
const currentSize = await (0, log_utils_1.getFileSize)(logPath);
|
|
172
|
+
const archivedInfo = await (0, log_utils_1.getArchivedLogInfo)(server.id);
|
|
173
|
+
if (archivedInfo.count > 0) {
|
|
174
|
+
console.log(chalk_1.default.dim(` Current: ${(0, log_utils_1.formatFileSize)(currentSize)} | Archived: ${(0, log_utils_1.formatFileSize)(archivedInfo.totalSize)} (${archivedInfo.count} file${archivedInfo.count > 1 ? 's' : ''})`));
|
|
175
|
+
}
|
|
176
|
+
else {
|
|
177
|
+
console.log(chalk_1.default.dim(` Current: ${(0, log_utils_1.formatFileSize)(currentSize)}`));
|
|
178
|
+
}
|
|
93
179
|
// Show subtle note if verbose logging is not enabled
|
|
94
180
|
if (!server.verbose && !options.verbose && !options.errors && !options.http && !options.filter) {
|
|
95
181
|
console.log(chalk_1.default.dim(` verbosity is disabled`));
|
|
@@ -159,9 +245,16 @@ async function logsCommand(identifier, options) {
|
|
|
159
245
|
// Compact mode: read file and parse
|
|
160
246
|
try {
|
|
161
247
|
// Use large multiplier to account for verbose debug output between requests
|
|
162
|
-
|
|
248
|
+
// Add || true to prevent grep from failing when no matches found
|
|
249
|
+
const command = `tail -n ${lines * 100} "${logPath}" | grep -E "log_server_r" || true`;
|
|
163
250
|
const output = await (0, process_utils_1.execCommand)(command);
|
|
164
251
|
const logLines = output.split('\n').filter((l) => l.trim());
|
|
252
|
+
if (logLines.length === 0) {
|
|
253
|
+
console.log(chalk_1.default.dim('No HTTP request logs in compact format.'));
|
|
254
|
+
console.log(chalk_1.default.dim('The server may be starting up, or only simple GET requests have been made.'));
|
|
255
|
+
console.log(chalk_1.default.dim('\nTip: Use --http to see raw HTTP logs, or --verbose for all server logs.'));
|
|
256
|
+
return;
|
|
257
|
+
}
|
|
165
258
|
const compactLines = [];
|
|
166
259
|
for (const line of logLines) {
|
|
167
260
|
log_parser_1.logParser.processLine(line, (compactLine) => {
|
|
@@ -172,6 +265,13 @@ async function logsCommand(identifier, options) {
|
|
|
172
265
|
log_parser_1.logParser.flush((compactLine) => {
|
|
173
266
|
compactLines.push(compactLine);
|
|
174
267
|
});
|
|
268
|
+
// Check if we got any parsed output
|
|
269
|
+
if (compactLines.length === 0) {
|
|
270
|
+
console.log(chalk_1.default.dim('HTTP request logs found, but could not parse in compact format.'));
|
|
271
|
+
console.log(chalk_1.default.dim('This usually happens with simple GET requests (health checks, slots, etc.).'));
|
|
272
|
+
console.log(chalk_1.default.dim('\nTip: Use --http to see raw HTTP logs instead.'));
|
|
273
|
+
return;
|
|
274
|
+
}
|
|
175
275
|
// Show only the last N compact lines
|
|
176
276
|
const limitedLines = compactLines.slice(-lines);
|
|
177
277
|
limitedLines.forEach((line) => console.log(line));
|
|
@@ -186,13 +286,19 @@ async function logsCommand(identifier, options) {
|
|
|
186
286
|
let command;
|
|
187
287
|
if (filterPattern) {
|
|
188
288
|
// Use tail piped to grep
|
|
189
|
-
|
|
289
|
+
// Add || true to prevent grep from failing when no matches found
|
|
290
|
+
command = `tail -n ${lines} "${logPath}" | grep -E "${filterPattern}" || true`;
|
|
190
291
|
}
|
|
191
292
|
else {
|
|
192
293
|
// No filter
|
|
193
294
|
command = `tail -n ${lines} "${logPath}"`;
|
|
194
295
|
}
|
|
195
296
|
const output = await (0, process_utils_1.execCommand)(command);
|
|
297
|
+
if (filterPattern && output.trim() === '') {
|
|
298
|
+
console.log(chalk_1.default.dim(`No logs matching pattern: ${filterPattern}`));
|
|
299
|
+
console.log(chalk_1.default.dim('\nTip: Try --verbose to see all logs, or adjust your filter pattern.'));
|
|
300
|
+
return;
|
|
301
|
+
}
|
|
196
302
|
console.log(output);
|
|
197
303
|
}
|
|
198
304
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+BA,kCAiSC;AAhUD,kDAA0B;AAC1B,iDAAsC;AACtC,mDAAqC;AAErC,wDAAoD;AACpD,oDAAiD;AACjD,0DAAqD;AACrD,oDAAgD;AAChD,kDAO4B;AAgBrB,KAAK,UAAU,WAAW,CAAC,UAAkB,EAAE,OAAoB;IACxE,cAAc;IACd,MAAM,MAAM,GAAG,MAAM,4BAAY,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,sBAAsB,CAAC,CAAC;IACzE,CAAC;IAED,+DAA+D;IAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;IACvE,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;IAErD,8DAA8D;IAC9D,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;QAC1B,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEzD,IAAI,YAAY,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,kCAAkC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC,CAAC;YAC1F,OAAO;QACT,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,+BAA+B,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC5E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,qBAAqB,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,mBAAmB,IAAA,0BAAc,EAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QACpF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IAED,oEAAoE;IACpE,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,uBAAuB;QACvB,IAAI,MAAM,IAAA,uBAAU,EAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,WAAW,IAAI,MAAM,IAAA,uBAAW,EAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,IAAA,wBAAY,EAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,uBAAuB;QACvB,IAAI,MAAM,IAAA,uBAAU,EAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,WAAW,IAAI,MAAM,IAAA,uBAAW,EAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,IAAA,wBAAY,EAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC;QAED,2BAA2B;QAC3B,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACzD,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC;QAEtC,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;QAExC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,oBAAoB,IAAA,0BAAc,EAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,qBAAqB,IAAA,0BAAc,EAAC,YAAY,CAAC,KAAK,YAAY,CAAC,KAAK,QAAQ,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/I,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,mBAAmB,IAAA,0BAAc,EAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IAED,wBAAwB;IACxB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,UAAU,OAAO,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC;QAC9C,MAAM,IAAA,wBAAY,EAAC,OAAO,CAAC,CAAC;QAE5B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,aAAa,OAAO,QAAQ,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QACzE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,aAAa,IAAA,0BAAc,EAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC;QACxC,OAAO;IACT,CAAC;IAED,yBAAyB;IACzB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,UAAU,OAAO,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YAC7E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAa,EAAC,OAAO,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,MAAM,IAAA,uBAAW,EAAC,YAAY,CAAC,CAAC;YAE7C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,aAAa,OAAO,QAAQ,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;YACzE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,gBAAgB,IAAA,0BAAc,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,QAAQ,YAAY,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CAAC,yBAA0B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO;IACT,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,CAAC,MAAM,IAAA,uBAAU,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,MAAM,CAAC,UAAU,OAAO,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC,CAAC;QACjE,OAAO;IACT,CAAC;IAED,oCAAoC;IACpC,IAAI,aAAa,GAAkB,IAAI,CAAC;IACxC,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,IAAI,cAAc,GAAG,KAAK,CAAC;IAE3B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,8BAA8B;QAC9B,UAAU,GAAG,iBAAiB,CAAC;IACjC,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,mBAAmB;QACnB,aAAa,GAAG,wCAAwC,CAAC;QACzD,UAAU,GAAG,gBAAgB,CAAC;IAChC,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACxB,sBAAsB;QACtB,aAAa,GAAG,cAAc,CAAC;QAC/B,UAAU,GAAG,cAAc,CAAC;IAC9B,CAAC;SAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAC1B,gBAAgB;QAChB,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QAC/B,UAAU,GAAG,aAAa,OAAO,CAAC,MAAM,GAAG,CAAC;IAC9C,CAAC;SAAM,CAAC;QACN,oCAAoC;QACpC,aAAa,GAAG,cAAc,CAAC;QAC/B,UAAU,GAAG,YAAY,CAAC;QAC1B,cAAc,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,eAAe,MAAM,CAAC,SAAS,KAAK,OAAO,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC;IAExC,4BAA4B;IAC5B,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,YAAY,GAAG,MAAM,IAAA,8BAAkB,EAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEzD,IAAI,YAAY,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,IAAA,0BAAc,EAAC,WAAW,CAAC,gBAAgB,IAAA,0BAAc,EAAC,YAAY,CAAC,SAAS,CAAC,KAAK,YAAY,CAAC,KAAK,QAAQ,YAAY,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC9L,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,eAAe,IAAA,0BAAc,EAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,qDAAqD;IACrD,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAC/F,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACrD,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,mDAAmD;QACnD,IAAI,cAAc,EAAE,CAAC;YACnB,qDAAqD;YACrD,MAAM,WAAW,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;YACnD,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;gBAClC,KAAK,EAAE,WAAW,CAAC,MAAM;gBACzB,SAAS,EAAE,QAAQ;aACpB,CAAC,CAAC;YAEH,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,sBAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;wBAC1C,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBAC3B,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,2BAA2B;YAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACxB,WAAW,CAAC,IAAI,EAAE,CAAC;gBACnB,EAAE,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,aAAa,EAAE,CAAC;YACzB,uCAAuC;YACvC,MAAM,WAAW,GAAG,IAAA,qBAAK,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,YAAY,OAAO,gCAAgC,aAAa,GAAG,CAAC,EAAE;gBAC3G,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YAEH,2BAA2B;YAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACxB,WAAW,CAAC,IAAI,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBAC1B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,uBAAuB;YACvB,MAAM,IAAI,GAAG,IAAA,qBAAK,EAAC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;gBAC1C,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;YAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACxB,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,4CAA4C;QAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAElC,IAAI,cAAc,EAAE,CAAC;YACnB,oCAAoC;YACpC,IAAI,CAAC;gBACH,4EAA4E;gBAC5E,iEAAiE;gBACjE,MAAM,OAAO,GAAG,WAAW,KAAK,GAAG,GAAG,KAAK,OAAO,oCAAoC,CAAC;gBACvF,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAE5D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC,CAAC;oBAClE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,4EAA4E,CAAC,CAAC,CAAC;oBACrG,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC,CAAC;oBACpG,OAAO;gBACT,CAAC;gBAED,MAAM,YAAY,GAAa,EAAE,CAAC;gBAClC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;oBAC5B,sBAAS,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;wBAC1C,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBACjC,CAAC,CAAC,CAAC;gBACL,CAAC;gBAED,4DAA4D;gBAC5D,sBAAS,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,EAAE;oBAC9B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBAEH,oCAAoC;gBACpC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAC,CAAC;oBAC1F,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC,CAAC;oBACtG,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC,CAAC;oBAC1E,OAAO;gBACT,CAAC;gBAED,qCAAqC;gBACrC,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;gBAChD,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,wBAAyB,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,oBAAoB;YACpB,IAAI,CAAC;gBACH,IAAI,OAAe,CAAC;gBAEpB,IAAI,aAAa,EAAE,CAAC;oBAClB,yBAAyB;oBACzB,iEAAiE;oBACjE,OAAO,GAAG,WAAW,KAAK,KAAK,OAAO,gBAAgB,aAAa,WAAW,CAAC;gBACjF,CAAC;qBAAM,CAAC;oBACN,YAAY;oBACZ,OAAO,GAAG,WAAW,KAAK,KAAK,OAAO,GAAG,CAAC;gBAC5C,CAAC;gBAED,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAW,EAAC,OAAO,CAAC,CAAC;gBAE1C,IAAI,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,6BAA6B,aAAa,EAAE,CAAC,CAAC,CAAC;oBACrE,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAC,CAAC;oBAC/F,OAAO;gBACT,CAAC;gBAED,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,wBAAyB,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AAMA,wBAAsB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AAMA,wBAAsB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuGvE"}
|
package/dist/commands/monitor.js
CHANGED
|
@@ -1,4 +1,37 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
37
|
};
|
|
@@ -32,6 +65,11 @@ async function monitorCommand(identifier) {
|
|
|
32
65
|
`Use: llamacpp ps\n` +
|
|
33
66
|
`Or create a new server: llamacpp server create <model>`);
|
|
34
67
|
}
|
|
68
|
+
// Update server status to reflect actual launchctl state
|
|
69
|
+
const { statusChecker } = await Promise.resolve().then(() => __importStar(require('../lib/status-checker.js')));
|
|
70
|
+
const status = await statusChecker.checkServer(server);
|
|
71
|
+
server.status = status.isRunning ? 'running' : 'stopped';
|
|
72
|
+
server.pid = status.pid || undefined;
|
|
35
73
|
// Check if server is running
|
|
36
74
|
if (server.status !== 'running') {
|
|
37
75
|
screen.destroy();
|
|
@@ -44,6 +82,11 @@ async function monitorCommand(identifier) {
|
|
|
44
82
|
else if (allServers.length === 1) {
|
|
45
83
|
// Only one server - single server mode
|
|
46
84
|
const server = allServers[0];
|
|
85
|
+
// Update server status to reflect actual launchctl state
|
|
86
|
+
const { statusChecker } = await Promise.resolve().then(() => __importStar(require('../lib/status-checker.js')));
|
|
87
|
+
const status = await statusChecker.checkServer(server);
|
|
88
|
+
server.status = status.isRunning ? 'running' : 'stopped';
|
|
89
|
+
server.pid = status.pid || undefined;
|
|
47
90
|
// Check if server is running
|
|
48
91
|
if (server.status !== 'running') {
|
|
49
92
|
screen.destroy();
|
|
@@ -55,6 +98,13 @@ async function monitorCommand(identifier) {
|
|
|
55
98
|
}
|
|
56
99
|
else {
|
|
57
100
|
// Multiple servers - multi-server mode
|
|
101
|
+
// Update all server statuses to reflect actual launchctl state
|
|
102
|
+
const { statusChecker } = await Promise.resolve().then(() => __importStar(require('../lib/status-checker.js')));
|
|
103
|
+
for (const server of allServers) {
|
|
104
|
+
const status = await statusChecker.checkServer(server);
|
|
105
|
+
server.status = status.isRunning ? 'running' : 'stopped';
|
|
106
|
+
server.pid = status.pid || undefined;
|
|
107
|
+
}
|
|
58
108
|
// Filter to only running servers for monitoring
|
|
59
109
|
const runningServers = allServers.filter(s => s.status === 'running');
|
|
60
110
|
if (runningServers.length === 0) {
|
|
@@ -65,7 +115,7 @@ async function monitorCommand(identifier) {
|
|
|
65
115
|
.map((s) => ` llamacpp server start ${s.id} # ${s.modelName}`)
|
|
66
116
|
.join('\n'));
|
|
67
117
|
}
|
|
68
|
-
// Launch multi-server TUI
|
|
118
|
+
// Launch multi-server TUI (pass all servers so we can see stopped ones too)
|
|
69
119
|
await (0, MultiServerMonitorApp_js_1.createMultiServerMonitorUI)(screen, allServers);
|
|
70
120
|
}
|
|
71
121
|
// Render the screen
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/ps.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ps.d.ts","sourceRoot":"","sources":["../../src/commands/ps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ps.d.ts","sourceRoot":"","sources":["../../src/commands/ps.ts"],"names":[],"mappings":"AAgGA,wBAAsB,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDjG"}
|
package/dist/commands/ps.js
CHANGED
|
@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.psCommand = psCommand;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const cli_table3_1 = __importDefault(require("cli-table3"));
|
|
9
|
+
const blessed_1 = __importDefault(require("blessed"));
|
|
9
10
|
const state_manager_1 = require("../lib/state-manager");
|
|
10
11
|
const status_checker_1 = require("../lib/status-checker");
|
|
11
12
|
const format_utils_1 = require("../utils/format-utils");
|
|
12
13
|
const process_utils_1 = require("../utils/process-utils");
|
|
13
|
-
|
|
14
|
+
const MultiServerMonitorApp_js_1 = require("../tui/MultiServerMonitorApp.js");
|
|
15
|
+
async function showStaticTable() {
|
|
14
16
|
const servers = await state_manager_1.stateManager.getAllServers();
|
|
15
17
|
if (servers.length === 0) {
|
|
16
18
|
console.log(chalk_1.default.yellow('No servers configured.'));
|
|
@@ -48,12 +50,14 @@ async function psCommand() {
|
|
|
48
50
|
const uptime = server.status === 'running' && server.lastStarted
|
|
49
51
|
? (0, format_utils_1.formatUptime)(server.lastStarted)
|
|
50
52
|
: '-';
|
|
51
|
-
// Get memory usage for running servers
|
|
53
|
+
// Get memory usage for running servers (CPU + Metal GPU memory)
|
|
52
54
|
let memoryText = '-';
|
|
53
55
|
if (server.status === 'running' && server.pid) {
|
|
54
|
-
const
|
|
55
|
-
if (
|
|
56
|
-
|
|
56
|
+
const cpuMemoryBytes = await (0, process_utils_1.getProcessMemory)(server.pid);
|
|
57
|
+
if (cpuMemoryBytes !== null) {
|
|
58
|
+
const metalMemoryBytes = server.metalMemoryMB ? server.metalMemoryMB * 1024 * 1024 : 0;
|
|
59
|
+
const totalMemoryBytes = cpuMemoryBytes + metalMemoryBytes;
|
|
60
|
+
memoryText = (0, format_utils_1.formatBytes)(totalMemoryBytes);
|
|
57
61
|
}
|
|
58
62
|
}
|
|
59
63
|
table.push([
|
|
@@ -79,4 +83,70 @@ async function psCommand() {
|
|
|
79
83
|
console.log(chalk_1.default.red('\n⚠️ Some servers have crashed. Check logs with: llamacpp server logs <id> --errors'));
|
|
80
84
|
}
|
|
81
85
|
}
|
|
86
|
+
async function psCommand(identifier, options) {
|
|
87
|
+
// If --table flag is set, show static table (backward compatibility)
|
|
88
|
+
if (options?.table) {
|
|
89
|
+
await showStaticTable();
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
// Get all servers and update their statuses
|
|
93
|
+
const servers = await state_manager_1.stateManager.getAllServers();
|
|
94
|
+
if (servers.length === 0) {
|
|
95
|
+
console.log(chalk_1.default.yellow('No servers configured.'));
|
|
96
|
+
console.log(chalk_1.default.dim('\nCreate a server: llamacpp server create <model-filename>'));
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
// Update all server statuses
|
|
100
|
+
const updated = await status_checker_1.statusChecker.updateAllServerStatuses();
|
|
101
|
+
// If identifier is provided, find the server and jump to detail view
|
|
102
|
+
if (identifier) {
|
|
103
|
+
const server = await findServer(identifier, updated);
|
|
104
|
+
if (!server) {
|
|
105
|
+
console.log(chalk_1.default.red(`❌ Server not found: ${identifier}`));
|
|
106
|
+
console.log(chalk_1.default.dim('\nAvailable servers:'));
|
|
107
|
+
updated.forEach((s) => {
|
|
108
|
+
console.log(chalk_1.default.dim(` - ${s.id} (port ${s.port})`));
|
|
109
|
+
});
|
|
110
|
+
process.exit(1);
|
|
111
|
+
}
|
|
112
|
+
// Find the server index for direct jump
|
|
113
|
+
const serverIndex = updated.findIndex(s => s.id === server.id);
|
|
114
|
+
// Launch multi-server TUI with direct jump to detail view
|
|
115
|
+
const screen = blessed_1.default.screen({
|
|
116
|
+
smartCSR: true,
|
|
117
|
+
title: 'llama.cpp Multi-Server Monitor',
|
|
118
|
+
fullUnicode: true,
|
|
119
|
+
});
|
|
120
|
+
await (0, MultiServerMonitorApp_js_1.createMultiServerMonitorUI)(screen, updated, true, serverIndex); // fromPs = true, directJumpIndex
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
// No identifier - launch multi-server TUI
|
|
124
|
+
const runningServers = updated.filter((s) => s.status === 'running');
|
|
125
|
+
// Launch multi-server TUI (shows all servers, not just running ones)
|
|
126
|
+
const screen = blessed_1.default.screen({
|
|
127
|
+
smartCSR: true,
|
|
128
|
+
title: 'llama.cpp Multi-Server Monitor',
|
|
129
|
+
fullUnicode: true,
|
|
130
|
+
});
|
|
131
|
+
await (0, MultiServerMonitorApp_js_1.createMultiServerMonitorUI)(screen, updated, true); // fromPs = true
|
|
132
|
+
}
|
|
133
|
+
// Helper function to find server by identifier
|
|
134
|
+
async function findServer(identifier, servers) {
|
|
135
|
+
// Try by port
|
|
136
|
+
const port = parseInt(identifier);
|
|
137
|
+
if (!isNaN(port)) {
|
|
138
|
+
const server = servers.find(s => s.port === port);
|
|
139
|
+
if (server)
|
|
140
|
+
return server;
|
|
141
|
+
}
|
|
142
|
+
// Try by exact ID
|
|
143
|
+
const byId = servers.find(s => s.id === identifier);
|
|
144
|
+
if (byId)
|
|
145
|
+
return byId;
|
|
146
|
+
// Try by partial model name
|
|
147
|
+
const byModel = servers.find(s => s.modelName.toLowerCase().includes(identifier.toLowerCase()));
|
|
148
|
+
if (byModel)
|
|
149
|
+
return byModel;
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
82
152
|
//# sourceMappingURL=ps.js.map
|
package/dist/commands/ps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ps.js","sourceRoot":"","sources":["../../src/commands/ps.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"ps.js","sourceRoot":"","sources":["../../src/commands/ps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rm.d.ts","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":"AAOA,wBAAsB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"rm.d.ts","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":"AAOA,wBAAsB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAkFtE"}
|
package/dist/commands/rm.js
CHANGED
|
@@ -75,22 +75,15 @@ async function rmCommand(modelIdentifier) {
|
|
|
75
75
|
console.log(chalk_1.default.blue(`🗑️ Removing ${serversUsingModel.length} server(s)...\n`));
|
|
76
76
|
for (const server of serversUsingModel) {
|
|
77
77
|
console.log(chalk_1.default.dim(` Removing server: ${server.id}`));
|
|
78
|
-
//
|
|
79
|
-
if (server.status === 'running') {
|
|
80
|
-
try {
|
|
81
|
-
await launchctl_manager_1.launchctlManager.stopService(server.label);
|
|
82
|
-
await launchctl_manager_1.launchctlManager.waitForServiceStop(server.label, 5000);
|
|
83
|
-
}
|
|
84
|
-
catch (error) {
|
|
85
|
-
console.log(chalk_1.default.yellow(` ⚠️ Failed to stop server gracefully`));
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
// Unload service
|
|
78
|
+
// Unload service (stops and removes from launchd)
|
|
89
79
|
try {
|
|
90
80
|
await launchctl_manager_1.launchctlManager.unloadService(server.plistPath);
|
|
81
|
+
if (server.status === 'running') {
|
|
82
|
+
await launchctl_manager_1.launchctlManager.waitForServiceStop(server.label, 5000);
|
|
83
|
+
}
|
|
91
84
|
}
|
|
92
85
|
catch (error) {
|
|
93
|
-
|
|
86
|
+
console.log(chalk_1.default.yellow(` ⚠️ Failed to unload service gracefully`));
|
|
94
87
|
}
|
|
95
88
|
// Delete plist
|
|
96
89
|
await launchctl_manager_1.launchctlManager.deletePlist(server.plistPath);
|
package/dist/commands/rm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rm.js","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"rm.js","sourceRoot":"","sources":["../../src/commands/rm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-show.d.ts","sourceRoot":"","sources":["../../src/commands/server-show.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server-show.d.ts","sourceRoot":"","sources":["../../src/commands/server-show.ts"],"names":[],"mappings":"AAQA,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwJzE"}
|
|
@@ -9,6 +9,8 @@ const state_manager_1 = require("../lib/state-manager");
|
|
|
9
9
|
const status_checker_1 = require("../lib/status-checker");
|
|
10
10
|
const format_utils_1 = require("../utils/format-utils");
|
|
11
11
|
const process_utils_1 = require("../utils/process-utils");
|
|
12
|
+
const log_utils_1 = require("../utils/log-utils");
|
|
13
|
+
const file_utils_1 = require("../utils/file-utils");
|
|
12
14
|
async function serverShowCommand(identifier) {
|
|
13
15
|
// Find the server
|
|
14
16
|
const server = await state_manager_1.stateManager.findServer(identifier);
|
|
@@ -66,9 +68,16 @@ async function serverShowCommand(identifier) {
|
|
|
66
68
|
console.log(`${chalk_1.default.bold('Uptime:')} ${uptime}`);
|
|
67
69
|
}
|
|
68
70
|
if (updatedServer.pid) {
|
|
69
|
-
const
|
|
70
|
-
if (
|
|
71
|
-
|
|
71
|
+
const cpuMemoryBytes = await (0, process_utils_1.getProcessMemory)(updatedServer.pid);
|
|
72
|
+
if (cpuMemoryBytes !== null) {
|
|
73
|
+
const metalMemoryBytes = updatedServer.metalMemoryMB ? updatedServer.metalMemoryMB * 1024 * 1024 : 0;
|
|
74
|
+
const totalMemoryBytes = cpuMemoryBytes + metalMemoryBytes;
|
|
75
|
+
if (metalMemoryBytes > 0) {
|
|
76
|
+
console.log(`${chalk_1.default.bold('Memory:')} ${(0, format_utils_1.formatBytes)(totalMemoryBytes)} (CPU: ${(0, format_utils_1.formatBytes)(cpuMemoryBytes)}, GPU: ${(0, format_utils_1.formatBytes)(metalMemoryBytes)})`);
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
console.log(`${chalk_1.default.bold('Memory:')} ${(0, format_utils_1.formatBytes)(cpuMemoryBytes)} (CPU only)`);
|
|
80
|
+
}
|
|
72
81
|
}
|
|
73
82
|
}
|
|
74
83
|
}
|
|
@@ -85,6 +94,24 @@ async function serverShowCommand(identifier) {
|
|
|
85
94
|
if (updatedServer.customFlags && updatedServer.customFlags.length > 0) {
|
|
86
95
|
console.log(`${chalk_1.default.bold('Custom Flags:')} ${updatedServer.customFlags.join(' ')}`);
|
|
87
96
|
}
|
|
97
|
+
// Logs section
|
|
98
|
+
console.log('\n' + '─'.repeat(70));
|
|
99
|
+
console.log(chalk_1.default.bold('Logs:'));
|
|
100
|
+
console.log('─'.repeat(70));
|
|
101
|
+
// Get current log sizes
|
|
102
|
+
const stderrSize = (await (0, file_utils_1.fileExists)(updatedServer.stderrPath))
|
|
103
|
+
? await (0, log_utils_1.getFileSize)(updatedServer.stderrPath)
|
|
104
|
+
: 0;
|
|
105
|
+
const stdoutSize = (await (0, file_utils_1.fileExists)(updatedServer.stdoutPath))
|
|
106
|
+
? await (0, log_utils_1.getFileSize)(updatedServer.stdoutPath)
|
|
107
|
+
: 0;
|
|
108
|
+
// Get archived log info
|
|
109
|
+
const archivedInfo = await (0, log_utils_1.getArchivedLogInfo)(updatedServer.id);
|
|
110
|
+
console.log(`${chalk_1.default.bold('Stderr:')} ${(0, log_utils_1.formatFileSize)(stderrSize)} (current)`);
|
|
111
|
+
console.log(`${chalk_1.default.bold('Stdout:')} ${(0, log_utils_1.formatFileSize)(stdoutSize)} (current)`);
|
|
112
|
+
if (archivedInfo.count > 0) {
|
|
113
|
+
console.log(`${chalk_1.default.bold('Archived:')} ${(0, log_utils_1.formatFileSize)(archivedInfo.totalSize)} (${archivedInfo.count} file${archivedInfo.count > 1 ? 's' : ''})`);
|
|
114
|
+
}
|
|
88
115
|
// Timestamps section
|
|
89
116
|
console.log('\n' + '─'.repeat(70));
|
|
90
117
|
console.log(chalk_1.default.bold('Timestamps:'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-show.js","sourceRoot":"","sources":["../../src/commands/server-show.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"server-show.js","sourceRoot":"","sources":["../../src/commands/server-show.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAOA,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FpE"}
|