@ai-support-agent/cli 0.0.38 → 0.0.39-beta.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/dist/agent-runner.d.ts.map +1 -1
- package/dist/agent-runner.js +14 -10
- package/dist/agent-runner.js.map +1 -1
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +7 -10
- package/dist/api-client.js.map +1 -1
- package/dist/auth-server.d.ts.map +1 -1
- package/dist/auth-server.js +6 -0
- package/dist/auth-server.js.map +1 -1
- package/dist/child-process-manager.d.ts +4 -5
- package/dist/child-process-manager.d.ts.map +1 -1
- package/dist/child-process-manager.js +58 -53
- package/dist/child-process-manager.js.map +1 -1
- package/dist/cli/service/darwin-service.d.ts +0 -1
- package/dist/cli/service/darwin-service.d.ts.map +1 -1
- package/dist/cli/service/darwin-service.js +9 -124
- package/dist/cli/service/darwin-service.js.map +1 -1
- package/dist/config-watcher.d.ts +3 -3
- package/dist/config-watcher.d.ts.map +1 -1
- package/dist/config-watcher.js +21 -16
- package/dist/config-watcher.js.map +1 -1
- package/dist/docker/docker-runner.d.ts.map +1 -1
- package/dist/docker/docker-runner.js +17 -1
- package/dist/docker/docker-runner.js.map +1 -1
- package/dist/ipc-types.d.ts +5 -0
- package/dist/ipc-types.d.ts.map +1 -1
- package/dist/ipc-types.js +3 -3
- package/dist/ipc-types.js.map +1 -1
- package/dist/locales/en.json +1 -0
- package/dist/locales/ja.json +1 -0
- package/dist/logger.d.ts.map +1 -1
- package/dist/logger.js +9 -2
- package/dist/logger.js.map +1 -1
- package/dist/mcp/tools/browser/browser-security.d.ts +2 -1
- package/dist/mcp/tools/browser/browser-security.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-security.js +31 -1
- package/dist/mcp/tools/browser/browser-security.js.map +1 -1
- package/dist/mcp/tools/db-query.d.ts.map +1 -1
- package/dist/mcp/tools/db-query.js +12 -1
- package/dist/mcp/tools/db-query.js.map +1 -1
- package/dist/project-agent.js +1 -1
- package/dist/project-agent.js.map +1 -1
- package/dist/project-key.d.ts +6 -0
- package/dist/project-key.d.ts.map +1 -0
- package/dist/project-key.js +8 -0
- package/dist/project-key.js.map +1 -0
- package/dist/project-worker.d.ts.map +1 -1
- package/dist/project-worker.js +11 -8
- package/dist/project-worker.js.map +1 -1
- package/dist/security.d.ts.map +1 -1
- package/dist/security.js +7 -1
- package/dist/security.js.map +1 -1
- package/dist/terminal/terminal-websocket.d.ts.map +1 -1
- package/dist/terminal/terminal-websocket.js +13 -3
- package/dist/terminal/terminal-websocket.js.map +1 -1
- package/package.json +1 -1
package/dist/project-worker.js
CHANGED
|
@@ -6,6 +6,7 @@ const logger_1 = require("./logger");
|
|
|
6
6
|
const project_agent_1 = require("./project-agent");
|
|
7
7
|
const sentry_1 = require("./sentry");
|
|
8
8
|
let agent = null;
|
|
9
|
+
let currentTenantCode = 'unknown';
|
|
9
10
|
let currentProjectCode = 'unknown';
|
|
10
11
|
function sendToParent(msg) {
|
|
11
12
|
if (process.send) {
|
|
@@ -20,14 +21,14 @@ async function handleStart(msg) {
|
|
|
20
21
|
}
|
|
21
22
|
agent = new project_agent_1.ProjectAgent(project, agentId, options, options.agentChatMode, options.defaultProjectDir);
|
|
22
23
|
agent.start();
|
|
23
|
-
sendToParent({ type: 'started', projectCode: project.projectCode });
|
|
24
|
-
logger_1.logger.info(`Worker started for [${project.projectCode}] agentId=${agentId} (pid=${process.pid})`);
|
|
24
|
+
sendToParent({ type: 'started', tenantCode: project.tenantCode, projectCode: project.projectCode });
|
|
25
|
+
logger_1.logger.info(`Worker started for [${project.tenantCode}/${project.projectCode}] agentId=${agentId} (pid=${process.pid})`);
|
|
25
26
|
}
|
|
26
|
-
async function handleGracefulExit(projectCode, reason) {
|
|
27
|
+
async function handleGracefulExit(tenantCode, projectCode, reason) {
|
|
27
28
|
const action = reason === 'shutdown' ? 'shutting down' : 'stopping for update';
|
|
28
|
-
logger_1.logger.info(`Worker ${projectCode} ${action}`);
|
|
29
|
+
logger_1.logger.info(`Worker ${tenantCode}/${projectCode} ${action}`);
|
|
29
30
|
agent?.stop();
|
|
30
|
-
sendToParent({ type: 'stopped', projectCode });
|
|
31
|
+
sendToParent({ type: 'stopped', tenantCode, projectCode });
|
|
31
32
|
await (0, sentry_1.flushSentry)();
|
|
32
33
|
process.exit(0);
|
|
33
34
|
}
|
|
@@ -38,22 +39,24 @@ function setupMessageHandler() {
|
|
|
38
39
|
return;
|
|
39
40
|
switch (msg.type) {
|
|
40
41
|
case 'start':
|
|
42
|
+
currentTenantCode = msg.project.tenantCode;
|
|
41
43
|
currentProjectCode = msg.project.projectCode;
|
|
42
44
|
handleStart(msg).catch((err) => {
|
|
43
45
|
const error = err instanceof Error ? err : new Error(String(err));
|
|
44
46
|
(0, sentry_1.captureException)(error);
|
|
45
|
-
sendToParent({ type: 'error', projectCode: currentProjectCode, message: error.message });
|
|
47
|
+
sendToParent({ type: 'error', tenantCode: currentTenantCode, projectCode: currentProjectCode, message: error.message });
|
|
46
48
|
});
|
|
47
49
|
break;
|
|
48
50
|
case 'shutdown':
|
|
49
|
-
void handleGracefulExit(currentProjectCode, 'shutdown');
|
|
51
|
+
void handleGracefulExit(currentTenantCode, currentProjectCode, 'shutdown');
|
|
50
52
|
break;
|
|
51
53
|
case 'update':
|
|
52
|
-
void handleGracefulExit(currentProjectCode, 'update');
|
|
54
|
+
void handleGracefulExit(currentTenantCode, currentProjectCode, 'update');
|
|
53
55
|
break;
|
|
54
56
|
case 'busy_query':
|
|
55
57
|
sendToParent({
|
|
56
58
|
type: 'busy_response',
|
|
59
|
+
tenantCode: currentTenantCode,
|
|
57
60
|
projectCode: currentProjectCode,
|
|
58
61
|
busy: agent?.isBusy() ?? false,
|
|
59
62
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-worker.js","sourceRoot":"","sources":["../src/project-worker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"project-worker.js","sourceRoot":"","sources":["../src/project-worker.ts"],"names":[],"mappings":"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"}
|
package/dist/security.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAG5C,eAAO,MAAM,wBAAwB,UAiBpC,CAAA;AAED,eAAO,MAAM,qBAAqB,UAIjC,CAAA;AAED,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,MAAM,CAE9C,CAAA;AAEF,eAAO,MAAM,aAAa,EAAE,SAAS,MAAM,EAK1C,CAAA;AAED,wBAAgB,qBAAqB,IAAI,MAAM,EAAE,CAKhD;AAED,wBAAgB,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMrD;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAO9D;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBjG;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,EAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,CAcjC"}
|
package/dist/security.js
CHANGED
|
@@ -55,6 +55,12 @@ exports.BLOCKED_COMMAND_PATTERNS = [
|
|
|
55
55
|
/:\(\)\s*\{.*\};\s*:/,
|
|
56
56
|
/\bchmod\s+.*\s+\/(?!\w)/, // chmod on root
|
|
57
57
|
/\bchown\s+.*\s+\/(?!\w)/, // chown on root
|
|
58
|
+
// curl/wget data exfiltration and remote code execution
|
|
59
|
+
/\bcurl\b.*\s(-d|--data|--data-raw|--data-binary|--upload-file|-T|-F|--form)\b/i,
|
|
60
|
+
/\bwget\b.*\s(--post-data|--post-file|--body-data|--body-file)\b/i,
|
|
61
|
+
/\bcurl\b.*\s-[A-Za-z]*d[A-Za-z]*\s+@/i, // curl -d @file (file content upload)
|
|
62
|
+
/\bcurl\b[^|]*\|\s*(ba?sh|sh|zsh|python\d*|ruby|perl|node)\b/i, // curl | sh (remote execution)
|
|
63
|
+
/\bwget\b[^|]*\|\s*(ba?sh|sh|zsh|python\d*|ruby|perl|node)\b/i, // wget | sh (remote execution)
|
|
58
64
|
];
|
|
59
65
|
exports.BLOCKED_PATH_PREFIXES = [
|
|
60
66
|
'/etc/', '/proc/', '/sys/', '/dev/',
|
|
@@ -85,7 +91,7 @@ function buildSafeEnv() {
|
|
|
85
91
|
function validateCommand(command) {
|
|
86
92
|
for (const pattern of exports.BLOCKED_COMMAND_PATTERNS) {
|
|
87
93
|
if (pattern.test(command)) {
|
|
88
|
-
return
|
|
94
|
+
return 'Command blocked: contains a prohibited pattern';
|
|
89
95
|
}
|
|
90
96
|
}
|
|
91
97
|
return null;
|
package/dist/security.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-websocket.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-websocket.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"terminal-websocket.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-websocket.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAe3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAEnE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,GAAG,cAAc,GAAG,OAAO,CAAA;IACtE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAA;IAC3C,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,qBAAa,iBAAkB,SAAQ,uBAAuB,CAAC,qBAAqB,CAAC;IAMjF,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAP9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwB;IAChD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;gBAG5B,MAAM,EAAE,MAAM,EACG,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,YAAA;IAWtC,iBAAiB,IAAI,sBAAsB;IAI3C,SAAS,CAAC,eAAe,IAAI,SAAS;IAStC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,KAAK,IAAI,GAAG,IAAI;IAMtE,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,qBAAqB,GAAG,IAAI;IA2B3D,SAAS,CAAC,YAAY,IAAI,IAAI;IAI9B,OAAO,CAAC,UAAU;IAwElB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,YAAY;IASpB,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,IAAI;CAGb"}
|
|
@@ -43,6 +43,11 @@ const base_websocket_1 = require("../base-websocket");
|
|
|
43
43
|
const logger_1 = require("../logger");
|
|
44
44
|
const utils_1 = require("../utils");
|
|
45
45
|
const constants_1 = require("./constants");
|
|
46
|
+
const MIN_TERMINAL_SIZE = 1;
|
|
47
|
+
const MAX_TERMINAL_SIZE = 1000;
|
|
48
|
+
function clampTerminalSize(value) {
|
|
49
|
+
return Math.min(Math.max(Math.floor(value), MIN_TERMINAL_SIZE), MAX_TERMINAL_SIZE);
|
|
50
|
+
}
|
|
46
51
|
const terminal_session_manager_1 = require("./terminal-session-manager");
|
|
47
52
|
class TerminalWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
48
53
|
token;
|
|
@@ -184,8 +189,13 @@ class TerminalWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
184
189
|
});
|
|
185
190
|
return;
|
|
186
191
|
}
|
|
187
|
-
|
|
188
|
-
|
|
192
|
+
try {
|
|
193
|
+
const decoded = Buffer.from(msg.data, 'base64').toString('utf-8');
|
|
194
|
+
session.write(decoded);
|
|
195
|
+
}
|
|
196
|
+
catch (err) {
|
|
197
|
+
logger_1.logger.warn(`[terminal-ws] Invalid base64 data in stdin (session=${msg.sessionId}): ${err instanceof Error ? err.message : String(err)}`);
|
|
198
|
+
}
|
|
189
199
|
}
|
|
190
200
|
handleResize(msg) {
|
|
191
201
|
if (!msg.sessionId)
|
|
@@ -194,7 +204,7 @@ class TerminalWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
194
204
|
if (!session)
|
|
195
205
|
return;
|
|
196
206
|
if (typeof msg.cols === 'number' && typeof msg.rows === 'number') {
|
|
197
|
-
session.resize(msg.cols, msg.rows);
|
|
207
|
+
session.resize(clampTerminalSize(msg.cols), clampTerminalSize(msg.rows));
|
|
198
208
|
}
|
|
199
209
|
}
|
|
200
210
|
handleClose(msg) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-websocket.js","sourceRoot":"","sources":["../../src/terminal/terminal-websocket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAE5B,4CAA0B;AAE1B,sDAA2D;AAC3D,sCAAkC;AAClC,oCAAqC;AAErC,2CAGoB;
|
|
1
|
+
{"version":3,"file":"terminal-websocket.js","sourceRoot":"","sources":["../../src/terminal/terminal-websocket.ts"],"names":[],"mappings":"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"}
|