@ai-support-agent/cli 0.1.21 → 0.1.22-beta.1
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 +6 -3
- package/dist/agent-runner.js.map +1 -1
- package/dist/agent-transport.js +4 -4
- package/dist/agent-transport.js.map +1 -1
- package/dist/api-client.d.ts +3 -3
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js.map +1 -1
- package/dist/auth-server.js +3 -3
- package/dist/auth-server.js.map +1 -1
- package/dist/auto-updater.d.ts.map +1 -1
- package/dist/auto-updater.js +1 -2
- package/dist/auto-updater.js.map +1 -1
- package/dist/browser/browser-local-server.d.ts.map +1 -1
- package/dist/browser/browser-local-server.js +4 -16
- package/dist/browser/browser-local-server.js.map +1 -1
- package/dist/browser/browser-script-executor.d.ts.map +1 -1
- package/dist/browser/browser-script-executor.js +7 -5
- package/dist/browser/browser-script-executor.js.map +1 -1
- package/dist/cli/log-rotate-command.d.ts +24 -1
- package/dist/cli/log-rotate-command.d.ts.map +1 -1
- package/dist/cli/log-rotate-command.js +7 -20
- package/dist/cli/log-rotate-command.js.map +1 -1
- package/dist/cli/service/darwin-service.d.ts.map +1 -1
- package/dist/cli/service/darwin-service.js +49 -106
- package/dist/cli/service/darwin-service.js.map +1 -1
- package/dist/cli/service/linux-service.d.ts.map +1 -1
- package/dist/cli/service/linux-service.js +50 -116
- package/dist/cli/service/linux-service.js.map +1 -1
- package/dist/cli/service/service-template-helpers.d.ts +35 -0
- package/dist/cli/service/service-template-helpers.d.ts.map +1 -0
- package/dist/cli/service/service-template-helpers.js +79 -0
- package/dist/cli/service/service-template-helpers.js.map +1 -0
- package/dist/cli/service/win32-service.d.ts.map +1 -1
- package/dist/cli/service/win32-service.js +9 -7
- package/dist/cli/service/win32-service.js.map +1 -1
- package/dist/cli/service-command.d.ts.map +1 -1
- package/dist/cli/service-command.js +6 -5
- package/dist/cli/service-command.js.map +1 -1
- package/dist/commands/chat-executor.js +2 -2
- package/dist/commands/chat-executor.js.map +1 -1
- package/dist/commands/claude-code-args.d.ts.map +1 -1
- package/dist/commands/claude-code-args.js +2 -1
- package/dist/commands/claude-code-args.js.map +1 -1
- package/dist/commands/claude-code-runner.d.ts.map +1 -1
- package/dist/commands/claude-code-runner.js +2 -1
- package/dist/commands/claude-code-runner.js.map +1 -1
- package/dist/commands/docker-commands.d.ts.map +1 -1
- package/dist/commands/docker-commands.js +2 -1
- package/dist/commands/docker-commands.js.map +1 -1
- package/dist/commands/e2e-test-executor.js +71 -57
- package/dist/commands/e2e-test-executor.js.map +1 -1
- package/dist/commands/file-transfer.d.ts.map +1 -1
- package/dist/commands/file-transfer.js +3 -2
- package/dist/commands/file-transfer.js.map +1 -1
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +138 -130
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/shell-executor.js +1 -1
- package/dist/commands/shell-executor.js.map +1 -1
- package/dist/commands/stop-agent.d.ts.map +1 -1
- package/dist/commands/stop-agent.js +2 -1
- package/dist/commands/stop-agent.js.map +1 -1
- package/dist/config-watcher.d.ts.map +1 -1
- package/dist/config-watcher.js +3 -2
- package/dist/config-watcher.js.map +1 -1
- package/dist/constants.d.ts +17 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +28 -4
- package/dist/constants.js.map +1 -1
- package/dist/docker/docker-runner.d.ts.map +1 -1
- package/dist/docker/docker-runner.js +6 -5
- package/dist/docker/docker-runner.js.map +1 -1
- package/dist/docker/docker-supervisor.d.ts.map +1 -1
- package/dist/docker/docker-supervisor.js +33 -27
- package/dist/docker/docker-supervisor.js.map +1 -1
- package/dist/docker/dockerfile-sync.d.ts.map +1 -1
- package/dist/docker/dockerfile-sync.js +2 -1
- package/dist/docker/dockerfile-sync.js.map +1 -1
- package/dist/docker/project-config.d.ts.map +1 -1
- package/dist/docker/project-config.js +2 -1
- package/dist/docker/project-config.js.map +1 -1
- package/dist/docker/version-manager.d.ts.map +1 -1
- package/dist/docker/version-manager.js +1 -2
- package/dist/docker/version-manager.js.map +1 -1
- package/dist/docker/volume-mount-builder.d.ts.map +1 -1
- package/dist/docker/volume-mount-builder.js +2 -1
- package/dist/docker/volume-mount-builder.js.map +1 -1
- package/dist/git-credential-setup.js +1 -1
- package/dist/git-credential-setup.js.map +1 -1
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +4 -3
- package/dist/i18n.js.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/dist/log-rotator.d.ts.map +1 -1
- package/dist/log-rotator.js +2 -1
- package/dist/log-rotator.js.map +1 -1
- package/dist/mcp/tools/browser/browser-session.d.ts +1 -2
- package/dist/mcp/tools/browser/browser-session.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-session.js +4 -2
- package/dist/mcp/tools/browser/browser-session.js.map +1 -1
- package/dist/mcp/tools/browser/browser-types.d.ts +4 -0
- package/dist/mcp/tools/browser/browser-types.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-types.js +7 -1
- package/dist/mcp/tools/browser/browser-types.js.map +1 -1
- package/dist/mcp/tools/browser/element-info.d.ts +3 -2
- package/dist/mcp/tools/browser/element-info.d.ts.map +1 -1
- package/dist/mcp/tools/browser/element-info.js +0 -2
- package/dist/mcp/tools/browser/element-info.js.map +1 -1
- package/dist/mcp/tools/browser/selector-utils.d.ts +3 -2
- package/dist/mcp/tools/browser/selector-utils.d.ts.map +1 -1
- package/dist/mcp/tools/browser/selector-utils.js +9 -10
- package/dist/mcp/tools/browser/selector-utils.js.map +1 -1
- package/dist/mcp/tools/browser.d.ts.map +1 -1
- package/dist/mcp/tools/browser.js +13 -11
- package/dist/mcp/tools/browser.js.map +1 -1
- package/dist/mcp/tools/e2e-test-step.js.map +1 -1
- package/dist/pending-result-store.js +1 -1
- package/dist/pending-result-store.js.map +1 -1
- package/dist/pid-manager.d.ts.map +1 -1
- package/dist/pid-manager.js +2 -1
- package/dist/pid-manager.js.map +1 -1
- package/dist/project-agent.d.ts +16 -0
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +92 -79
- package/dist/project-agent.js.map +1 -1
- package/dist/repo-sync.d.ts.map +1 -1
- package/dist/repo-sync.js +15 -9
- package/dist/repo-sync.js.map +1 -1
- package/dist/ssh-config-setup.js +3 -3
- package/dist/ssh-config-setup.js.map +1 -1
- package/dist/terminal/terminal-session.d.ts +9 -0
- package/dist/terminal/terminal-session.d.ts.map +1 -1
- package/dist/terminal/terminal-session.js +42 -3
- package/dist/terminal/terminal-session.js.map +1 -1
- package/dist/terminal/terminal-websocket.d.ts +7 -0
- package/dist/terminal/terminal-websocket.d.ts.map +1 -1
- package/dist/terminal/terminal-websocket.js +9 -3
- package/dist/terminal/terminal-websocket.js.map +1 -1
- package/dist/update-checker.d.ts.map +1 -1
- package/dist/update-checker.js +2 -4
- package/dist/update-checker.js.map +1 -1
- package/dist/utils/claude-config-validator.d.ts.map +1 -1
- package/dist/utils/claude-config-validator.js +2 -1
- package/dist/utils/claude-config-validator.js.map +1 -1
- package/dist/utils/claude-json-oauth-sync.d.ts.map +1 -1
- package/dist/utils/claude-json-oauth-sync.js +5 -6
- package/dist/utils/claude-json-oauth-sync.js.map +1 -1
- package/dist/utils/claude-settings.d.ts.map +1 -1
- package/dist/utils/claude-settings.js +3 -2
- package/dist/utils/claude-settings.js.map +1 -1
- package/dist/utils/path-utils.d.ts +32 -0
- package/dist/utils/path-utils.d.ts.map +1 -0
- package/dist/utils/path-utils.js +121 -0
- package/dist/utils/path-utils.js.map +1 -0
- package/dist/utils/version.d.ts.map +1 -1
- package/dist/utils/version.js +1 -0
- package/dist/utils/version.js.map +1 -1
- package/dist/utils.d.ts +8 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +22 -0
- package/dist/utils.js.map +1 -1
- package/dist/vscode/vscode-server.js +2 -2
- package/dist/vscode/vscode-server.js.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.d.ts +9 -0
- package/dist/vscode/vscode-tunnel-websocket.d.ts.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.js +63 -38
- package/dist/vscode/vscode-tunnel-websocket.js.map +1 -1
- package/package.json +1 -1
package/dist/constants.js
CHANGED
|
@@ -33,14 +33,14 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
exports.
|
|
37
|
-
exports.BUSY_QUERY_TIMEOUT_MS = exports.UPDATE_FORCED_BUSY_WAIT_TIMEOUT_MS = exports.UPDATE_BUSY_POLL_INTERVAL_MS = exports.UPDATE_BUSY_WAIT_TIMEOUT_MS = exports.DOCKER_RESTART_EXIT_CODE = exports.DOCKER_UPDATE_EXIT_CODE = exports.REGISTER_AUTH_ERROR_DELAY_MS = exports.REGISTER_RETRY_MAX_DELAY_MS = exports.REGISTER_RETRY_BASE_DELAY_MS = exports.WS_RECONNECT_MAX_DELAY_MS = exports.APPSYNC_RECONNECT_BASE_DELAY_MS = exports.APPSYNC_MAX_RECONNECT_RETRIES = exports.TOKEN_WATCH_INTERVAL_MS = exports.CHILD_PROCESS_STOP_TIMEOUT_MS = exports.CHILD_PROCESS_RESTART_DELAY_MS = exports.CHILD_PROCESS_MAX_RESTARTS = exports.GIT_CHECKOUT_TIMEOUT = exports.GIT_FETCH_TIMEOUT = exports.GIT_CLONE_TIMEOUT = exports.ANTHROPIC_CONTENT_TYPE = exports.SSE_EVENT = exports.SSE_DONE = exports.SSE_PREFIX = exports.INITIAL_CONFIG_SYNC_RETRY_DELAY_MS = exports.INITIAL_CONFIG_SYNC_MAX_RETRIES = exports.CONFIG_SYNC_DEBOUNCE_MS = exports.API_ENDPOINTS = exports.ERR_SYNC_REPOSITORY_REQUIRES_CALLBACK = exports.ERR_UPDATE_REQUIRES_CALLBACK = exports.ERR_REBOOT_REQUIRES_CALLBACK = exports.ERR_CONFIG_SYNC_REQUIRES_CALLBACK = exports.ERR_SETUP_REQUIRES_CALLBACK = exports.ERR_E2E_TEST_REQUIRES_CLIENT = exports.ERR_CHAT_REQUIRES_CLIENT = exports.ERR_CLAUDE_CLI_NOT_FOUND = exports.ERR_AUTH_SERVER_START_FAILED = exports.ERR_ANTHROPIC_API_KEY_NOT_SET = void 0;
|
|
38
|
-
const fs_1 = require("fs");
|
|
36
|
+
exports.ERR_NO_CONTENT_SPECIFIED = exports.ERR_NO_COMMAND_SPECIFIED = exports.ERR_MESSAGE_REQUIRED = exports.ERR_AGENT_ID_REQUIRED = exports.CHUNK_LOG_LIMIT = exports.LOG_DEBUG_LIMIT = exports.LOG_RESULT_LIMIT = exports.LOG_PAYLOAD_LIMIT = exports.LOG_MESSAGE_LIMIT = exports.CHAT_MAX_ATTEMPTS = exports.CHAT_RETRY_DELAY_MS = exports.DEFAULT_APPSYNC_TIMEOUT_MS = exports.CLAUDE_DETECT_TIMEOUT_MS = exports.CHAT_SIGKILL_DELAY = exports.CHAT_TOOL_EXECUTION_TIMEOUT = exports.CHAT_TIMEOUT = exports.DEFAULT_MAX_TOKENS = exports.ANTHROPIC_API_URL = exports.ANTHROPIC_API_VERSION = exports.DEFAULT_ANTHROPIC_MODEL = exports.NPM_COMMAND = exports.NPM_INSTALL_TIMEOUT = exports.UPDATE_CHECK_INITIAL_DELAY = exports.UPDATE_CHECK_INTERVAL = exports.PROJECT_CODE_ENV_DEFAULT = exports.PROJECT_CODE_CLI_DIRECT = exports.PROJECT_CODE_DEFAULT = exports.DEFAULT_API_URL = exports.DEFAULT_LOGIN_URL = exports.LOCALHOST_ADDRESS = exports.HIDDEN_ENTRIES = exports.MAX_DIR_ENTRIES = exports.MAX_INTERVAL = exports.MIN_INTERVAL = exports.PROCESS_LIST_TIMEOUT = exports.MAX_FILE_WRITE_SIZE = exports.MAX_FILE_READ_SIZE = exports.MAX_CMD_TIMEOUT = exports.CMD_DEFAULT_TIMEOUT = exports.API_REQUEST_TIMEOUT = exports.API_BASE_DELAY_MS = exports.API_MAX_RETRIES = exports.MAX_AUTH_BODY_SIZE = exports.MAX_OUTPUT_SIZE = exports.AGENT_VERSION = exports.AUTH_TIMEOUT = exports.DEFAULT_HEARTBEAT_INTERVAL = exports.DEFAULT_POLL_INTERVAL = exports.CONFIG_FILE = exports.CONFIG_DIR = void 0;
|
|
37
|
+
exports.CLI_FLAG_NO_AUTO_UPDATE = exports.CLI_FLAG_NO_DOCKERFILE_SYNC = exports.CLI_FLAG_NO_DOCKER = exports.CLI_FLAG_VERBOSE = exports.NOTIFICATION_ACTION = exports.DELAYED_RESTART_MS = exports.BUSY_QUERY_TIMEOUT_MS = exports.UPDATE_FORCED_BUSY_WAIT_TIMEOUT_MS = exports.UPDATE_BUSY_POLL_INTERVAL_MS = exports.UPDATE_BUSY_WAIT_TIMEOUT_MS = exports.DOCKER_RESTART_EXIT_CODE = exports.DOCKER_UPDATE_EXIT_CODE = exports.DOCKER_MARKER_REGISTERED_AGENT_ID = exports.DOCKER_MARKER_CUSTOMIZATION_HASH = exports.DOCKER_MARKER_REBUILD_NEEDED = exports.DOCKER_MARKER_BUILT_HASH = exports.REGISTER_AUTH_ERROR_DELAY_MS = exports.REGISTER_RETRY_MAX_DELAY_MS = exports.REGISTER_RETRY_BASE_DELAY_MS = exports.WS_RECONNECT_MAX_DELAY_MS = exports.APPSYNC_RECONNECT_BASE_DELAY_MS = exports.APPSYNC_MAX_RECONNECT_RETRIES = exports.TOKEN_WATCH_INTERVAL_MS = exports.CHILD_PROCESS_STOP_TIMEOUT_MS = exports.CHILD_PROCESS_RESTART_DELAY_MS = exports.CHILD_PROCESS_MAX_RESTARTS = exports.GIT_CHECKOUT_TIMEOUT = exports.GIT_FETCH_TIMEOUT = exports.GIT_CLONE_TIMEOUT = exports.ANTHROPIC_CONTENT_TYPE = exports.SSE_EVENT = exports.SSE_DONE = exports.SSE_PREFIX = exports.INITIAL_CONFIG_SYNC_RETRY_DELAY_MS = exports.INITIAL_CONFIG_SYNC_MAX_RETRIES = exports.CONFIG_SYNC_DEBOUNCE_MS = exports.API_ENDPOINTS = exports.ERR_SYNC_REPOSITORY_REQUIRES_CALLBACK = exports.ERR_UPDATE_REQUIRES_CALLBACK = exports.ERR_REBOOT_REQUIRES_CALLBACK = exports.ERR_CONFIG_SYNC_REQUIRES_CALLBACK = exports.ERR_SETUP_REQUIRES_CALLBACK = exports.ERR_E2E_TEST_REQUIRES_CLIENT = exports.ERR_CHAT_REQUIRES_CLIENT = exports.ERR_CLAUDE_CLI_NOT_FOUND = exports.ERR_AUTH_SERVER_START_FAILED = exports.ERR_ANTHROPIC_API_KEY_NOT_SET = exports.ERR_INVALID_PID = exports.ERR_NO_FILE_PATH_SPECIFIED = void 0;
|
|
39
38
|
const os = __importStar(require("os"));
|
|
40
39
|
const path_1 = require("path");
|
|
40
|
+
const utils_1 = require("./utils");
|
|
41
41
|
function getPackageVersion() {
|
|
42
42
|
try {
|
|
43
|
-
const pkg =
|
|
43
|
+
const pkg = (0, utils_1.readJsonSync)((0, path_1.join)(__dirname, '..', 'package.json'));
|
|
44
44
|
return pkg.version ?? '0.0.0';
|
|
45
45
|
}
|
|
46
46
|
catch {
|
|
@@ -78,6 +78,8 @@ exports.MAX_INTERVAL = 300_000; // 5 minutes
|
|
|
78
78
|
exports.MAX_DIR_ENTRIES = 1000;
|
|
79
79
|
// Hidden entries to exclude from file listings
|
|
80
80
|
exports.HIDDEN_ENTRIES = ['.claude'];
|
|
81
|
+
// Loopback address used when binding local HTTP servers and building local URLs
|
|
82
|
+
exports.LOCALHOST_ADDRESS = '127.0.0.1';
|
|
81
83
|
// Default login URL (production)
|
|
82
84
|
exports.DEFAULT_LOGIN_URL = 'https://ai-support-agent.com';
|
|
83
85
|
// Default API URL (production)
|
|
@@ -90,6 +92,8 @@ exports.PROJECT_CODE_ENV_DEFAULT = 'env-default';
|
|
|
90
92
|
exports.UPDATE_CHECK_INTERVAL = 60 * 60 * 1000; // 1 hour
|
|
91
93
|
exports.UPDATE_CHECK_INITIAL_DELAY = 30_000; // 30 seconds
|
|
92
94
|
exports.NPM_INSTALL_TIMEOUT = 120_000; // 2 minutes
|
|
95
|
+
// Platform-specific npm command (Windows uses npm.cmd, Unix/macOS uses npm)
|
|
96
|
+
exports.NPM_COMMAND = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
93
97
|
// Anthropic API
|
|
94
98
|
exports.DEFAULT_ANTHROPIC_MODEL = 'claude-sonnet-4-6-20250514';
|
|
95
99
|
exports.ANTHROPIC_API_VERSION = '2023-06-01';
|
|
@@ -197,6 +201,12 @@ exports.WS_RECONNECT_MAX_DELAY_MS = 60_000;
|
|
|
197
201
|
exports.REGISTER_RETRY_BASE_DELAY_MS = 1_000;
|
|
198
202
|
exports.REGISTER_RETRY_MAX_DELAY_MS = 60_000;
|
|
199
203
|
exports.REGISTER_AUTH_ERROR_DELAY_MS = 5 * 60 * 1000;
|
|
204
|
+
// Docker marker filenames written to the per-project config dir to coordinate
|
|
205
|
+
// image build state between the in-container agent and the host DockerSupervisor.
|
|
206
|
+
exports.DOCKER_MARKER_BUILT_HASH = 'docker-built-hash';
|
|
207
|
+
exports.DOCKER_MARKER_REBUILD_NEEDED = 'docker-rebuild-needed';
|
|
208
|
+
exports.DOCKER_MARKER_CUSTOMIZATION_HASH = 'docker-customization-hash';
|
|
209
|
+
exports.DOCKER_MARKER_REGISTERED_AGENT_ID = 'docker-registered-agent-id';
|
|
200
210
|
// Exit code used by the in-container agent to signal "update complete, rebuild image"
|
|
201
211
|
// Must be distinct from 0 (clean stop) and 1 (error) to avoid false restarts on SIGINT.
|
|
202
212
|
exports.DOCKER_UPDATE_EXIT_CODE = 42;
|
|
@@ -208,4 +218,18 @@ exports.UPDATE_BUSY_WAIT_TIMEOUT_MS = 5 * 60 * 1000; // 5 minutes max wait for b
|
|
|
208
218
|
exports.UPDATE_BUSY_POLL_INTERVAL_MS = 3_000; // poll every 3 seconds
|
|
209
219
|
exports.UPDATE_FORCED_BUSY_WAIT_TIMEOUT_MS = 30_000; // 30 seconds for forced updates
|
|
210
220
|
exports.BUSY_QUERY_TIMEOUT_MS = 5_000; // 5 seconds for IPC busy query
|
|
221
|
+
// Delayed restart (reboot / update / docker rebuild)
|
|
222
|
+
exports.DELAYED_RESTART_MS = 1_000;
|
|
223
|
+
// AppSync notification action names
|
|
224
|
+
exports.NOTIFICATION_ACTION = {
|
|
225
|
+
AGENT_COMMAND: 'agent-command',
|
|
226
|
+
CONFIG_UPDATE: 'config-update',
|
|
227
|
+
ALERT_CREATED: 'alert-created',
|
|
228
|
+
AGENT_LOG: 'agent-log',
|
|
229
|
+
};
|
|
230
|
+
// CLI flag constants
|
|
231
|
+
exports.CLI_FLAG_VERBOSE = '--verbose';
|
|
232
|
+
exports.CLI_FLAG_NO_DOCKER = '--no-docker';
|
|
233
|
+
exports.CLI_FLAG_NO_DOCKERFILE_SYNC = '--no-dockerfile-sync';
|
|
234
|
+
exports.CLI_FLAG_NO_AUTO_UPDATE = '--no-auto-update';
|
|
211
235
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-runner.d.ts","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"docker-runner.d.ts","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,KAAK,iBAAiB,EAAoB,MAAM,iBAAiB,CAAA;AAS1E,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAa9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAGtD,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,2FAA2F;IAC3F,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,EAAE,CA6BnE;AAID,4CAA4C;AAC5C,wBAAgB,oBAAoB,IAAI,IAAI,CAE3C;AAsCD,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,EACrC,QAAQ,EAAE,UAAU,CAAC,OAAO,cAAc,CAAC,EAC3C,UAAU,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,EAC7C,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,iBAAiB,GAAG,SAAS,CAsB/B;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CA8IxD;AAGD,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,oBAAoB,EACpB,WAAW,GACZ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAA;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAA;AAClG,YAAY,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAChG,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA"}
|
|
@@ -57,6 +57,7 @@ const pid_manager_1 = require("../pid-manager");
|
|
|
57
57
|
const i18n_1 = require("../i18n");
|
|
58
58
|
const logger_1 = require("../logger");
|
|
59
59
|
const claude_config_validator_1 = require("../utils/claude-config-validator");
|
|
60
|
+
const utils_1 = require("../utils");
|
|
60
61
|
const docker_utils_1 = require("./docker-utils");
|
|
61
62
|
const version_manager_1 = require("./version-manager");
|
|
62
63
|
const dockerfile_sync_1 = require("./dockerfile-sync");
|
|
@@ -64,7 +65,7 @@ const volume_mount_builder_1 = require("./volume-mount-builder");
|
|
|
64
65
|
const docker_supervisor_1 = require("./docker-supervisor");
|
|
65
66
|
const update_handler_1 = require("./update-handler");
|
|
66
67
|
function buildContainerArgs(opts) {
|
|
67
|
-
const args = ['ai-support-agent', 'start',
|
|
68
|
+
const args = ['ai-support-agent', 'start', constants_1.CLI_FLAG_NO_DOCKER];
|
|
68
69
|
if (opts.token) {
|
|
69
70
|
args.push('--token', opts.token);
|
|
70
71
|
}
|
|
@@ -78,10 +79,10 @@ function buildContainerArgs(opts) {
|
|
|
78
79
|
args.push('--heartbeat-interval', String(opts.heartbeatInterval));
|
|
79
80
|
}
|
|
80
81
|
if (opts.verbose) {
|
|
81
|
-
args.push(
|
|
82
|
+
args.push(constants_1.CLI_FLAG_VERBOSE);
|
|
82
83
|
}
|
|
83
84
|
if (opts.autoUpdate === false) {
|
|
84
|
-
args.push(
|
|
85
|
+
args.push(constants_1.CLI_FLAG_NO_AUTO_UPDATE);
|
|
85
86
|
}
|
|
86
87
|
if (opts.updateChannel) {
|
|
87
88
|
args.push('--update-channel', opts.updateChannel);
|
|
@@ -142,7 +143,7 @@ function startHostAutoUpdater(opts, config, projects, supervisor, agentId) {
|
|
|
142
143
|
const resolvedAgentId = agentId ?? config?.agentId ?? os.hostname();
|
|
143
144
|
return (0, auto_updater_1.startAutoUpdater)([client], autoUpdateConfig, () => supervisor.stopAll(), (error) => {
|
|
144
145
|
void client.heartbeat(resolvedAgentId, (0, system_info_1.getSystemInfo)(), error).catch((err) => {
|
|
145
|
-
logger_1.logger.warn(`[auto-update] Failed to send error heartbeat: ${
|
|
146
|
+
logger_1.logger.warn(`[auto-update] Failed to send error heartbeat: ${(0, utils_1.getErrorMessage)(err)}`);
|
|
146
147
|
});
|
|
147
148
|
});
|
|
148
149
|
}
|
|
@@ -252,7 +253,7 @@ function runInDocker(opts) {
|
|
|
252
253
|
process.on('SIGINT', () => forwardSignal('SIGINT'));
|
|
253
254
|
process.on('SIGTERM', () => forwardSignal('SIGTERM'));
|
|
254
255
|
child.on('error', (err) => {
|
|
255
|
-
logger_1.logger.error((0, i18n_1.t)('docker.runFailed', { message: err
|
|
256
|
+
logger_1.logger.error((0, i18n_1.t)('docker.runFailed', { message: (0, utils_1.getErrorMessage)(err) }));
|
|
256
257
|
process.exit(1);
|
|
257
258
|
});
|
|
258
259
|
let closeHandled = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-runner.js","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"docker-runner.js","sourceRoot":"","sources":["../../src/docker/docker-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-supervisor.d.ts","sourceRoot":"","sources":["../../src/docker/docker-supervisor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"docker-supervisor.d.ts","sourceRoot":"","sources":["../../src/docker/docker-supervisor.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAEnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAuBvD,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,IAAI,CAAkB;IAC9B,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,YAAY,CAA0B;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoB;IACnD,6EAA6E;IAC7E,OAAO,CAAC,eAAe,CAA4B;IACnD,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,cAAc,CAA0B;gBAEpC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;IAMnD,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,iBAAiB;IAIzB,OAAO,CAAC,sBAAsB;IAI9B,KAAK,CAAC,QAAQ,EAAE,mBAAmB,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,IAAI,GAAG,IAAI;IAwEjE,OAAO,CAAC,WAAW;YAKL,iBAAiB;IAsD/B,OAAO,CAAC,YAAY;IAuMpB,OAAO,IAAI,IAAI;CAwBhB"}
|
|
@@ -49,6 +49,7 @@ const i18n_1 = require("../i18n");
|
|
|
49
49
|
const logger_1 = require("../logger");
|
|
50
50
|
const pid_manager_1 = require("../pid-manager");
|
|
51
51
|
const api_client_1 = require("../api-client");
|
|
52
|
+
const utils_1 = require("../utils");
|
|
52
53
|
const docker_utils_1 = require("./docker-utils");
|
|
53
54
|
const volume_mount_builder_1 = require("./volume-mount-builder");
|
|
54
55
|
const docker_utils_2 = require("./docker-utils");
|
|
@@ -109,7 +110,7 @@ class DockerSupervisor {
|
|
|
109
110
|
this.spawnProject(project);
|
|
110
111
|
}
|
|
111
112
|
catch (error) {
|
|
112
|
-
const message =
|
|
113
|
+
const message = (0, utils_1.getErrorMessage)(error);
|
|
113
114
|
logger_1.logger.error((0, i18n_1.t)('docker.projectSpawnFailed', { projectCode: project.projectCode, message }));
|
|
114
115
|
}
|
|
115
116
|
}
|
|
@@ -162,7 +163,7 @@ class DockerSupervisor {
|
|
|
162
163
|
return (0, docker_utils_1.resolveImageTag)(projectTag, `${docker_utils_1.IMAGE_NAME}:${this.version}`);
|
|
163
164
|
}
|
|
164
165
|
async rebuildAndRestart(project, projectConfigHostDir, forceIfDockerfileExists = false) {
|
|
165
|
-
const rebuildMarker = path.join(projectConfigHostDir,
|
|
166
|
+
const rebuildMarker = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_REBUILD_NEEDED);
|
|
166
167
|
const projectDockerfile = path.join(projectConfigHostDir, 'Dockerfile');
|
|
167
168
|
const hasMarker = fs.existsSync(rebuildMarker);
|
|
168
169
|
const shouldBuild = hasMarker || (forceIfDockerfileExists && fs.existsSync(projectDockerfile));
|
|
@@ -171,7 +172,7 @@ class DockerSupervisor {
|
|
|
171
172
|
fs.unlinkSync(rebuildMarker);
|
|
172
173
|
// Load the registered agentId before building so build logs are stored under
|
|
173
174
|
// the correct agentId (the one shown in the Web UI), not the host agentId.
|
|
174
|
-
const registeredAgentIdPath = path.join(projectConfigHostDir,
|
|
175
|
+
const registeredAgentIdPath = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_REGISTERED_AGENT_ID);
|
|
175
176
|
if (fs.existsSync(registeredAgentIdPath)) {
|
|
176
177
|
const registeredId = fs.readFileSync(registeredAgentIdPath, 'utf-8').trim();
|
|
177
178
|
if (registeredId && registeredId !== this.getProjectAgentId(project)) {
|
|
@@ -181,8 +182,8 @@ class DockerSupervisor {
|
|
|
181
182
|
if (fs.existsSync(projectDockerfile)) {
|
|
182
183
|
try {
|
|
183
184
|
await (0, project_image_builder_1.buildProjectImage)(project.tenantCode, project.projectCode, this.version, projectDockerfile, this.createProjectApiClient(project), this.getProjectAgentId(project));
|
|
184
|
-
const srcHash = path.join(projectConfigHostDir,
|
|
185
|
-
const dstHash = path.join(projectConfigHostDir,
|
|
185
|
+
const srcHash = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_CUSTOMIZATION_HASH);
|
|
186
|
+
const dstHash = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_BUILT_HASH);
|
|
186
187
|
if (fs.existsSync(srcHash)) {
|
|
187
188
|
fs.copyFileSync(srcHash, dstHash);
|
|
188
189
|
}
|
|
@@ -193,20 +194,20 @@ class DockerSupervisor {
|
|
|
193
194
|
}
|
|
194
195
|
}
|
|
195
196
|
catch (err) {
|
|
196
|
-
const errorMsg =
|
|
197
|
+
const errorMsg = (0, utils_1.getErrorMessage)(err);
|
|
197
198
|
logger_1.logger.error(`[docker] Image build failed: ${errorMsg}`);
|
|
198
199
|
logger_1.logger.warn(`[docker] Container ${this.projectKey(project)} will start with previous image due to build failure.`);
|
|
199
200
|
const buildErrorPath = path.join(projectConfigHostDir, 'docker-build-error');
|
|
200
201
|
const truncatedError = errorMsg.length > 3000 ? errorMsg.substring(0, 3000) + '...(truncated)' : errorMsg;
|
|
201
202
|
/* istanbul ignore next */
|
|
202
203
|
try {
|
|
203
|
-
|
|
204
|
+
(0, utils_1.atomicWriteFile)(buildErrorPath, truncatedError);
|
|
204
205
|
}
|
|
205
206
|
catch (writeErr) {
|
|
206
|
-
logger_1.logger.warn(`[docker] Failed to write build error file: ${
|
|
207
|
+
logger_1.logger.warn(`[docker] Failed to write build error file: ${(0, utils_1.getErrorMessage)(writeErr)}`);
|
|
207
208
|
}
|
|
208
|
-
const srcHash = path.join(projectConfigHostDir,
|
|
209
|
-
const dstHash = path.join(projectConfigHostDir,
|
|
209
|
+
const srcHash = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_CUSTOMIZATION_HASH);
|
|
210
|
+
const dstHash = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_BUILT_HASH);
|
|
210
211
|
if (fs.existsSync(srcHash)) {
|
|
211
212
|
fs.copyFileSync(srcHash, dstHash);
|
|
212
213
|
}
|
|
@@ -220,8 +221,8 @@ class DockerSupervisor {
|
|
|
220
221
|
const projectConfigHostDir = (0, project_config_1.getProjectConfigHostDir)(project);
|
|
221
222
|
// Pre-startup hash check: if docker-customization-hash !== docker-built-hash,
|
|
222
223
|
// rebuild before starting the container
|
|
223
|
-
const customizationHashPath = path.join(projectConfigHostDir,
|
|
224
|
-
const builtHashPath = path.join(projectConfigHostDir,
|
|
224
|
+
const customizationHashPath = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_CUSTOMIZATION_HASH);
|
|
225
|
+
const builtHashPath = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_BUILT_HASH);
|
|
225
226
|
if (fs.existsSync(customizationHashPath) && fs.existsSync(builtHashPath)) {
|
|
226
227
|
const customizationHash = fs.readFileSync(customizationHashPath, 'utf-8').trim();
|
|
227
228
|
const builtHash = fs.readFileSync(builtHashPath, 'utf-8').trim();
|
|
@@ -232,7 +233,7 @@ class DockerSupervisor {
|
|
|
232
233
|
}
|
|
233
234
|
}
|
|
234
235
|
// Load the server-assigned agentId written by the container after registration.
|
|
235
|
-
const registeredAgentIdPath = path.join(projectConfigHostDir,
|
|
236
|
+
const registeredAgentIdPath = path.join(projectConfigHostDir, constants_1.DOCKER_MARKER_REGISTERED_AGENT_ID);
|
|
236
237
|
if (fs.existsSync(registeredAgentIdPath)) {
|
|
237
238
|
const registeredId = fs.readFileSync(registeredAgentIdPath, 'utf-8').trim();
|
|
238
239
|
if (registeredId && registeredId !== this.getProjectAgentId(project)) {
|
|
@@ -242,7 +243,7 @@ class DockerSupervisor {
|
|
|
242
243
|
}
|
|
243
244
|
const { mounts, envArgs } = (0, volume_mount_builder_1.buildProjectVolumeMounts)(project, projectConfigHostDir);
|
|
244
245
|
const containerArgs = [
|
|
245
|
-
'ai-support-agent', 'start',
|
|
246
|
+
'ai-support-agent', 'start', constants_1.CLI_FLAG_NO_DOCKER,
|
|
246
247
|
'--project', key,
|
|
247
248
|
];
|
|
248
249
|
if (this.opts.pollInterval !== undefined) {
|
|
@@ -252,10 +253,10 @@ class DockerSupervisor {
|
|
|
252
253
|
containerArgs.push('--heartbeat-interval', String(this.opts.heartbeatInterval));
|
|
253
254
|
}
|
|
254
255
|
if (this.opts.verbose) {
|
|
255
|
-
containerArgs.push(
|
|
256
|
+
containerArgs.push(constants_1.CLI_FLAG_VERBOSE);
|
|
256
257
|
}
|
|
257
258
|
if (this.opts.autoUpdate === false) {
|
|
258
|
-
containerArgs.push(
|
|
259
|
+
containerArgs.push(constants_1.CLI_FLAG_NO_AUTO_UPDATE);
|
|
259
260
|
}
|
|
260
261
|
if (this.opts.updateChannel) {
|
|
261
262
|
containerArgs.push('--update-channel', this.opts.updateChannel);
|
|
@@ -306,7 +307,7 @@ class DockerSupervisor {
|
|
|
306
307
|
let registeredIdWatcher = noopWatcher;
|
|
307
308
|
try {
|
|
308
309
|
registeredIdWatcher = fs.watch(projectConfigHostDir, (eventType, filename) => {
|
|
309
|
-
if (filename ===
|
|
310
|
+
if (filename === constants_1.DOCKER_MARKER_REGISTERED_AGENT_ID && (eventType === 'rename' || eventType === 'change')) {
|
|
310
311
|
try {
|
|
311
312
|
const newId = fs.readFileSync(registeredAgentIdPath, 'utf-8').trim();
|
|
312
313
|
const currentId = supervisor.getProjectAgentId(project);
|
|
@@ -351,20 +352,25 @@ class DockerSupervisor {
|
|
|
351
352
|
child.on('close', () => {
|
|
352
353
|
registeredIdWatcher.close();
|
|
353
354
|
clearInterval(flushTimer);
|
|
354
|
-
void
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
.
|
|
355
|
+
void (async () => {
|
|
356
|
+
try {
|
|
357
|
+
await flush();
|
|
358
|
+
if (fullLog) {
|
|
359
|
+
await apiClient.saveSessionLog({ agentId: getAgentId(), projectCode: project.projectCode, logType: 'container', sessionId, content: fullLog })
|
|
360
|
+
.catch((e) => logger_1.logger.warn(`[docker] S3 upload failed: ${e}`));
|
|
361
|
+
}
|
|
359
362
|
}
|
|
360
|
-
|
|
363
|
+
catch /* istanbul ignore next */ {
|
|
364
|
+
// ignore flush / saveSessionLog errors — always resolve so shutdown can proceed
|
|
365
|
+
}
|
|
366
|
+
finally {
|
|
361
367
|
handle.resolveClosed();
|
|
362
368
|
}
|
|
363
|
-
})
|
|
369
|
+
})();
|
|
364
370
|
});
|
|
365
371
|
}
|
|
366
372
|
child.on('error', (err) => {
|
|
367
|
-
logger_1.logger.error(`[docker] Container error for ${key}: ${err
|
|
373
|
+
logger_1.logger.error(`[docker] Container error for ${key}: ${(0, utils_1.getErrorMessage)(err)}`);
|
|
368
374
|
});
|
|
369
375
|
child.on('close', (code) => {
|
|
370
376
|
if (handle.closeHandled)
|
|
@@ -381,7 +387,7 @@ class DockerSupervisor {
|
|
|
381
387
|
logger_1.logger.info(`[docker] Container ${key} exited for update. Stopping all containers and rebuilding...`);
|
|
382
388
|
this.stopAll();
|
|
383
389
|
void (0, update_handler_1.installUpdateAndRestart)(projectConfigHostDir).catch((err) => {
|
|
384
|
-
logger_1.logger.error(`[docker] Update failed: ${
|
|
390
|
+
logger_1.logger.error(`[docker] Update failed: ${(0, utils_1.getErrorMessage)(err)}`);
|
|
385
391
|
process.exit(1);
|
|
386
392
|
});
|
|
387
393
|
return;
|
|
@@ -389,7 +395,7 @@ class DockerSupervisor {
|
|
|
389
395
|
if (code === constants_1.DOCKER_RESTART_EXIT_CODE && !this.updating) {
|
|
390
396
|
logger_1.logger.info(`[docker] Container ${key} requested restart. Rebuilding image if needed...`);
|
|
391
397
|
void this.rebuildAndRestart(project, projectConfigHostDir, true).catch((err) => {
|
|
392
|
-
logger_1.logger.error(`[docker] Restart failed: ${
|
|
398
|
+
logger_1.logger.error(`[docker] Restart failed: ${(0, utils_1.getErrorMessage)(err)}`);
|
|
393
399
|
});
|
|
394
400
|
return;
|
|
395
401
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-supervisor.js","sourceRoot":"","sources":["../../src/docker/docker-supervisor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-supervisor.js","sourceRoot":"","sources":["../../src/docker/docker-supervisor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerfile-sync.d.ts","sourceRoot":"","sources":["../../src/docker/dockerfile-sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"dockerfile-sync.d.ts","sourceRoot":"","sources":["../../src/docker/dockerfile-sync.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,IAAI,CAuBhD"}
|
|
@@ -46,6 +46,7 @@ const config_manager_1 = require("../config-manager");
|
|
|
46
46
|
const dockerfile_path_1 = require("./dockerfile-path");
|
|
47
47
|
const i18n_1 = require("../i18n");
|
|
48
48
|
const logger_1 = require("../logger");
|
|
49
|
+
const utils_1 = require("../utils");
|
|
49
50
|
/**
|
|
50
51
|
* Copy the bundled Dockerfile (and entrypoint.sh) to the config directory
|
|
51
52
|
* on first run so users can customise it.
|
|
@@ -70,7 +71,7 @@ function syncDockerfileToConfigDir() {
|
|
|
70
71
|
logger_1.logger.info((0, i18n_1.t)('docker.dockerfileSynced', { path: destDockerfile }));
|
|
71
72
|
}
|
|
72
73
|
catch (err) {
|
|
73
|
-
logger_1.logger.warn((0, i18n_1.t)('docker.dockerfileSyncFailed', { message:
|
|
74
|
+
logger_1.logger.warn((0, i18n_1.t)('docker.dockerfileSyncFailed', { message: (0, utils_1.getErrorMessage)(err) }));
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
//# sourceMappingURL=dockerfile-sync.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerfile-sync.js","sourceRoot":"","sources":["../../src/docker/dockerfile-sync.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"dockerfile-sync.js","sourceRoot":"","sources":["../../src/docker/dockerfile-sync.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgBH,8DAuBC;AArCD,uCAAwB;AACxB,2CAA4B;AAE5B,sDAAgD;AAChD,uDAA0E;AAC1E,kCAA2B;AAC3B,sCAAkC;AAClC,oCAA0C;AAE1C;;;;GAIG;AACH,SAAgB,yBAAyB;IACvC,MAAM,SAAS,GAAG,IAAA,6BAAY,GAAE,CAAA;IAChC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;IAEzD,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC;QAAE,OAAM,CAAC,yBAAyB;IAEnE,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,IAAA,mCAAiB,GAAE,CAAA;QACzC,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACzD,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,cAAc,CAAC,CAAA;QAE9C,2EAA2E;QAC3E,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,qCAAmB,GAAE,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;QACjF,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAA;QACtE,IAAI,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YAC/D,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,cAAc,CAAC,CAAA;QAChD,CAAC;QAED,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,yBAAyB,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAA;IACrE,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;IAClF,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../src/docker/project-config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"project-config.d.ts","sourceRoot":"","sources":["../../src/docker/project-config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAGnD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,mBAAmB,GAAG,MAAM,CAE5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAe1E"}
|
|
@@ -44,6 +44,7 @@ const fs = __importStar(require("fs"));
|
|
|
44
44
|
const path = __importStar(require("path"));
|
|
45
45
|
const config_manager_1 = require("../config-manager");
|
|
46
46
|
const logger_1 = require("../logger");
|
|
47
|
+
const utils_1 = require("../utils");
|
|
47
48
|
/**
|
|
48
49
|
* Get the host-side per-project config directory.
|
|
49
50
|
* Located at: ~/.ai-support-agent/projects/{tenantCode}/{projectCode}/.ai-support-agent/
|
|
@@ -74,7 +75,7 @@ function migrateProjectConfigDir(project) {
|
|
|
74
75
|
logger_1.logger.info(`[docker] Migrated project config dir: ${legacyDir} → ${newDir}`);
|
|
75
76
|
}
|
|
76
77
|
catch (err) {
|
|
77
|
-
logger_1.logger.warn(`[docker] Failed to migrate project config dir for ${project.projectCode}: ${
|
|
78
|
+
logger_1.logger.warn(`[docker] Failed to migrate project config dir for ${project.projectCode}: ${(0, utils_1.getErrorMessage)(err)}`);
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
//# sourceMappingURL=project-config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../../src/docker/project-config.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"project-config.js","sourceRoot":"","sources":["../../src/docker/project-config.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcH,0DAEC;AAWD,0DAeC;AAxCD,uCAAwB;AACxB,2CAA4B;AAE5B,sDAAgD;AAChD,sCAAkC;AAElC,oCAA0C;AAE1C;;;GAGG;AACH,SAAgB,uBAAuB,CAAC,OAA4B;IAClE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAA,6BAAY,GAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,EAAE,mBAAmB,CAAC,CAAA;AAC5G,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,uBAAuB,CAAC,OAA4B;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,6BAAY,GAAE,EAAE,UAAU,CAAC,CAAA;IACxD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAA;IAE7E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAM,CAAO,qBAAqB;IACjE,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAM,CAAY,mBAAmB;IAEhE,IAAI,CAAC;QACH,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACzF,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAChC,eAAM,CAAC,IAAI,CAAC,yCAAyC,SAAS,MAAM,MAAM,EAAE,CAAC,CAAA;IAC/E,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,eAAM,CAAC,IAAI,CAAC,qDAAqD,OAAO,CAAC,WAAW,KAAK,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAClH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-manager.d.ts","sourceRoot":"","sources":["../../src/docker/version-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"version-manager.d.ts","sourceRoot":"","sources":["../../src/docker/version-manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAYH;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,CAoB5C;AAED;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD;AAED,wBAAgB,WAAW,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAU7D"}
|
|
@@ -28,8 +28,7 @@ function getInstalledVersion() {
|
|
|
28
28
|
if (cachedInstalledVersion !== null)
|
|
29
29
|
return cachedInstalledVersion;
|
|
30
30
|
try {
|
|
31
|
-
const
|
|
32
|
-
const output = (0, child_process_1.execFileSync)(npmCmd, ['list', '-g', '--json', '--depth=0'], {
|
|
31
|
+
const output = (0, child_process_1.execFileSync)(constants_1.NPM_COMMAND, ['list', '-g', '--json', '--depth=0'], {
|
|
33
32
|
encoding: 'utf-8',
|
|
34
33
|
timeout: 10_000,
|
|
35
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-manager.js","sourceRoot":"","sources":["../../src/docker/version-manager.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAqBH,
|
|
1
|
+
{"version":3,"file":"version-manager.js","sourceRoot":"","sources":["../../src/docker/version-manager.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAqBH,kDAoBC;AAKD,gEAEC;AAED,kCAUC;AA1DD,iDAA4C;AAE5C,4CAAyD;AACzD,8CAAiE;AACjE,iDAAwD;AACxD,kCAA2B;AAC3B,sCAAkC;AAElC,IAAI,sBAAsB,GAAkB,IAAI,CAAA;AAEhD;;;;;;;;GAQG;AACH,SAAgB,mBAAmB;IACjC,IAAI,sBAAsB,KAAK,IAAI;QAAE,OAAO,sBAAsB,CAAA;IAClE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,uBAAW,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE;YAC9E,QAAQ,EAAE,OAAO;YACjB,OAAO,EAAE,MAAM;SAChB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAE/B,CAAA;QACD,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC,uBAAuB,CAAC,EAAE,OAAO,CAAA;QACvE,IAAI,OAAO,IAAI,IAAA,wBAAc,EAAC,OAAO,CAAC,EAAE,CAAC;YACvC,sBAAsB,GAAG,OAAO,CAAA;YAChC,OAAO,OAAO,CAAA;QAChB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,sDAAsD;IACxD,CAAC;IACD,sBAAsB,GAAG,yBAAa,CAAA;IACtC,OAAO,yBAAa,CAAA;AACtB,CAAC;AAED;;GAEG;AACH,SAAgB,0BAA0B;IACxC,sBAAsB,GAAG,IAAI,CAAA;AAC/B,CAAC;AAED,SAAgB,WAAW,CAAC,gBAAyB;IACnD,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAA;IAC9C,yEAAyE;IACzE,MAAM,OAAO,GAAG,IAAA,wBAAc,EAAC,yBAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,yBAAa,CAAA;IAClG,IAAI,CAAC,IAAA,0BAAW,EAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,IAAA,yBAAU,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAA;IACvC,CAAC;SAAM,CAAC;QACN,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;IAClD,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"volume-mount-builder.d.ts","sourceRoot":"","sources":["../../src/docker/volume-mount-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"volume-mount-builder.d.ts","sourceRoot":"","sources":["../../src/docker/volume-mount-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAInD,2DAA2D;AAC3D,eAAO,MAAM,uBAAuB,wBAAwB,CAAA;AAC5D,wCAAwC;AACxC,eAAO,MAAM,cAAc,eAAe,CAAA;AAE1C,+DAA+D;AAC/D,eAAO,MAAM,oBAAoB,UAMhC,CAAA;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACpB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,eAAe,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAmE9F;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAsC3E;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,mBAAmB,EAC5B,oBAAoB,EAAE,MAAM,GAC3B;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAoHzC"}
|
|
@@ -49,6 +49,7 @@ const config_manager_1 = require("../config-manager");
|
|
|
49
49
|
const i18n_1 = require("../i18n");
|
|
50
50
|
const logger_1 = require("../logger");
|
|
51
51
|
const security_1 = require("../security");
|
|
52
|
+
const utils_1 = require("../utils");
|
|
52
53
|
const docker_utils_1 = require("./docker-utils");
|
|
53
54
|
/** Container-internal base path for project directories */
|
|
54
55
|
exports.CONTAINER_PROJECTS_BASE = '/workspace/projects';
|
|
@@ -271,7 +272,7 @@ function buildProjectVolumeMounts(project, projectConfigHostDir) {
|
|
|
271
272
|
catch (error) {
|
|
272
273
|
// Don't fail the install — but DO surface the warning so multi-user
|
|
273
274
|
// hosts aren't silently left with a 0o755 bind-mount source.
|
|
274
|
-
const message =
|
|
275
|
+
const message = (0, utils_1.getErrorMessage)(error);
|
|
275
276
|
logger_1.logger.warn((0, i18n_1.t)('docker.projectDirChmodFailed', { path: defaultHostProjectDir, message }));
|
|
276
277
|
}
|
|
277
278
|
mounts.push('-v', `${defaultHostProjectDir}:${containerProjectDir}:rw`);
|