awb-agent-manager 1.6.237 → 1.6.239
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/lib/agent-session-runner.d.ts +1 -0
- package/dist/lib/agent-session-runner.js +36 -0
- package/dist/lib/agent-session-runner.js.map +1 -1
- package/dist/lib/event-dispatcher.d.ts +3 -0
- package/dist/lib/event-dispatcher.js +24 -0
- package/dist/lib/event-dispatcher.js.map +1 -1
- package/dist/lib/instance-heartbeat.d.ts +16 -0
- package/dist/lib/instance-heartbeat.js +15 -0
- package/dist/lib/instance-heartbeat.js.map +1 -1
- package/dist/lib/rest.d.ts +28 -0
- package/dist/lib/rest.js +25 -3
- package/dist/lib/rest.js.map +1 -1
- package/dist/lib/terminal-runner.d.ts +75 -0
- package/dist/lib/terminal-runner.js +459 -0
- package/dist/lib/terminal-runner.js.map +1 -0
- package/dist/lib/terminal-shells.d.ts +8 -0
- package/dist/lib/terminal-shells.js +76 -0
- package/dist/lib/terminal-shells.js.map +1 -0
- package/dist/main.js +17 -0
- package/dist/main.js.map +1 -1
- package/dist/package.json +4 -1
- package/package.json +4 -1
|
@@ -0,0 +1,459 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { stat } from 'node:fs/promises';
|
|
3
|
+
import { log } from './logging.js';
|
|
4
|
+
import { patchTerminalState, postTerminalOutput, postTerminalRpcResponse, } from './rest.js';
|
|
5
|
+
import { defaultTerminalCwd, detectTerminalShells } from './terminal-shells.js';
|
|
6
|
+
const DEFAULT_FLUSH_MS = 40;
|
|
7
|
+
const DEFAULT_SCROLLBACK_BYTES = 256 * 1024;
|
|
8
|
+
const DEFAULT_MAX_TERMINALS = 16;
|
|
9
|
+
const DEFAULT_IDLE_HOURS = 12;
|
|
10
|
+
const CHUNK_MAX_BYTES = 64 * 1024;
|
|
11
|
+
const BATCH_MAX = 64;
|
|
12
|
+
const REAP_DELAY_MS = 30_000;
|
|
13
|
+
const CWD_MAX = 1024;
|
|
14
|
+
const TITLE_MAX = 200;
|
|
15
|
+
let ptyModulePromise = null;
|
|
16
|
+
let ptyLoadError = null;
|
|
17
|
+
async function loadPtyModule() {
|
|
18
|
+
if (!ptyModulePromise) {
|
|
19
|
+
ptyModulePromise = import('@lydell/node-pty').catch((err) => {
|
|
20
|
+
ptyLoadError = err?.message ?? String(err);
|
|
21
|
+
log(`Terminal support disabled — @lydell/node-pty could not be loaded: ${ptyLoadError}`);
|
|
22
|
+
return null;
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
return ptyModulePromise;
|
|
26
|
+
}
|
|
27
|
+
export function ptyUnavailableReason() {
|
|
28
|
+
return ptyLoadError;
|
|
29
|
+
}
|
|
30
|
+
function nowIso() {
|
|
31
|
+
return new Date().toISOString();
|
|
32
|
+
}
|
|
33
|
+
function toBuffer(data) {
|
|
34
|
+
return Buffer.isBuffer(data) ? data : Buffer.from(String(data), 'utf8');
|
|
35
|
+
}
|
|
36
|
+
export class TerminalRunner {
|
|
37
|
+
#config;
|
|
38
|
+
#opts;
|
|
39
|
+
#terminals = new Map();
|
|
40
|
+
#shells = null;
|
|
41
|
+
#idleTimer = null;
|
|
42
|
+
#stopped = false;
|
|
43
|
+
constructor(config, opts) {
|
|
44
|
+
this.#config = config;
|
|
45
|
+
this.#opts = opts;
|
|
46
|
+
const idleHours = opts.idleHours ?? DEFAULT_IDLE_HOURS;
|
|
47
|
+
if (idleHours > 0) {
|
|
48
|
+
this.#idleTimer = setInterval(() => this.#reapIdle(idleHours * 3_600_000), 60_000);
|
|
49
|
+
this.#idleTimer.unref?.();
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
async availableShells() {
|
|
53
|
+
if (this.#shells)
|
|
54
|
+
return this.#shells;
|
|
55
|
+
const pty = this.#opts.ptyFactory ? {} : await loadPtyModule();
|
|
56
|
+
if (!pty) {
|
|
57
|
+
this.#shells = [];
|
|
58
|
+
return this.#shells;
|
|
59
|
+
}
|
|
60
|
+
const provider = this.#opts.shellProvider ?? detectTerminalShells;
|
|
61
|
+
try {
|
|
62
|
+
this.#shells = await provider();
|
|
63
|
+
}
|
|
64
|
+
catch (err) {
|
|
65
|
+
log(`Terminal shell detection failed: ${err?.message ?? err}`);
|
|
66
|
+
this.#shells = [];
|
|
67
|
+
}
|
|
68
|
+
return this.#shells;
|
|
69
|
+
}
|
|
70
|
+
liveStates() {
|
|
71
|
+
const out = [];
|
|
72
|
+
for (const t of this.#terminals.values()) {
|
|
73
|
+
if (t.status === 'starting' || t.status === 'live')
|
|
74
|
+
out.push({ terminal_id: t.terminal_id, status: t.status });
|
|
75
|
+
}
|
|
76
|
+
return out;
|
|
77
|
+
}
|
|
78
|
+
countInFlight() {
|
|
79
|
+
return this.liveStates().length;
|
|
80
|
+
}
|
|
81
|
+
async handle(req) {
|
|
82
|
+
try {
|
|
83
|
+
switch (req.op) {
|
|
84
|
+
case 'list': return await this.#handleList(req);
|
|
85
|
+
case 'open': return await this.#handleOpen(req);
|
|
86
|
+
case 'attach': return await this.#handleAttach(req);
|
|
87
|
+
case 'input': return this.#handleInput(req);
|
|
88
|
+
case 'resize': return this.#handleResize(req);
|
|
89
|
+
case 'close': return this.#handleClose(req);
|
|
90
|
+
default:
|
|
91
|
+
log(`terminal_request: unknown op ${String(req.op)}`);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
catch (err) {
|
|
95
|
+
log(`terminal_request ${req.op} failed: ${err?.message ?? err}`);
|
|
96
|
+
await this.#respond(req, { ok: false, error: err?.message ?? String(err), code: 'manager_error' });
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
async #respond(req, body) {
|
|
100
|
+
if (!req.request_id)
|
|
101
|
+
return;
|
|
102
|
+
await postTerminalRpcResponse(this.#config, this.#opts.getManagerId(), req.request_id, body);
|
|
103
|
+
}
|
|
104
|
+
async #handleList(req) {
|
|
105
|
+
this.#reapExited();
|
|
106
|
+
const terminals = Array.from(this.#terminals.values())
|
|
107
|
+
.filter((t) => t.status === 'starting' || t.status === 'live')
|
|
108
|
+
.map((t) => this.#info(t));
|
|
109
|
+
await this.#respond(req, { ok: true, result: { terminals } });
|
|
110
|
+
}
|
|
111
|
+
async #handleOpen(req) {
|
|
112
|
+
const max = this.#opts.maxTerminals ?? DEFAULT_MAX_TERMINALS;
|
|
113
|
+
if (this.countInFlight() >= max) {
|
|
114
|
+
await this.#respond(req, { ok: false, error: `This machine already has ${max} live terminals.`, code: 'too_many_terminals' });
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
const shells = await this.availableShells();
|
|
118
|
+
if (!shells.length) {
|
|
119
|
+
await this.#respond(req, {
|
|
120
|
+
ok: false,
|
|
121
|
+
code: 'terminal_unsupported',
|
|
122
|
+
error: ptyUnavailableReason()
|
|
123
|
+
? `This machine cannot open terminals: ${ptyUnavailableReason()}`
|
|
124
|
+
: 'This machine reported no usable shell.',
|
|
125
|
+
});
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
const wanted = String(req.shell ?? '').trim();
|
|
129
|
+
const shell = (wanted ? shells.find((s) => s.id === wanted) : null) ?? shells.find((s) => s.default) ?? shells[0];
|
|
130
|
+
if (wanted && !shells.some((s) => s.id === wanted)) {
|
|
131
|
+
await this.#respond(req, { ok: false, error: `No "${wanted}" shell on this machine.`, code: 'shell_unknown' });
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
const cwd = await this.#resolveCwd(req.cwd);
|
|
135
|
+
const cols = Math.max(2, Math.min(1000, Math.round(Number(req.cols) || 80)));
|
|
136
|
+
const rows = Math.max(1, Math.min(500, Math.round(Number(req.rows) || 24)));
|
|
137
|
+
const terminalId = randomUUID();
|
|
138
|
+
const term = {
|
|
139
|
+
terminal_id: terminalId,
|
|
140
|
+
shell: shell.id,
|
|
141
|
+
shell_label: shell.label,
|
|
142
|
+
cwd,
|
|
143
|
+
title: String(req.title ?? '').slice(0, TITLE_MAX),
|
|
144
|
+
cols,
|
|
145
|
+
rows,
|
|
146
|
+
pid: null,
|
|
147
|
+
status: 'starting',
|
|
148
|
+
exit_code: null,
|
|
149
|
+
last_error: null,
|
|
150
|
+
created_at: nowIso(),
|
|
151
|
+
updated_at: nowIso(),
|
|
152
|
+
pty: null,
|
|
153
|
+
scrollback: [],
|
|
154
|
+
scrollbackBytes: 0,
|
|
155
|
+
truncated: false,
|
|
156
|
+
seq: 0,
|
|
157
|
+
pendingOut: [],
|
|
158
|
+
pendingBytes: 0,
|
|
159
|
+
flushTimer: null,
|
|
160
|
+
flushing: false,
|
|
161
|
+
pendingState: null,
|
|
162
|
+
reapAt: null,
|
|
163
|
+
lastActiveAt: Date.now(),
|
|
164
|
+
};
|
|
165
|
+
this.#terminals.set(terminalId, term);
|
|
166
|
+
try {
|
|
167
|
+
term.pty = await this.#spawn(shell, term);
|
|
168
|
+
}
|
|
169
|
+
catch (err) {
|
|
170
|
+
term.status = 'error';
|
|
171
|
+
term.last_error = err?.message ?? String(err);
|
|
172
|
+
term.updated_at = nowIso();
|
|
173
|
+
term.reapAt = Date.now() + REAP_DELAY_MS;
|
|
174
|
+
await this.#respond(req, { ok: false, error: term.last_error ?? 'spawn failed', code: 'spawn_failed' });
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
term.pid = term.pty.pid;
|
|
178
|
+
term.status = 'live';
|
|
179
|
+
term.updated_at = nowIso();
|
|
180
|
+
log(`terminal ${terminalId.slice(0, 8)} opened (${shell.label}, pid ${term.pid}, cwd ${cwd})`);
|
|
181
|
+
await this.#respond(req, { ok: true, result: { terminal_id: terminalId, terminal: this.#info(term) } });
|
|
182
|
+
}
|
|
183
|
+
async #handleAttach(req) {
|
|
184
|
+
const term = this.#terminals.get(String(req.terminal_id ?? ''));
|
|
185
|
+
if (!term) {
|
|
186
|
+
await this.#respond(req, { ok: false, error: 'No such terminal on this machine.', code: 'not_found' });
|
|
187
|
+
return;
|
|
188
|
+
}
|
|
189
|
+
if (term.status === 'live' && term.pty && Number.isFinite(req.cols) && Number.isFinite(req.rows)) {
|
|
190
|
+
this.#applyResize(term, Number(req.cols), Number(req.rows));
|
|
191
|
+
}
|
|
192
|
+
await this.#flush(term);
|
|
193
|
+
const data = Buffer.concat(term.scrollback);
|
|
194
|
+
await this.#respond(req, {
|
|
195
|
+
ok: true,
|
|
196
|
+
result: {
|
|
197
|
+
terminal: this.#info(term),
|
|
198
|
+
data: data.toString('base64'),
|
|
199
|
+
seq: term.seq,
|
|
200
|
+
truncated: term.truncated,
|
|
201
|
+
},
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
#handleInput(req) {
|
|
205
|
+
const term = this.#terminals.get(String(req.terminal_id ?? ''));
|
|
206
|
+
if (!term || !term.pty || term.status !== 'live')
|
|
207
|
+
return;
|
|
208
|
+
const data = typeof req.data === 'string' ? req.data : '';
|
|
209
|
+
if (!data)
|
|
210
|
+
return;
|
|
211
|
+
term.lastActiveAt = Date.now();
|
|
212
|
+
try {
|
|
213
|
+
term.pty.write(data);
|
|
214
|
+
}
|
|
215
|
+
catch (err) {
|
|
216
|
+
log(`terminal ${term.terminal_id.slice(0, 8)} write failed: ${err?.message ?? err}`);
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
#handleResize(req) {
|
|
220
|
+
const term = this.#terminals.get(String(req.terminal_id ?? ''));
|
|
221
|
+
if (!term)
|
|
222
|
+
return;
|
|
223
|
+
this.#applyResize(term, Number(req.cols), Number(req.rows));
|
|
224
|
+
}
|
|
225
|
+
#applyResize(term, colsInput, rowsInput) {
|
|
226
|
+
const cols = Math.max(2, Math.min(1000, Math.round(colsInput || term.cols)));
|
|
227
|
+
const rows = Math.max(1, Math.min(500, Math.round(rowsInput || term.rows)));
|
|
228
|
+
if (cols === term.cols && rows === term.rows)
|
|
229
|
+
return;
|
|
230
|
+
term.cols = cols;
|
|
231
|
+
term.rows = rows;
|
|
232
|
+
term.updated_at = nowIso();
|
|
233
|
+
if (term.status !== 'live' || !term.pty)
|
|
234
|
+
return;
|
|
235
|
+
try {
|
|
236
|
+
term.pty.resize(cols, rows);
|
|
237
|
+
}
|
|
238
|
+
catch (err) {
|
|
239
|
+
log(`terminal ${term.terminal_id.slice(0, 8)} resize failed: ${err?.message ?? err}`);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
#handleClose(req) {
|
|
243
|
+
const term = this.#terminals.get(String(req.terminal_id ?? ''));
|
|
244
|
+
if (!term)
|
|
245
|
+
return;
|
|
246
|
+
this.#kill(term, 'closed by user');
|
|
247
|
+
}
|
|
248
|
+
async #resolveCwd(input) {
|
|
249
|
+
const wanted = String(input ?? '').trim().slice(0, CWD_MAX);
|
|
250
|
+
if (!wanted)
|
|
251
|
+
return defaultTerminalCwd();
|
|
252
|
+
try {
|
|
253
|
+
const st = await stat(wanted);
|
|
254
|
+
if (st.isDirectory())
|
|
255
|
+
return wanted;
|
|
256
|
+
}
|
|
257
|
+
catch {
|
|
258
|
+
}
|
|
259
|
+
log(`terminal cwd "${wanted}" is not a directory — falling back to home`);
|
|
260
|
+
return defaultTerminalCwd();
|
|
261
|
+
}
|
|
262
|
+
async #spawn(shell, term) {
|
|
263
|
+
const env = {
|
|
264
|
+
...(this.#opts.baseEnv ?? process.env),
|
|
265
|
+
TERM: 'xterm-256color',
|
|
266
|
+
COLORTERM: 'truecolor',
|
|
267
|
+
AWB_TERMINAL: '1',
|
|
268
|
+
};
|
|
269
|
+
delete env.TERM_PROGRAM;
|
|
270
|
+
const opts = {
|
|
271
|
+
file: shell.path,
|
|
272
|
+
args: this.#shellArgs(shell),
|
|
273
|
+
cwd: term.cwd,
|
|
274
|
+
cols: term.cols,
|
|
275
|
+
rows: term.rows,
|
|
276
|
+
env,
|
|
277
|
+
};
|
|
278
|
+
let handle;
|
|
279
|
+
if (this.#opts.ptyFactory) {
|
|
280
|
+
handle = this.#opts.ptyFactory(opts);
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
const pty = await loadPtyModule();
|
|
284
|
+
if (!pty)
|
|
285
|
+
throw new Error(ptyUnavailableReason() || 'node-pty is not available on this machine');
|
|
286
|
+
handle = pty.spawn(opts.file, opts.args, {
|
|
287
|
+
name: 'xterm-256color',
|
|
288
|
+
cols: opts.cols,
|
|
289
|
+
rows: opts.rows,
|
|
290
|
+
cwd: opts.cwd,
|
|
291
|
+
env: opts.env,
|
|
292
|
+
encoding: null,
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
handle.onData((data) => this.#onData(term, data));
|
|
296
|
+
handle.onExit((e) => this.#onExit(term, e));
|
|
297
|
+
return handle;
|
|
298
|
+
}
|
|
299
|
+
#shellArgs(shell) {
|
|
300
|
+
if (process.platform === 'win32')
|
|
301
|
+
return [];
|
|
302
|
+
if (shell.id === 'cmd' || shell.id === 'pwsh' || shell.id === 'powershell')
|
|
303
|
+
return [];
|
|
304
|
+
return ['-l'];
|
|
305
|
+
}
|
|
306
|
+
#onData(term, data) {
|
|
307
|
+
const buf = toBuffer(data);
|
|
308
|
+
if (!buf.length)
|
|
309
|
+
return;
|
|
310
|
+
term.lastActiveAt = Date.now();
|
|
311
|
+
term.updated_at = nowIso();
|
|
312
|
+
term.scrollback.push(buf);
|
|
313
|
+
term.scrollbackBytes += buf.length;
|
|
314
|
+
const limit = this.#opts.scrollbackBytes ?? DEFAULT_SCROLLBACK_BYTES;
|
|
315
|
+
while (term.scrollbackBytes > limit && term.scrollback.length > 1) {
|
|
316
|
+
const dropped = term.scrollback.shift();
|
|
317
|
+
term.scrollbackBytes -= dropped.length;
|
|
318
|
+
term.truncated = true;
|
|
319
|
+
}
|
|
320
|
+
term.pendingOut.push(buf);
|
|
321
|
+
term.pendingBytes += buf.length;
|
|
322
|
+
if (term.pendingBytes >= CHUNK_MAX_BYTES) {
|
|
323
|
+
void this.#flush(term);
|
|
324
|
+
return;
|
|
325
|
+
}
|
|
326
|
+
if (!term.flushTimer) {
|
|
327
|
+
term.flushTimer = setTimeout(() => {
|
|
328
|
+
term.flushTimer = null;
|
|
329
|
+
void this.#flush(term);
|
|
330
|
+
}, this.#opts.flushIntervalMs ?? DEFAULT_FLUSH_MS);
|
|
331
|
+
term.flushTimer.unref?.();
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
async #flush(term, state) {
|
|
335
|
+
if (term.flushTimer) {
|
|
336
|
+
clearTimeout(term.flushTimer);
|
|
337
|
+
term.flushTimer = null;
|
|
338
|
+
}
|
|
339
|
+
if (term.flushing) {
|
|
340
|
+
if (state)
|
|
341
|
+
term.pendingState = { ...(term.pendingState ?? {}), ...state };
|
|
342
|
+
queueMicrotask(() => {
|
|
343
|
+
if (!term.flushing && (term.pendingOut.length || term.pendingState))
|
|
344
|
+
void this.#flush(term);
|
|
345
|
+
});
|
|
346
|
+
return;
|
|
347
|
+
}
|
|
348
|
+
const patch = { ...(term.pendingState ?? {}), ...(state ?? {}) };
|
|
349
|
+
term.pendingState = null;
|
|
350
|
+
if (!term.pendingOut.length && !Object.keys(patch).length)
|
|
351
|
+
return;
|
|
352
|
+
term.flushing = true;
|
|
353
|
+
try {
|
|
354
|
+
const chunks = [];
|
|
355
|
+
const merged = term.pendingOut.length ? Buffer.concat(term.pendingOut) : Buffer.alloc(0);
|
|
356
|
+
term.pendingOut = [];
|
|
357
|
+
term.pendingBytes = 0;
|
|
358
|
+
for (let offset = 0; offset < merged.length && chunks.length < BATCH_MAX; offset += CHUNK_MAX_BYTES) {
|
|
359
|
+
const slice = merged.subarray(offset, Math.min(offset + CHUNK_MAX_BYTES, merged.length));
|
|
360
|
+
term.seq += 1;
|
|
361
|
+
chunks.push({ seq: term.seq, data: slice.toString('base64'), created_at: nowIso() });
|
|
362
|
+
}
|
|
363
|
+
const sent = chunks.length * CHUNK_MAX_BYTES;
|
|
364
|
+
if (merged.length > sent) {
|
|
365
|
+
const rest = merged.subarray(sent);
|
|
366
|
+
term.pendingOut.unshift(rest);
|
|
367
|
+
term.pendingBytes += rest.length;
|
|
368
|
+
}
|
|
369
|
+
await postTerminalOutput(this.#config, { manager_id: this.#opts.getManagerId(), terminal_id: term.terminal_id }, chunks, Object.keys(patch).length ? patch : null);
|
|
370
|
+
}
|
|
371
|
+
finally {
|
|
372
|
+
term.flushing = false;
|
|
373
|
+
}
|
|
374
|
+
if (term.pendingOut.length || term.pendingState)
|
|
375
|
+
void this.#flush(term);
|
|
376
|
+
}
|
|
377
|
+
#onExit(term, e) {
|
|
378
|
+
if (term.status === 'exited')
|
|
379
|
+
return;
|
|
380
|
+
term.status = 'exited';
|
|
381
|
+
term.exit_code = Number.isFinite(e?.exitCode) ? e.exitCode : null;
|
|
382
|
+
term.pty = null;
|
|
383
|
+
term.updated_at = nowIso();
|
|
384
|
+
term.reapAt = Date.now() + REAP_DELAY_MS;
|
|
385
|
+
log(`terminal ${term.terminal_id.slice(0, 8)} exited (code ${term.exit_code ?? '?'})`);
|
|
386
|
+
void this.#flush(term, { status: 'exited', exit_code: term.exit_code, reason: 'exited' });
|
|
387
|
+
}
|
|
388
|
+
#kill(term, why) {
|
|
389
|
+
if (term.pty) {
|
|
390
|
+
try {
|
|
391
|
+
term.pty.kill();
|
|
392
|
+
}
|
|
393
|
+
catch (err) {
|
|
394
|
+
log(`terminal ${term.terminal_id.slice(0, 8)} kill failed: ${err?.message ?? err}`);
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
if (term.status === 'starting' || term.status === 'live') {
|
|
398
|
+
term.status = 'exited';
|
|
399
|
+
term.updated_at = nowIso();
|
|
400
|
+
term.reapAt = Date.now() + REAP_DELAY_MS;
|
|
401
|
+
void this.#flush(term, { status: 'exited', reason: why });
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
#info(term) {
|
|
405
|
+
return {
|
|
406
|
+
terminal_id: term.terminal_id,
|
|
407
|
+
shell: term.shell,
|
|
408
|
+
shell_label: term.shell_label,
|
|
409
|
+
cwd: term.cwd,
|
|
410
|
+
title: term.title,
|
|
411
|
+
cols: term.cols,
|
|
412
|
+
rows: term.rows,
|
|
413
|
+
pid: term.pid,
|
|
414
|
+
status: term.status,
|
|
415
|
+
exit_code: term.exit_code,
|
|
416
|
+
last_error: term.last_error,
|
|
417
|
+
created_at: term.created_at,
|
|
418
|
+
updated_at: term.updated_at,
|
|
419
|
+
};
|
|
420
|
+
}
|
|
421
|
+
#reapExited() {
|
|
422
|
+
const now = Date.now();
|
|
423
|
+
for (const [id, term] of this.#terminals) {
|
|
424
|
+
if (term.reapAt !== null && term.reapAt <= now)
|
|
425
|
+
this.#terminals.delete(id);
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
#reapIdle(idleMs) {
|
|
429
|
+
this.#reapExited();
|
|
430
|
+
const cutoff = Date.now() - idleMs;
|
|
431
|
+
for (const term of this.#terminals.values()) {
|
|
432
|
+
if (term.status !== 'live')
|
|
433
|
+
continue;
|
|
434
|
+
if (term.lastActiveAt > cutoff)
|
|
435
|
+
continue;
|
|
436
|
+
log(`terminal ${term.terminal_id.slice(0, 8)} idle for too long — closing`);
|
|
437
|
+
this.#kill(term, 'idle');
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
async stopAll(reason = 'manager shutting down') {
|
|
441
|
+
if (this.#stopped)
|
|
442
|
+
return;
|
|
443
|
+
this.#stopped = true;
|
|
444
|
+
if (this.#idleTimer)
|
|
445
|
+
clearInterval(this.#idleTimer);
|
|
446
|
+
const terms = Array.from(this.#terminals.values());
|
|
447
|
+
for (const term of terms)
|
|
448
|
+
this.#kill(term, reason);
|
|
449
|
+
const deadline = Date.now() + 3000;
|
|
450
|
+
while (Date.now() < deadline && terms.some((t) => t.flushing || t.pendingOut.length)) {
|
|
451
|
+
await new Promise((r) => setTimeout(r, 50));
|
|
452
|
+
}
|
|
453
|
+
for (const term of terms) {
|
|
454
|
+
await patchTerminalState(this.#config, { manager_id: this.#opts.getManagerId(), terminal_id: term.terminal_id }, { status: 'exited', reason }).catch(() => undefined);
|
|
455
|
+
}
|
|
456
|
+
this.#terminals.clear();
|
|
457
|
+
}
|
|
458
|
+
}
|
|
459
|
+
//# sourceMappingURL=terminal-runner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminal-runner.js","sourceRoot":"","sources":["../../src/lib/terminal-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { access, constants as fsConstants } from 'node:fs/promises';
|
|
2
|
+
import { homedir } from 'node:os';
|
|
3
|
+
import { isAbsolute } from 'node:path';
|
|
4
|
+
import { findOnPath } from './find-on-path.js';
|
|
5
|
+
const POSIX_CANDIDATES = [
|
|
6
|
+
{ id: 'bash', label: 'bash', names: ['bash'], paths: ['/bin/bash', '/usr/bin/bash', '/opt/homebrew/bin/bash'] },
|
|
7
|
+
{ id: 'zsh', label: 'zsh', names: ['zsh'], paths: ['/bin/zsh', '/usr/bin/zsh', '/opt/homebrew/bin/zsh'] },
|
|
8
|
+
{ id: 'fish', label: 'fish', names: ['fish'], paths: ['/usr/bin/fish', '/opt/homebrew/bin/fish'] },
|
|
9
|
+
{ id: 'sh', label: 'sh', names: ['sh'], paths: ['/bin/sh'] },
|
|
10
|
+
];
|
|
11
|
+
const WINDOWS_CANDIDATES = [
|
|
12
|
+
{ id: 'pwsh', label: 'PowerShell 7', names: ['pwsh'] },
|
|
13
|
+
{
|
|
14
|
+
id: 'powershell',
|
|
15
|
+
label: 'Windows PowerShell',
|
|
16
|
+
names: ['powershell'],
|
|
17
|
+
paths: [`${process.env.SystemRoot || 'C:\\Windows'}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe`],
|
|
18
|
+
},
|
|
19
|
+
{ id: 'cmd', label: 'Command Prompt', names: ['cmd'], paths: [process.env.COMSPEC || 'C:\\Windows\\System32\\cmd.exe'] },
|
|
20
|
+
{ id: 'git-bash', label: 'Git Bash', names: [], paths: ['C:\\Program Files\\Git\\bin\\bash.exe', 'C:\\Program Files (x86)\\Git\\bin\\bash.exe'] },
|
|
21
|
+
];
|
|
22
|
+
async function isExecutable(path) {
|
|
23
|
+
if (!path || !isAbsolute(path))
|
|
24
|
+
return false;
|
|
25
|
+
try {
|
|
26
|
+
await access(path, process.platform === 'win32' ? fsConstants.F_OK : fsConstants.X_OK);
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
catch {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
async function resolveCandidate(candidate) {
|
|
34
|
+
for (const name of candidate.names) {
|
|
35
|
+
const found = await findOnPath(name);
|
|
36
|
+
if (found)
|
|
37
|
+
return found;
|
|
38
|
+
}
|
|
39
|
+
for (const path of candidate.paths || []) {
|
|
40
|
+
if (await isExecutable(path))
|
|
41
|
+
return path;
|
|
42
|
+
}
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
export async function detectTerminalShells() {
|
|
46
|
+
const windows = process.platform === 'win32';
|
|
47
|
+
const candidates = windows ? WINDOWS_CANDIDATES : POSIX_CANDIDATES;
|
|
48
|
+
const shells = [];
|
|
49
|
+
for (const candidate of candidates) {
|
|
50
|
+
const path = await resolveCandidate(candidate);
|
|
51
|
+
if (!path)
|
|
52
|
+
continue;
|
|
53
|
+
shells.push({ id: candidate.id, label: candidate.label, path });
|
|
54
|
+
}
|
|
55
|
+
const preferred = windows ? process.env.COMSPEC : process.env.SHELL;
|
|
56
|
+
if (preferred && await isExecutable(preferred)) {
|
|
57
|
+
const known = shells.find((s) => s.path.toLowerCase() === preferred.toLowerCase());
|
|
58
|
+
if (known) {
|
|
59
|
+
known.default = true;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const base = preferred.split(/[\\/]/).pop() || 'shell';
|
|
63
|
+
const id = base.replace(/\.exe$/i, '').toLowerCase().replace(/[^a-z0-9._+-]/g, '-') || 'login-shell';
|
|
64
|
+
if (!shells.some((s) => s.id === id)) {
|
|
65
|
+
shells.unshift({ id, label: `${base} (login shell)`, path: preferred, default: true });
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (shells.length && !shells.some((s) => s.default))
|
|
70
|
+
shells[0].default = true;
|
|
71
|
+
return shells;
|
|
72
|
+
}
|
|
73
|
+
export function defaultTerminalCwd() {
|
|
74
|
+
return process.env.HOME || process.env.USERPROFILE || homedir() || process.cwd();
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=terminal-shells.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminal-shells.js","sourceRoot":"","sources":["../../src/lib/terminal-shells.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -45,6 +45,7 @@ import { AgentManagerCommandHandler } from './lib/agent-manager-commands.js';
|
|
|
45
45
|
import { listManagedAgentDirs, readManagedAgentConfig, readApiKeyForRehydrate, readAgentCredential, mcpConfigPathFor, subagentLogPathFor, cliHomeDirFor, ensureCliHomeDir, } from './lib/managed-agent-store.js';
|
|
46
46
|
import { MANAGER_CAPABILITIES, shutdownRuntimeProfiles, validateRuntimeProfile } from './lib/runtime-profiles.js';
|
|
47
47
|
import { AgentSessionRunner, detectAcpSessionClis } from './lib/agent-session-runner.js';
|
|
48
|
+
import { TerminalRunner } from './lib/terminal-runner.js';
|
|
48
49
|
import { loadAgentInfo } from './lib/config.js';
|
|
49
50
|
import { MessageOutbox } from './lib/outbox.js';
|
|
50
51
|
import { setRestOutbox, postChatRoomMessageRaw, postSilentExitSystemCommentRaw, postDispatchAckRaw, postCommandAckRaw, postCliLoginProgressRaw, fetchSudoTicket, claimPrivilegedCommand, postPrivilegedCommandResult, } from './lib/rest.js';
|
|
@@ -413,6 +414,12 @@ async function runRuntime(config, version, flags, argv, runtimeProfileOverride)
|
|
|
413
414
|
idleMinutes: Number(config?.agent_sessions?.idle_minutes) || undefined,
|
|
414
415
|
clientVersion: version,
|
|
415
416
|
});
|
|
417
|
+
const terminalRunner = new TerminalRunner(config, {
|
|
418
|
+
getManagerId: () => loadAgentInfo()?.agent_id || '',
|
|
419
|
+
idleHours: Number(config?.terminals?.idle_hours) || undefined,
|
|
420
|
+
});
|
|
421
|
+
const terminalShells = await terminalRunner.availableShells();
|
|
422
|
+
log(`terminals: shells on this host = ${terminalShells.map((s) => s.id).join(', ') || '(none — terminal support off)'}`);
|
|
416
423
|
const acpSessionClis = await detectAcpSessionClis();
|
|
417
424
|
log(`agent sessions: ACP-capable CLIs on this host = ${acpSessionClis.join(', ') || '(none)'}`);
|
|
418
425
|
const runtimeSupervisor = new RuntimeSupervisor({
|
|
@@ -745,6 +752,7 @@ async function runRuntime(config, version, flags, argv, runtimeProfileOverride)
|
|
|
745
752
|
runtimeProfileOverride,
|
|
746
753
|
runtimeSupervisor,
|
|
747
754
|
agentSessionRunner,
|
|
755
|
+
terminalRunner,
|
|
748
756
|
poolReclaimTrigger: () => reconcilePoolLeasesAll ? reconcilePoolLeasesAll('pool_exhausted') : Promise.resolve(0),
|
|
749
757
|
},
|
|
750
758
|
pluginVersion: version,
|
|
@@ -912,6 +920,9 @@ async function runRuntime(config, version, flags, argv, runtimeProfileOverride)
|
|
|
912
920
|
cliInstallsProvider: () => cliInstalls,
|
|
913
921
|
acpSessionClis,
|
|
914
922
|
agentSessionsProvider: () => agentSessionRunner.liveStates(),
|
|
923
|
+
platform: process.platform,
|
|
924
|
+
terminalShells,
|
|
925
|
+
terminalsProvider: () => terminalRunner.liveStates(),
|
|
915
926
|
managedAgents,
|
|
916
927
|
openBreakerCountProvider: () => circuitBreaker.getOpenBreakers().length,
|
|
917
928
|
dispatchSuppressionCountsProvider: () => inflightDispatchTracker.suppressionCounts(),
|
|
@@ -1094,6 +1105,12 @@ async function runRuntime(config, version, flags, argv, runtimeProfileOverride)
|
|
|
1094
1105
|
catch (err) {
|
|
1095
1106
|
log(`shutdown (agent sessions): ${err?.message ?? err}`);
|
|
1096
1107
|
}
|
|
1108
|
+
try {
|
|
1109
|
+
await terminalRunner.stopAll(stopReason);
|
|
1110
|
+
}
|
|
1111
|
+
catch (err) {
|
|
1112
|
+
log(`shutdown (terminals): ${err?.message ?? err}`);
|
|
1113
|
+
}
|
|
1097
1114
|
try {
|
|
1098
1115
|
await runtimeSupervisor.stopAll();
|
|
1099
1116
|
}
|