@openclaw-cloud/agent-controller 0.7.1 → 0.7.3
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/backup-cli.js +5 -24
- package/dist/commands/backup-cli.js.map +1 -1
- package/dist/commands/bootstrap.js +2 -8
- package/dist/commands/bootstrap.js.map +1 -1
- package/dist/commands/knowledge-sync-cli.js +3 -13
- package/dist/commands/knowledge-sync-cli.js.map +1 -1
- package/dist/commands/self-update.js +3 -15
- package/dist/commands/self-update.js.map +1 -1
- package/dist/connection.d.ts +3 -1
- package/dist/connection.js +138 -90
- package/dist/connection.js.map +1 -1
- package/dist/handlers/backup.d.ts +2 -1
- package/dist/handlers/backup.js +31 -50
- package/dist/handlers/backup.js.map +1 -1
- package/dist/handlers/board-handler.js +12 -4
- package/dist/handlers/board-handler.js.map +1 -1
- package/dist/handlers/config.js +25 -29
- package/dist/handlers/config.js.map +1 -1
- package/dist/handlers/deploy.js +20 -6
- package/dist/handlers/deploy.js.map +1 -1
- package/dist/handlers/exec.js +1 -1
- package/dist/handlers/exec.js.map +1 -1
- package/dist/handlers/file-delete.js +4 -3
- package/dist/handlers/file-delete.js.map +1 -1
- package/dist/handlers/file-write.js +4 -3
- package/dist/handlers/file-write.js.map +1 -1
- package/dist/handlers/knowledge-sync.js +17 -6
- package/dist/handlers/knowledge-sync.js.map +1 -1
- package/dist/handlers/onboarding.js +21 -16
- package/dist/handlers/onboarding.js.map +1 -1
- package/dist/handlers/package-install.js +4 -6
- package/dist/handlers/package-install.js.map +1 -1
- package/dist/handlers/pair.js +3 -0
- package/dist/handlers/pair.js.map +1 -1
- package/dist/handlers/restart.js +21 -16
- package/dist/handlers/restart.js.map +1 -1
- package/dist/handlers/stop.js +4 -0
- package/dist/handlers/stop.js.map +1 -1
- package/dist/heartbeat.d.ts +4 -1
- package/dist/heartbeat.js +9 -13
- package/dist/heartbeat.js.map +1 -1
- package/dist/index.js +20 -18
- package/dist/index.js.map +1 -1
- package/dist/openclaw/gateway-adapter.js +19 -12
- package/dist/openclaw/gateway-adapter.js.map +1 -1
- package/dist/openclaw/gateway-client.d.ts +2 -2
- package/dist/openclaw/gateway-client.js +31 -16
- package/dist/openclaw/gateway-client.js.map +1 -1
- package/dist/openclaw/index.d.ts +1 -0
- package/dist/openclaw/index.js +3 -0
- package/dist/openclaw/index.js.map +1 -1
- package/dist/platform/common.d.ts +6 -0
- package/dist/platform/common.js +2 -0
- package/dist/platform/common.js.map +1 -0
- package/dist/platform/linux.d.ts +2 -6
- package/dist/platform/linux.js +7 -18
- package/dist/platform/linux.js.map +1 -1
- package/dist/platform/macos.d.ts +2 -6
- package/dist/platform/macos.js +7 -18
- package/dist/platform/macos.js.map +1 -1
- package/dist/platform/windows.d.ts +2 -6
- package/dist/platform/windows.js +7 -18
- package/dist/platform/windows.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/utils/archive.d.ts +1 -0
- package/dist/utils/archive.js +16 -0
- package/dist/utils/archive.js.map +1 -0
- package/dist/utils/env.d.ts +1 -0
- package/dist/utils/env.js +9 -0
- package/dist/utils/env.js.map +1 -0
- package/dist/utils/exec.d.ts +1 -0
- package/dist/utils/exec.js +12 -0
- package/dist/utils/exec.js.map +1 -0
- package/dist/utils/gateway-restart.d.ts +10 -0
- package/dist/utils/gateway-restart.js +23 -0
- package/dist/utils/gateway-restart.js.map +1 -0
- package/dist/utils/response.d.ts +3 -0
- package/dist/utils/response.js +7 -0
- package/dist/utils/response.js.map +1 -0
- package/dist/workspace.d.ts +12 -0
- package/dist/workspace.js +20 -0
- package/dist/workspace.js.map +1 -0
- package/package.json +1 -1
package/dist/handlers/backup.js
CHANGED
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
import { exec } from 'node:child_process';
|
|
2
1
|
import fs from 'node:fs/promises';
|
|
3
|
-
import
|
|
2
|
+
import { createReadStream } from 'node:fs';
|
|
4
3
|
import path from 'node:path';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
4
|
+
import { getWorkspaceDir } from '../workspace.js';
|
|
5
|
+
import { createArchive } from '../utils/archive.js';
|
|
6
|
+
import { toErrorMessage } from '../utils/response.js';
|
|
9
7
|
const BACKUP_DIR = '/tmp';
|
|
10
|
-
const TAR_TIMEOUT = 120_000;
|
|
11
8
|
const UPLOAD_TIMEOUT = 120_000;
|
|
12
9
|
function isPresigned(uploadUrl, method) {
|
|
13
10
|
if (method === 'presigned')
|
|
@@ -16,11 +13,12 @@ function isPresigned(uploadUrl, method) {
|
|
|
16
13
|
return false;
|
|
17
14
|
return uploadUrl.includes('s3') || uploadUrl.includes('amazonaws');
|
|
18
15
|
}
|
|
19
|
-
export function handleBackup(command) {
|
|
20
|
-
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
const
|
|
16
|
+
export function handleBackup(command, api, agentId) {
|
|
17
|
+
// TYPE-5: validate payload fields before casting to avoid silent null/undefined propagation
|
|
18
|
+
const uploadUrl = typeof command.payload.uploadUrl === 'string' ? command.payload.uploadUrl : '';
|
|
19
|
+
const token = typeof command.payload.token === 'string' ? command.payload.token : undefined;
|
|
20
|
+
const method = typeof command.payload.method === 'string' ? command.payload.method : undefined;
|
|
21
|
+
const snapshotId = typeof command.payload.snapshotId === 'string' ? command.payload.snapshotId : undefined;
|
|
24
22
|
if (!uploadUrl) {
|
|
25
23
|
return Promise.resolve({
|
|
26
24
|
id: command.id,
|
|
@@ -33,12 +31,12 @@ export function handleBackup(command) {
|
|
|
33
31
|
const timestamp = Date.now();
|
|
34
32
|
const filename = `backup-${timestamp}.tar.gz`;
|
|
35
33
|
const archivePath = path.join(BACKUP_DIR, filename);
|
|
36
|
-
return createArchive(archivePath)
|
|
34
|
+
return createArchive(archivePath, getWorkspaceDir())
|
|
37
35
|
.then(() => uploadArchive(archivePath, uploadUrl, presigned ? undefined : token, presigned))
|
|
38
36
|
.then(async (sizeBytes) => {
|
|
39
37
|
await cleanup(archivePath);
|
|
40
38
|
if (presigned && snapshotId) {
|
|
41
|
-
await notifyComplete(snapshotId, sizeBytes);
|
|
39
|
+
await notifyComplete(snapshotId, sizeBytes, api, agentId);
|
|
42
40
|
}
|
|
43
41
|
return {
|
|
44
42
|
id: command.id,
|
|
@@ -53,35 +51,33 @@ export function handleBackup(command) {
|
|
|
53
51
|
id: command.id,
|
|
54
52
|
type: 'backup',
|
|
55
53
|
success: false,
|
|
56
|
-
error:
|
|
54
|
+
error: toErrorMessage(err),
|
|
57
55
|
};
|
|
58
56
|
});
|
|
59
57
|
}
|
|
60
|
-
function createArchive(archivePath) {
|
|
61
|
-
const workspaceDir = getWorkspaceDir();
|
|
62
|
-
return new Promise((resolve, reject) => {
|
|
63
|
-
exec(`tar -czf ${archivePath} -C ${path.dirname(workspaceDir)} ${path.basename(workspaceDir)}`, { timeout: TAR_TIMEOUT }, (error, _stdout, stderr) => {
|
|
64
|
-
if (error) {
|
|
65
|
-
reject(new Error(`tar failed: ${stderr.toString() || error.message}`));
|
|
66
|
-
}
|
|
67
|
-
else {
|
|
68
|
-
resolve();
|
|
69
|
-
}
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
58
|
async function uploadArchive(archivePath, uploadUrl, token, presigned = false) {
|
|
74
59
|
const stat = await fs.stat(archivePath);
|
|
75
|
-
const fileBuffer = await fs.readFile(archivePath);
|
|
76
60
|
const headers = { 'Content-Type': 'application/gzip' };
|
|
77
61
|
if (!presigned && token) {
|
|
78
62
|
headers['Authorization'] = `Bearer ${token}`;
|
|
79
63
|
}
|
|
64
|
+
// PERF-1: stream rather than buffer the entire archive into memory
|
|
65
|
+
const nodeStream = createReadStream(archivePath);
|
|
66
|
+
const body = new ReadableStream({
|
|
67
|
+
start(controller) {
|
|
68
|
+
nodeStream.on('data', (chunk) => controller.enqueue(chunk instanceof Buffer ? chunk : Buffer.from(chunk)));
|
|
69
|
+
nodeStream.on('end', () => controller.close());
|
|
70
|
+
nodeStream.on('error', (err) => controller.error(err));
|
|
71
|
+
},
|
|
72
|
+
cancel() { nodeStream.destroy(); },
|
|
73
|
+
});
|
|
80
74
|
const response = await fetch(uploadUrl, {
|
|
81
75
|
method: presigned ? 'PUT' : 'POST',
|
|
82
76
|
headers,
|
|
83
|
-
body
|
|
77
|
+
body,
|
|
84
78
|
signal: AbortSignal.timeout(UPLOAD_TIMEOUT),
|
|
79
|
+
// @ts-expect-error duplex required for streaming request body in Node.js
|
|
80
|
+
duplex: 'half',
|
|
85
81
|
});
|
|
86
82
|
if (!response.ok) {
|
|
87
83
|
const text = await response.text().catch(() => '');
|
|
@@ -89,26 +85,11 @@ async function uploadArchive(archivePath, uploadUrl, token, presigned = false) {
|
|
|
89
85
|
}
|
|
90
86
|
return stat.size;
|
|
91
87
|
}
|
|
92
|
-
async function notifyComplete(snapshotId, sizeBytes) {
|
|
93
|
-
const
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
throw new Error('Missing BACKEND_URL/AGENT_ID/AGENT_TOKEN for backup completion notify');
|
|
98
|
-
}
|
|
99
|
-
const url = `${backendUrl}/api/internal/agents/${agentId}/backup/complete`;
|
|
100
|
-
const response = await fetch(url, {
|
|
101
|
-
method: 'POST',
|
|
102
|
-
headers: {
|
|
103
|
-
'Content-Type': 'application/json',
|
|
104
|
-
Authorization: `Bearer ${agentToken}`,
|
|
105
|
-
},
|
|
106
|
-
body: JSON.stringify({ snapshotId, sizeBytes }),
|
|
107
|
-
signal: AbortSignal.timeout(UPLOAD_TIMEOUT),
|
|
108
|
-
});
|
|
109
|
-
if (!response.ok) {
|
|
110
|
-
const text = await response.text().catch(() => '');
|
|
111
|
-
throw new Error(`Backup complete notify failed: ${response.status} ${response.statusText} ${text}`);
|
|
88
|
+
async function notifyComplete(snapshotId, sizeBytes, api, agentId) {
|
|
89
|
+
const res = await api.post(`/api/internal/agents/${agentId}/backup/complete`, { snapshotId, sizeBytes });
|
|
90
|
+
if (!res.ok) {
|
|
91
|
+
const text = await res.text().catch(() => '');
|
|
92
|
+
throw new Error(`Backup complete notify failed: ${res.status} ${res.statusText} ${text}`);
|
|
112
93
|
}
|
|
113
94
|
}
|
|
114
95
|
async function cleanup(archivePath) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/handlers/backup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"backup.js","sourceRoot":"","sources":["../../src/handlers/backup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { execFile } from 'node:child_process';
|
|
2
2
|
const OPENCLAW_TIMEOUT = 30_000;
|
|
3
3
|
export class BoardHandler {
|
|
4
4
|
boardState = { state: 'idle', cardId: null };
|
|
@@ -31,8 +31,10 @@ export class BoardHandler {
|
|
|
31
31
|
case 'card:entered':
|
|
32
32
|
if (!event.columnId || !this.myColumnIds.includes(event.columnId))
|
|
33
33
|
return;
|
|
34
|
-
if (this.boardState.state
|
|
34
|
+
if (this.boardState.state !== 'idle')
|
|
35
35
|
return;
|
|
36
|
+
// RACE-2: lock state synchronously before any await so concurrent events are rejected
|
|
37
|
+
this.boardState = { state: 'claiming', cardId: event.cardId };
|
|
36
38
|
await this.tryClaimCard(event.cardId);
|
|
37
39
|
break;
|
|
38
40
|
case 'card:claimed':
|
|
@@ -51,14 +53,17 @@ export class BoardHandler {
|
|
|
51
53
|
await this.startTask(cardId);
|
|
52
54
|
}
|
|
53
55
|
else if (res.status === 409) {
|
|
56
|
+
this.boardState = { state: 'idle', cardId: null };
|
|
54
57
|
console.log(`Card ${cardId} already claimed or agent busy, skipping`);
|
|
55
58
|
}
|
|
56
59
|
else {
|
|
60
|
+
this.boardState = { state: 'idle', cardId: null };
|
|
57
61
|
const body = await res.text().catch(() => '');
|
|
58
62
|
console.error(`Claim card ${cardId} failed (HTTP ${res.status}): ${body}`);
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
catch (err) {
|
|
66
|
+
this.boardState = { state: 'idle', cardId: null };
|
|
62
67
|
console.error('tryClaimCard error:', err instanceof Error ? err.message : err);
|
|
63
68
|
}
|
|
64
69
|
}
|
|
@@ -77,9 +82,13 @@ export class BoardHandler {
|
|
|
77
82
|
'- When done, move the card forward using: POST /api/agent/board/cards/' + cardId + '/move',
|
|
78
83
|
].filter(Boolean).join('\n');
|
|
79
84
|
await this.execOpenclaw(message);
|
|
85
|
+
// STRUCT-2: reset state after the openclaw event is sent so new cards can be claimed
|
|
86
|
+
this.completeTask(cardId);
|
|
80
87
|
}
|
|
81
88
|
catch (err) {
|
|
82
89
|
console.error(`startTask(${cardId}) error:`, err instanceof Error ? err.message : err);
|
|
90
|
+
// Reset to idle so future cards can be processed even when startTask fails
|
|
91
|
+
this.boardState = { state: 'idle', cardId: null };
|
|
83
92
|
}
|
|
84
93
|
}
|
|
85
94
|
completeTask(cardId) {
|
|
@@ -128,8 +137,7 @@ export class BoardHandler {
|
|
|
128
137
|
}
|
|
129
138
|
execOpenclaw(message) {
|
|
130
139
|
return new Promise((resolve) => {
|
|
131
|
-
|
|
132
|
-
exec(`openclaw system event --text '${escaped}' --mode now`, { timeout: OPENCLAW_TIMEOUT }, (error, stdout, stderr) => {
|
|
140
|
+
execFile('openclaw', ['system', 'event', '--text', message, '--mode', 'now'], { timeout: OPENCLAW_TIMEOUT }, (error, _stdout, stderr) => {
|
|
133
141
|
if (error) {
|
|
134
142
|
console.error('openclaw system event failed:', stderr.toString() || error.message);
|
|
135
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"board-handler.js","sourceRoot":"","sources":["../../src/handlers/board-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"board-handler.js","sourceRoot":"","sources":["../../src/handlers/board-handler.ts"],"names":[],"mappings":"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"}
|
package/dist/handlers/config.js
CHANGED
|
@@ -1,43 +1,39 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { execGatewayRestart } from '../utils/gateway-restart.js';
|
|
4
4
|
const CONFIG_DIR = '/etc/openclaw';
|
|
5
|
-
export function handleConfig(command) {
|
|
5
|
+
export async function handleConfig(command) {
|
|
6
6
|
const filename = command.payload.filename;
|
|
7
7
|
const content = command.payload.content;
|
|
8
8
|
if (!filename || content === undefined) {
|
|
9
|
-
return
|
|
9
|
+
return {
|
|
10
10
|
id: command.id,
|
|
11
11
|
type: 'config',
|
|
12
12
|
success: false,
|
|
13
13
|
error: 'Missing "filename" or "content" in payload',
|
|
14
|
-
}
|
|
14
|
+
};
|
|
15
15
|
}
|
|
16
16
|
const configPath = path.join(CONFIG_DIR, path.basename(filename));
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
.
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
type: 'config',
|
|
39
|
-
success: false,
|
|
40
|
-
error: err instanceof Error ? err.message : String(err),
|
|
41
|
-
}));
|
|
17
|
+
try {
|
|
18
|
+
await fs.mkdir(CONFIG_DIR, { recursive: true });
|
|
19
|
+
await fs.writeFile(configPath, content, 'utf-8');
|
|
20
|
+
const { stdout, stderr } = await execGatewayRestart();
|
|
21
|
+
return {
|
|
22
|
+
id: command.id,
|
|
23
|
+
type: 'config',
|
|
24
|
+
success: true,
|
|
25
|
+
data: { path: configPath, stdout, stderr },
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
const e = err;
|
|
30
|
+
return {
|
|
31
|
+
id: command.id,
|
|
32
|
+
type: 'config',
|
|
33
|
+
success: false,
|
|
34
|
+
data: { path: configPath, stdout: e.stdout ?? '', stderr: e.stderr ?? '' },
|
|
35
|
+
error: e instanceof Error ? e.message : String(e),
|
|
36
|
+
};
|
|
37
|
+
}
|
|
42
38
|
}
|
|
43
39
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/handlers/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/handlers/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,UAAU,GAAG,eAAe,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAAqB;IACtD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAkB,CAAC;IACpD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAiB,CAAC;IAElD,IAAI,CAAC,QAAQ,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,4CAA4C;SACpD,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElE,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAkB,EAAE,CAAC;QACtD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE;SAC3C,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAmD,CAAC;QAC9D,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE;YAC1E,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;SAClD,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/handlers/deploy.js
CHANGED
|
@@ -1,27 +1,41 @@
|
|
|
1
1
|
import { exec } from 'node:child_process';
|
|
2
|
+
import { execGatewayRestart } from '../utils/gateway-restart.js';
|
|
2
3
|
export function handleDeploy(command) {
|
|
3
4
|
return new Promise((resolve) => {
|
|
4
5
|
exec('npm i -g openclaw', { timeout: 120_000 }, (installErr, installOut, installStderr) => {
|
|
6
|
+
const installResult = {
|
|
7
|
+
stdout: installOut.toString(),
|
|
8
|
+
stderr: installStderr.toString(),
|
|
9
|
+
};
|
|
5
10
|
if (installErr) {
|
|
6
11
|
resolve({
|
|
7
12
|
id: command.id,
|
|
8
13
|
type: 'deploy',
|
|
9
14
|
success: false,
|
|
10
|
-
data:
|
|
15
|
+
data: installResult,
|
|
11
16
|
error: `Install failed: ${installErr.message}`,
|
|
12
17
|
});
|
|
13
18
|
return;
|
|
14
19
|
}
|
|
15
|
-
|
|
20
|
+
execGatewayRestart()
|
|
21
|
+
.then(({ stdout, stderr }) => {
|
|
16
22
|
resolve({
|
|
17
23
|
id: command.id,
|
|
18
24
|
type: 'deploy',
|
|
19
|
-
success:
|
|
25
|
+
success: true,
|
|
26
|
+
data: { install: installResult, restart: { stdout, stderr } },
|
|
27
|
+
});
|
|
28
|
+
})
|
|
29
|
+
.catch((err) => {
|
|
30
|
+
resolve({
|
|
31
|
+
id: command.id,
|
|
32
|
+
type: 'deploy',
|
|
33
|
+
success: false,
|
|
20
34
|
data: {
|
|
21
|
-
install:
|
|
22
|
-
restart: { stdout:
|
|
35
|
+
install: installResult,
|
|
36
|
+
restart: { stdout: err.stdout ?? '', stderr: err.stderr ?? '' },
|
|
23
37
|
},
|
|
24
|
-
|
|
38
|
+
error: `Restart failed: ${err.message}`,
|
|
25
39
|
});
|
|
26
40
|
});
|
|
27
41
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,UAAU,YAAY,CAAC,OAAqB;IAChD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE;YACxF,MAAM,aAAa,GAAG;gBACpB,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE;gBAC7B,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE;aACjC,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC;oBACN,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,mBAAmB,UAAU,CAAC,OAAO,EAAE;iBAC/C,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,kBAAkB,EAAE;iBACjB,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC3B,OAAO,CAAC;oBACN,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;iBAC9D,CAAC,CAAC;YACL,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAiD,EAAE,EAAE;gBAC3D,OAAO,CAAC;oBACN,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE;wBACJ,OAAO,EAAE,aAAa;wBACtB,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE,EAAE;qBAChE;oBACD,KAAK,EAAE,mBAAmB,GAAG,CAAC,OAAO,EAAE;iBACxC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/handlers/exec.js
CHANGED
|
@@ -17,7 +17,7 @@ export function handleExec(command) {
|
|
|
17
17
|
type: 'exec',
|
|
18
18
|
success: !error,
|
|
19
19
|
data: {
|
|
20
|
-
exitCode: error ? error.code
|
|
20
|
+
exitCode: error ? (typeof error.code === 'number' ? error.code : 1) : 0,
|
|
21
21
|
stdout: stdout.toString(),
|
|
22
22
|
stderr: stderr.toString(),
|
|
23
23
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/handlers/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,MAAM,YAAY,GAAG,MAAM,CAAC;AAE5B,MAAM,UAAU,UAAU,CAAC,OAAqB;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,OAAiB,CAAC;IAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,8BAA8B;SACtC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC7D,OAAO,CAAC;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,CAAC,KAAK;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/handlers/exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAG1C,MAAM,YAAY,GAAG,MAAM,CAAC;AAE5B,MAAM,UAAU,UAAU,CAAC,OAAqB;IAC9C,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,OAAiB,CAAC;IAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,8BAA8B;SACtC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC7D,OAAO,CAAC;gBACN,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,CAAC,KAAK;gBACf,IAAI,EAAE;oBACJ,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAE,KAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrH,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACzB,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;iBAC1B;gBACD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC3C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
|
|
3
|
+
import { getWorkspaceDir } from '../workspace.js';
|
|
4
|
+
import { toErrorMessage } from '../utils/response.js';
|
|
4
5
|
export async function handleFileDelete(command) {
|
|
5
6
|
const filePath = command.payload.path;
|
|
6
7
|
if (!filePath) {
|
|
@@ -19,7 +20,7 @@ export async function handleFileDelete(command) {
|
|
|
19
20
|
error: 'Invalid path: must not contain ".." or start with "/"',
|
|
20
21
|
};
|
|
21
22
|
}
|
|
22
|
-
const resolvedPath = path.join(
|
|
23
|
+
const resolvedPath = path.join(getWorkspaceDir(), filePath);
|
|
23
24
|
try {
|
|
24
25
|
await fs.unlink(resolvedPath);
|
|
25
26
|
return {
|
|
@@ -34,7 +35,7 @@ export async function handleFileDelete(command) {
|
|
|
34
35
|
id: command.id,
|
|
35
36
|
type: 'file_delete',
|
|
36
37
|
success: false,
|
|
37
|
-
error:
|
|
38
|
+
error: toErrorMessage(err),
|
|
38
39
|
};
|
|
39
40
|
}
|
|
40
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-delete.js","sourceRoot":"","sources":["../../src/handlers/file-delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"file-delete.js","sourceRoot":"","sources":["../../src/handlers/file-delete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAqB;IAC1D,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAc,CAAC;IAEhD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,2BAA2B;SACnC,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,uDAAuD;SAC/D,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE5D,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC9B,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE;SAC7B,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC;SAC3B,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
|
|
3
|
+
import { getWorkspaceDir } from '../workspace.js';
|
|
4
|
+
import { toErrorMessage } from '../utils/response.js';
|
|
4
5
|
export async function handleFileWrite(command) {
|
|
5
6
|
const filePath = command.payload.path;
|
|
6
7
|
const content = command.payload.content;
|
|
@@ -21,7 +22,7 @@ export async function handleFileWrite(command) {
|
|
|
21
22
|
error: 'Invalid path: must not contain ".." or start with "/"',
|
|
22
23
|
};
|
|
23
24
|
}
|
|
24
|
-
const resolvedPath = path.join(
|
|
25
|
+
const resolvedPath = path.join(getWorkspaceDir(), filePath);
|
|
25
26
|
try {
|
|
26
27
|
if (!overwrite) {
|
|
27
28
|
try {
|
|
@@ -52,7 +53,7 @@ export async function handleFileWrite(command) {
|
|
|
52
53
|
id: command.id,
|
|
53
54
|
type: 'file_write',
|
|
54
55
|
success: false,
|
|
55
|
-
error:
|
|
56
|
+
error: toErrorMessage(err),
|
|
56
57
|
};
|
|
57
58
|
}
|
|
58
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-write.js","sourceRoot":"","sources":["../../src/handlers/file-write.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"file-write.js","sourceRoot":"","sources":["../../src/handlers/file-write.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAqB;IACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAc,CAAC;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;IACxC,MAAM,SAAS,GAAI,OAAO,CAAC,OAAO,CAAC,SAAiC,IAAI,IAAI,CAAC;IAE7E,IAAI,CAAC,QAAQ,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,wCAAwC;SAChD,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,uDAAuD;SAC/D,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,QAAQ,CAAC,CAAC;IAE5D,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC9B,qBAAqB;gBACrB,OAAO;oBACL,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,IAAI,EAAE,YAAY;oBAClB,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;iBAC5D,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,2CAA2C;YAC7C,CAAC;QACH,CAAC;QAED,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,OAAiB,EAAE,OAAO,CAAC,CAAC;QAE7D,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE;SAC5C,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC;SAC3B,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import fs from 'node:fs/promises';
|
|
2
|
-
import os from 'node:os';
|
|
3
2
|
import path from 'node:path';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
}
|
|
3
|
+
import { getWorkspaceDir } from '../workspace.js';
|
|
4
|
+
const MAX_FILE_BYTES = 1_048_576; // 1 MB per file
|
|
5
|
+
const MAX_TOTAL_BYTES = 10_485_760; // 10 MB total payload
|
|
8
6
|
export async function handleKnowledgeSync(command) {
|
|
9
7
|
const requestedPaths = command.payload.paths;
|
|
10
8
|
if (!Array.isArray(requestedPaths)) {
|
|
@@ -32,9 +30,22 @@ export async function handleKnowledgeSync(command) {
|
|
|
32
30
|
}
|
|
33
31
|
}
|
|
34
32
|
const files = [];
|
|
33
|
+
let totalBytes = 0;
|
|
35
34
|
for (const filePath of resolvedPaths) {
|
|
35
|
+
if (totalBytes >= MAX_TOTAL_BYTES) {
|
|
36
|
+
console.warn(`[knowledge-sync] Total payload limit (${MAX_TOTAL_BYTES / 1024 / 1024} MB) reached, skipping remaining files`);
|
|
37
|
+
break;
|
|
38
|
+
}
|
|
36
39
|
try {
|
|
37
|
-
const
|
|
40
|
+
const fullPath = path.join(workspaceDir, filePath);
|
|
41
|
+
const stat = await fs.stat(fullPath).catch(() => null);
|
|
42
|
+
if (!stat || stat.size > MAX_FILE_BYTES) {
|
|
43
|
+
if (stat)
|
|
44
|
+
console.warn(`[knowledge-sync] Skipping ${filePath}: file too large (${stat.size} bytes)`);
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
const content = await fs.readFile(fullPath, 'utf-8');
|
|
48
|
+
totalBytes += Buffer.byteLength(content, 'utf-8');
|
|
38
49
|
files.push({ path: filePath, content });
|
|
39
50
|
}
|
|
40
51
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"knowledge-sync.js","sourceRoot":"","sources":["../../src/handlers/knowledge-sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"knowledge-sync.js","sourceRoot":"","sources":["../../src/handlers/knowledge-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,23 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export function handleOnboardingComplete(command) {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
1
|
+
import { execGatewayRestart } from '../utils/gateway-restart.js';
|
|
2
|
+
export async function handleOnboardingComplete(command) {
|
|
3
|
+
try {
|
|
4
|
+
const { stdout, stderr } = await execGatewayRestart();
|
|
5
|
+
return {
|
|
6
|
+
id: command.id,
|
|
7
|
+
type: 'onboarding_complete',
|
|
8
|
+
success: true,
|
|
9
|
+
data: { stdout, stderr },
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
catch (err) {
|
|
13
|
+
const e = err;
|
|
14
|
+
return {
|
|
15
|
+
id: command.id,
|
|
16
|
+
type: 'onboarding_complete',
|
|
17
|
+
success: false,
|
|
18
|
+
data: { stdout: e.stdout ?? '', stderr: e.stderr ?? '' },
|
|
19
|
+
error: e.message,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
17
22
|
}
|
|
18
23
|
//# sourceMappingURL=onboarding.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/handlers/onboarding.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"onboarding.js","sourceRoot":"","sources":["../../src/handlers/onboarding.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,OAAqB;IAClE,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAkB,EAAE,CAAC;QACtD,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;SACzB,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,GAAG,GAAmD,CAAC;QAC9D,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE;YACxD,KAAK,EAAE,CAAC,CAAC,OAAO;SACjB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
|
@@ -40,15 +40,13 @@ export async function handlePackageInstall(command) {
|
|
|
40
40
|
errors.push({ name: pkg, error: err instanceof Error ? err.message : String(err) });
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
|
+
// apt: sequential — apt-get uses a global lock that prevents concurrent invocations
|
|
43
44
|
for (const pkg of apt) {
|
|
44
45
|
await tryInstall(pkg, `apt-get install -y ${pkg}`, 'apt');
|
|
45
46
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
}
|
|
49
|
-
for (const pkg of pip) {
|
|
50
|
-
await tryInstall(pkg, `pip install ${pkg}`, 'pip');
|
|
51
|
-
}
|
|
47
|
+
// npm and pip: parallel within each type — independent registries, no global lock
|
|
48
|
+
await Promise.all(npm.map((pkg) => tryInstall(pkg, `npm install -g ${pkg}`, 'npm')));
|
|
49
|
+
await Promise.all(pip.map((pkg) => tryInstall(pkg, `pip install ${pkg}`, 'pip')));
|
|
52
50
|
return {
|
|
53
51
|
id: command.id,
|
|
54
52
|
type: 'package_install',
|