@ai-support-agent/cli 0.1.29-beta.1 → 0.1.29-beta.2
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/cli/service/darwin-service.js +2 -2
- package/dist/cli/service/darwin-service.js.map +1 -1
- package/dist/cli/service/wrapper-helpers.d.ts +5 -2
- package/dist/cli/service/wrapper-helpers.d.ts.map +1 -1
- package/dist/cli/service/wrapper-helpers.js +14 -13
- package/dist/cli/service/wrapper-helpers.js.map +1 -1
- package/dist/commands/file-transfer.d.ts +10 -0
- package/dist/commands/file-transfer.d.ts.map +1 -1
- package/dist/commands/file-transfer.js +15 -10
- package/dist/commands/file-transfer.js.map +1 -1
- package/dist/commands/process-executor.d.ts.map +1 -1
- package/dist/commands/process-executor.js +2 -3
- package/dist/commands/process-executor.js.map +1 -1
- package/dist/config-manager.d.ts.map +1 -1
- package/dist/config-manager.js +7 -2
- package/dist/config-manager.js.map +1 -1
- package/dist/constants.d.ts +5 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +13 -3
- package/dist/constants.js.map +1 -1
- package/dist/docker/docker-supervisor.d.ts.map +1 -1
- package/dist/docker/docker-supervisor.js +6 -10
- package/dist/docker/docker-supervisor.js.map +1 -1
- package/dist/docker/docker-utils.d.ts.map +1 -1
- package/dist/docker/docker-utils.js +3 -3
- package/dist/docker/docker-utils.js.map +1 -1
- package/dist/docker/dockerfile-generator.d.ts +9 -0
- package/dist/docker/dockerfile-generator.d.ts.map +1 -1
- package/dist/docker/dockerfile-generator.js +20 -2
- package/dist/docker/dockerfile-generator.js.map +1 -1
- package/dist/docker/project-image-builder.d.ts.map +1 -1
- package/dist/docker/project-image-builder.js +5 -8
- package/dist/docker/project-image-builder.js.map +1 -1
- package/dist/docker/volume-mount-builder.d.ts +6 -0
- package/dist/docker/volume-mount-builder.d.ts.map +1 -1
- package/dist/docker/volume-mount-builder.js +38 -30
- package/dist/docker/volume-mount-builder.js.map +1 -1
- package/dist/mcp/tools/browser/browser-session.d.ts +14 -0
- package/dist/mcp/tools/browser/browser-session.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-session.js +51 -0
- package/dist/mcp/tools/browser/browser-session.js.map +1 -1
- package/dist/mcp/tools/credentials.js +3 -3
- package/dist/mcp/tools/credentials.js.map +1 -1
- package/dist/mcp/tools/db-query.js +1 -1
- package/dist/mcp/tools/db-query.js.map +1 -1
- package/dist/mcp/tools/db-schemas.js +1 -1
- package/dist/mcp/tools/db-schemas.js.map +1 -1
- package/dist/mcp/tools/file-upload.js +2 -2
- package/dist/mcp/tools/file-upload.js.map +1 -1
- package/dist/mcp/tools/mcp-response.d.ts +10 -0
- package/dist/mcp/tools/mcp-response.d.ts.map +1 -1
- package/dist/mcp/tools/mcp-response.js +8 -0
- package/dist/mcp/tools/mcp-response.js.map +1 -1
- package/dist/mcp/tools/mcp-response.spec.js +22 -0
- package/dist/mcp/tools/mcp-response.spec.js.map +1 -1
- package/dist/mcp/tools/project-info.js +1 -1
- package/dist/mcp/tools/project-info.js.map +1 -1
- package/dist/pending-result-store.d.ts.map +1 -1
- package/dist/pending-result-store.js +14 -8
- package/dist/pending-result-store.js.map +1 -1
- package/dist/pid-manager.d.ts.map +1 -1
- package/dist/pid-manager.js +1 -4
- package/dist/pid-manager.js.map +1 -1
- package/dist/project-agent.d.ts.map +1 -1
- package/dist/project-agent.js +6 -2
- package/dist/project-agent.js.map +1 -1
- package/dist/project-config-sync.d.ts.map +1 -1
- package/dist/project-config-sync.js +2 -1
- package/dist/project-config-sync.js.map +1 -1
- package/dist/project-dir.d.ts.map +1 -1
- package/dist/project-dir.js +6 -16
- package/dist/project-dir.js.map +1 -1
- package/dist/repo-sync.d.ts +14 -0
- package/dist/repo-sync.d.ts.map +1 -1
- package/dist/repo-sync.js +31 -11
- package/dist/repo-sync.js.map +1 -1
- package/dist/retry-strategy.d.ts +11 -0
- package/dist/retry-strategy.d.ts.map +1 -1
- package/dist/retry-strategy.js +5 -2
- package/dist/retry-strategy.js.map +1 -1
- package/dist/utils/claude-settings.d.ts.map +1 -1
- package/dist/utils/claude-settings.js +1 -3
- package/dist/utils/claude-settings.js.map +1 -1
- package/dist/utils.d.ts +36 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +47 -0
- package/dist/utils.js.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.d.ts +4 -2
- package/dist/vscode/vscode-tunnel-websocket.d.ts.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.js +21 -0
- package/dist/vscode/vscode-tunnel-websocket.js.map +1 -1
- package/dist/ws-reconnect.d.ts.map +1 -1
- package/dist/ws-reconnect.js +6 -4
- package/dist/ws-reconnect.js.map +1 -1
- package/package.json +1 -1
|
@@ -57,10 +57,6 @@ const project_image_builder_1 = require("./project-image-builder");
|
|
|
57
57
|
const path_utils_1 = require("../utils/path-utils");
|
|
58
58
|
const project_config_1 = require("./project-config");
|
|
59
59
|
const update_handler_1 = require("./update-handler");
|
|
60
|
-
/** Maximum total log size kept in memory per session (2 MB). */
|
|
61
|
-
const MAX_SESSION_LOG_BYTES = 2 * 1024 * 1024;
|
|
62
|
-
// API の SubmitLogChunkDto.text @MaxLength に合わせた上限(100,000 バイト)
|
|
63
|
-
const MAX_LOG_CHUNK_BYTES = 100_000;
|
|
64
60
|
class DockerSupervisor {
|
|
65
61
|
handles = new Map();
|
|
66
62
|
updating = false;
|
|
@@ -201,7 +197,7 @@ class DockerSupervisor {
|
|
|
201
197
|
logger_1.logger.error(`[docker] Image build failed: ${errorMsg}`);
|
|
202
198
|
logger_1.logger.warn(`[docker] Container ${this.projectKey(project)} will start with previous image due to build failure.`);
|
|
203
199
|
const buildErrorPath = path.join(projectConfigHostDir, 'docker-build-error');
|
|
204
|
-
const truncatedError = errorMsg.length >
|
|
200
|
+
const truncatedError = errorMsg.length > constants_1.DOCKER_BUILD_ERROR_MAX_BYTES ? errorMsg.substring(0, constants_1.DOCKER_BUILD_ERROR_MAX_BYTES) + '...(truncated)' : errorMsg;
|
|
205
201
|
/* istanbul ignore next */
|
|
206
202
|
try {
|
|
207
203
|
(0, utils_1.atomicWriteFile)(buildErrorPath, truncatedError);
|
|
@@ -334,24 +330,24 @@ class DockerSupervisor {
|
|
|
334
330
|
const text = buf;
|
|
335
331
|
buf = '';
|
|
336
332
|
if (!logTruncated) {
|
|
337
|
-
if (fullLog.length + text.length <=
|
|
333
|
+
if (fullLog.length + text.length <= constants_1.DOCKER_MAX_SESSION_LOG_BYTES) {
|
|
338
334
|
fullLog += text;
|
|
339
335
|
}
|
|
340
336
|
else {
|
|
341
|
-
const remaining =
|
|
337
|
+
const remaining = constants_1.DOCKER_MAX_SESSION_LOG_BYTES - fullLog.length;
|
|
342
338
|
fullLog += remaining > 0 ? text.slice(0, remaining) : '';
|
|
343
339
|
logTruncated = true;
|
|
344
340
|
logger_1.logger.warn(`[docker] Container log for ${key} exceeded 2 MB limit; remaining output will not be saved to S3`);
|
|
345
341
|
}
|
|
346
342
|
}
|
|
347
343
|
// 1 フラッシュのテキストが API 上限を超える場合は分割して送信
|
|
348
|
-
for (let offset = 0; offset < text.length; offset +=
|
|
349
|
-
const slice = text.slice(offset, offset +
|
|
344
|
+
for (let offset = 0; offset < text.length; offset += constants_1.DOCKER_MAX_LOG_CHUNK_BYTES) {
|
|
345
|
+
const slice = text.slice(offset, offset + constants_1.DOCKER_MAX_LOG_CHUNK_BYTES);
|
|
350
346
|
await apiClient.submitLogChunk({ agentId: getAgentId(), projectCode: project.projectCode, logType: 'container', sessionId, seq: ++seq, text: slice })
|
|
351
347
|
.catch((e) => logger_1.logger.warn(`[docker] log chunk failed: ${e}`));
|
|
352
348
|
}
|
|
353
349
|
};
|
|
354
|
-
const flushTimer = setInterval(() => { void flush(); },
|
|
350
|
+
const flushTimer = setInterval(() => { void flush(); }, constants_1.DOCKER_LOG_FLUSH_INTERVAL_MS).unref();
|
|
355
351
|
const writeStdout = (0, logger_1.makeLinePrefixer)(logPrefix, (s) => process.stdout.write(s));
|
|
356
352
|
const writeStderr = (0, logger_1.makeLinePrefixer)(logPrefix, (s) => process.stderr.write(s));
|
|
357
353
|
child.stdout?.on('data', (d) => { const t = d.toString(); writeStdout(t); buf += t; });
|
|
@@ -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":"docker-utils.d.ts","sourceRoot":"","sources":["../../src/docker/docker-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"docker-utils.d.ts","sourceRoot":"","sources":["../../src/docker/docker-utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAK5C,eAAO,MAAM,UAAU,qBAAqB,CAAA;AAoE5C,wBAAgB,aAAa,IAAI,MAAM,CAMtC;AAED,4EAA4E;AAC5E,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C;AAED,wBAAgB,oBAAoB,IAAI,OAAO,CAO9C;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAOpD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAY3E;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAIpG;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAMhE;AAED,wBAAgB,WAAW,IAAI,IAAI,CAWlC;AAED,yEAAyE;AACzE,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAG5C;AAED;;;;GAIG;AACH,wBAAgB,cAAc,IAAI,MAAM,EAAE,CAYzC;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAWtC;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAO3E;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}
|
|
@@ -61,6 +61,7 @@ const constants_1 = require("../constants");
|
|
|
61
61
|
Object.defineProperty(exports, "AGENT_VERSION", { enumerable: true, get: function () { return constants_1.AGENT_VERSION; } });
|
|
62
62
|
const i18n_1 = require("../i18n");
|
|
63
63
|
const logger_1 = require("../logger");
|
|
64
|
+
const utils_1 = require("../utils");
|
|
64
65
|
exports.IMAGE_NAME = 'ai-support-agent';
|
|
65
66
|
/**
|
|
66
67
|
* Resolve the docker binary path, searching common locations when `docker` is
|
|
@@ -170,10 +171,9 @@ function buildImage(version, customDockerfile) {
|
|
|
170
171
|
* All components are lowercased and non-alphanumeric chars (except hyphens) are replaced with hyphens.
|
|
171
172
|
*/
|
|
172
173
|
function buildContainerName(tenantCode, projectCode, agentId) {
|
|
173
|
-
const
|
|
174
|
-
const parts = ['ai', sanitize(tenantCode), sanitize(projectCode)];
|
|
174
|
+
const parts = ['ai', (0, utils_1.sanitizeNameSegment)(tenantCode), (0, utils_1.sanitizeNameSegment)(projectCode)];
|
|
175
175
|
if (agentId)
|
|
176
|
-
parts.push(
|
|
176
|
+
parts.push((0, utils_1.sanitizeNameSegment)(agentId));
|
|
177
177
|
return parts.join('-');
|
|
178
178
|
}
|
|
179
179
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-utils.js","sourceRoot":"","sources":["../../src/docker/docker-utils.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"docker-utils.js","sourceRoot":"","sources":["../../src/docker/docker-utils.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiFH,sCAMC;AAGD,oDAGC;AAED,oDAOC;AAED,kCAOC;AAED,gCAYC;AAOD,gDAIC;AAOD,oDAMC;AAED,kCAWC;AAGD,0CAEC;AAOD,gDAGC;AAOD,wCAYC;AAMD,sCAWC;AAGD,0CAOC;AA7ND,iDAA4C;AAC5C,uCAAwB;AACxB,uCAAwB;AACxB,2CAA4B;AAE5B,uDAAqD;AACrD,4CAA4C;AAyNnC,8FAzNA,yBAAa,OAyNA;AAxNtB,kCAA2B;AAC3B,sCAAkC;AAClC,oCAA8C;AAEjC,QAAA,UAAU,GAAG,kBAAkB,CAAA;AAE5C;;;;GAIG;AACH,SAAS,iBAAiB;IACxB,yDAAyD;IACzD,0EAA0E;IAC1E,MAAM,UAAU,GAAG;QACjB,uBAAuB;QACvB,0BAA0B;QAC1B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC;QACnD,wDAAwD;QACxD,iBAAiB;KAClB,CAAA;IACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IACD,iEAAiE;IACjE,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,sBAAsB;IAC7B,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAA;IACzB,OAAO;QACL,0BAA0B;QAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC;QAChD,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC;QACpD,gCAAgC;QAChC,sBAAsB;QACtB,wBAAwB;QACxB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,CAAC;KACrD,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB;IACvB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW;QAAE,OAAM;IACnC,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,EAAE,CAAC;QAC9C,IAAI,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,UAAU,MAAM,EAAE,CAAA;YAC5C,OAAM;QACR,CAAC;IACH,CAAC;AACH,CAAC;AAED,IAAI,WAA+B,CAAA;AAEnC,SAAgB,aAAa;IAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,gBAAgB,EAAE,CAAA;QAClB,WAAW,GAAG,iBAAiB,EAAE,CAAA;IACnC,CAAC;IACD,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,4EAA4E;AAC5E,SAAgB,oBAAoB;IAClC,WAAW,GAAG,SAAS,CAAA;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAA;AAChC,CAAC;AAED,SAAgB,oBAAoB;IAClC,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,aAAa,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC5D,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAgB,WAAW,CAAC,OAAe;IACzC,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,aAAa,EAAE,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,kBAAU,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QACpG,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAgB,UAAU,CAAC,OAAe,EAAE,gBAAyB;IACnE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,IAAA,mCAAiB,EAAC,gBAAgB,CAAC,CAAA;IAC1E,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,iBAAiB,CAAC,CAAC,CAAA;IACjC,IAAI,gBAAgB,EAAE,CAAC;QACrB,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,8BAA8B,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,CAAA;IAC1E,CAAC;IACD,IAAA,4BAAY,EACV,aAAa,EAAE,EACf,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,kBAAU,IAAI,OAAO,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,iBAAiB,OAAO,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,EACxI,EAAE,KAAK,EAAE,SAAS,EAAE,CACrB,CAAA;IACD,eAAM,CAAC,OAAO,CAAC,IAAA,QAAC,EAAC,sBAAsB,CAAC,CAAC,CAAA;AAC3C,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,UAAkB,EAAE,WAAmB,EAAE,OAAgB;IAC1F,MAAM,KAAK,GAAG,CAAC,IAAI,EAAE,IAAA,2BAAmB,EAAC,UAAU,CAAC,EAAE,IAAA,2BAAmB,EAAC,WAAW,CAAC,CAAC,CAAA;IACvF,IAAI,OAAO;QAAE,KAAK,CAAC,IAAI,CAAC,IAAA,2BAAmB,EAAC,OAAO,CAAC,CAAC,CAAA;IACrD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAC,aAAqB;IACxD,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IACjF,CAAC;IAAC,MAAM,CAAC;QACP,wDAAwD;IAC1D,CAAC;AACH,CAAC;AAED,SAAgB,WAAW;IACzB,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,mBAAmB,CAAC,CAAC,CAAA;IACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACf,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;IACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACf,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,mBAAmB,CAAC,CAAC,CAAA;IACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACf,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAA;IACvD,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;IACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACf,eAAM,CAAC,IAAI,CAAC,IAAA,QAAC,EAAC,mBAAmB,CAAC,CAAC,CAAA;AACrC,CAAC;AAED,yEAAyE;AACzE,SAAgB,eAAe,CAAC,YAAoB;IAClD,OAAO,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAC1D,CAAC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB;IAChC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;IACnD,OAAO,CAAC,CAAE,OAAiD,CAAC,GAAG,CAAC,CAAA;AAClE,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc;IAC5B,IAAI,CAAC,kBAAkB,EAAE;QAAE,OAAO,EAAE,CAAA;IACpC,mEAAmE;IACnE,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;IACzD,MAAM,aAAa,GAAG,mDAAmD,CAAA;IACzE,OAAO;QACL,IAAI,EAAE,GAAG,OAAO,IAAI,aAAa,UAAU;QAC3C,IAAI,EAAE,GAAG,UAAU,IAAI,aAAa,kBAAkB;KACvD,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,aAAa;IAC3B,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAA;IACpB,MAAM,GAAG,GAAG,CAAC,CAAS,EAAE,GAAG,GAAG,CAAC,EAAU,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACxE,OAAO,CACL,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACvB,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACrB,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAChB,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjB,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;QACnB,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CACpB,CAAA;AACH,CAAC;AAED,iFAAiF;AACjF,SAAgB,eAAe,CAAC,UAAkB,EAAE,OAAe;IACjE,IAAI,CAAC;QACH,IAAA,4BAAY,EAAC,aAAa,EAAE,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;QACpF,OAAO,UAAU,CAAA;IACnB,CAAC;IAAC,MAAM,0BAA0B,CAAC,CAAC;QAClC,OAAO,OAAO,CAAA;IAChB,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,15 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Per-project Dockerfile generation
|
|
3
3
|
*/
|
|
4
|
+
/**
|
|
5
|
+
* Safe, non-sensitive system environment variables forwarded to `docker build`.
|
|
6
|
+
*
|
|
7
|
+
* These are OS-level vars that affect build tooling (locale, paths, temp dirs)
|
|
8
|
+
* but carry no secrets. Sensitive vars such as ANTHROPIC_API_KEY or
|
|
9
|
+
* AI_SUPPORT_AGENT_TOKEN must NOT appear here — they belong in PASSTHROUGH_ENV_VARS
|
|
10
|
+
* (volume-mount-builder.ts) and are injected only at `docker run` time.
|
|
11
|
+
*/
|
|
12
|
+
export declare const BUILD_ENV_PASSTHROUGH_KEYS: readonly ["PATH", "HOME", "USER", "TMPDIR", "TMP", "TEMP", "LANG", "LC_ALL"];
|
|
4
13
|
/**
|
|
5
14
|
* Generate a per-project Dockerfile that extends the base agent image.
|
|
6
15
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerfile-generator.d.ts","sourceRoot":"","sources":["../../src/docker/dockerfile-generator.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EAAE,EACrB,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,GAAE,MAAM,EAAO,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAoCR;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"dockerfile-generator.d.ts","sourceRoot":"","sources":["../../src/docker/dockerfile-generator.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,8EAS7B,CAAA;AAEV;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EAAE,EACrB,WAAW,EAAE,MAAM,EAAE,EACrB,QAAQ,GAAE,MAAM,EAAO,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,CAoCR;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAAC,UAAU,CASlD"}
|
|
@@ -3,10 +3,29 @@
|
|
|
3
3
|
* Per-project Dockerfile generation
|
|
4
4
|
*/
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.BUILD_ENV_PASSTHROUGH_KEYS = void 0;
|
|
6
7
|
exports.generateProjectDockerfile = generateProjectDockerfile;
|
|
7
8
|
exports.buildDockerEnv = buildDockerEnv;
|
|
8
9
|
const docker_utils_1 = require("./docker-utils");
|
|
9
10
|
const docker_security_1 = require("./docker-security");
|
|
11
|
+
/**
|
|
12
|
+
* Safe, non-sensitive system environment variables forwarded to `docker build`.
|
|
13
|
+
*
|
|
14
|
+
* These are OS-level vars that affect build tooling (locale, paths, temp dirs)
|
|
15
|
+
* but carry no secrets. Sensitive vars such as ANTHROPIC_API_KEY or
|
|
16
|
+
* AI_SUPPORT_AGENT_TOKEN must NOT appear here — they belong in PASSTHROUGH_ENV_VARS
|
|
17
|
+
* (volume-mount-builder.ts) and are injected only at `docker run` time.
|
|
18
|
+
*/
|
|
19
|
+
exports.BUILD_ENV_PASSTHROUGH_KEYS = [
|
|
20
|
+
'PATH',
|
|
21
|
+
'HOME',
|
|
22
|
+
'USER',
|
|
23
|
+
'TMPDIR',
|
|
24
|
+
'TMP',
|
|
25
|
+
'TEMP',
|
|
26
|
+
'LANG',
|
|
27
|
+
'LC_ALL',
|
|
28
|
+
];
|
|
10
29
|
/**
|
|
11
30
|
* Generate a per-project Dockerfile that extends the base agent image.
|
|
12
31
|
*/
|
|
@@ -45,9 +64,8 @@ function generateProjectDockerfile(baseVersion, aptPackages, npmPackages, comman
|
|
|
45
64
|
* Excludes sensitive variables (API keys, tokens) that should not be available during build.
|
|
46
65
|
*/
|
|
47
66
|
function buildDockerEnv() {
|
|
48
|
-
const ALLOWED_KEYS = ['PATH', 'HOME', 'USER', 'TMPDIR', 'TMP', 'TEMP', 'LANG', 'LC_ALL'];
|
|
49
67
|
const env = {};
|
|
50
|
-
for (const key of
|
|
68
|
+
for (const key of exports.BUILD_ENV_PASSTHROUGH_KEYS) {
|
|
51
69
|
if (process.env[key] !== undefined) {
|
|
52
70
|
env[key] = process.env[key];
|
|
53
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dockerfile-generator.js","sourceRoot":"","sources":["../../src/docker/dockerfile-generator.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
1
|
+
{"version":3,"file":"dockerfile-generator.js","sourceRoot":"","sources":["../../src/docker/dockerfile-generator.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AA2BH,8DA0CC;AAMD,wCASC;AAlFD,iDAA2C;AAC3C,uDAAwD;AAExD;;;;;;;GAOG;AACU,QAAA,0BAA0B,GAAG;IACxC,MAAM;IACN,MAAM;IACN,MAAM;IACN,QAAQ;IACR,KAAK;IACL,MAAM;IACN,MAAM;IACN,QAAQ;CACA,CAAA;AAEV;;GAEG;AACH,SAAgB,yBAAyB,CACvC,WAAmB,EACnB,WAAqB,EACrB,WAAqB,EACrB,WAAqB,EAAE,EACvB,QAAiB;IAEjB,IAAA,sCAAoB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAA;IACxC,IAAA,sCAAoB,EAAC,WAAW,EAAE,KAAK,CAAC,CAAA;IAExC,MAAM,KAAK,GAAG,CAAC,QAAQ,yBAAU,IAAI,WAAW,EAAE,CAAC,CAAA;IACnD,IAAI,QAAQ,EAAE,CAAC;QACb,qEAAqE;QACrE,uEAAuE;QACvE,wEAAwE;QACxE,wEAAwE;QACxE,6DAA6D;QAC7D,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,qDAAqD,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAA;QACpG,CAAC;QACD,kFAAkF;QAClF,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,EAAE,CAAC,CAAA;IAClC,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CACR,qEAAqE,EACrE,OAAO,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EACzC,oCAAoC,CACrC,CAAA;IACH,CAAC;IACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,KAAK,CAAC,IAAI,CACR,sBAAsB,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,6BAA6B,CACzE,CAAA;IACH,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,oDAAoD,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAA;QAC9F,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;AAChC,CAAC;AAED;;;GAGG;AACH,SAAgB,cAAc;IAC5B,MAAM,GAAG,GAAsB,EAAE,CAAA;IACjC,KAAK,MAAM,GAAG,IAAI,kCAA0B,EAAE,CAAC;QAC7C,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;IACH,CAAC;IACD,GAAG,CAAC,mBAAmB,CAAC,GAAG,OAAO,CAAA;IAClC,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-image-builder.d.ts","sourceRoot":"","sources":["../../src/docker/project-image-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"project-image-builder.d.ts","sourceRoot":"","sources":["../../src/docker/project-image-builder.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAMzC;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,SAAS,CAAC,EAAE,SAAS,EACrB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAyEf"}
|
|
@@ -10,13 +10,10 @@ const child_process_1 = require("child_process");
|
|
|
10
10
|
const dockerfile_path_1 = require("./dockerfile-path");
|
|
11
11
|
const dockerfile_path_2 = require("./dockerfile-path");
|
|
12
12
|
const logger_1 = require("../logger");
|
|
13
|
+
const constants_1 = require("../constants");
|
|
13
14
|
const dockerfile_generator_1 = require("./dockerfile-generator");
|
|
14
15
|
const docker_utils_1 = require("./docker-utils");
|
|
15
16
|
const utils_1 = require("../utils");
|
|
16
|
-
/** Maximum total log size kept in memory per session (2 MB). Older content is discarded. */
|
|
17
|
-
const MAX_SESSION_LOG_BYTES = 2 * 1024 * 1024;
|
|
18
|
-
// API の SubmitLogChunkDto.text @MaxLength に合わせた上限(100,000 バイト)
|
|
19
|
-
const MAX_LOG_CHUNK_BYTES = 100_000;
|
|
20
17
|
/**
|
|
21
18
|
* Build a per-project Docker image using the given Dockerfile.
|
|
22
19
|
* Streams stdout/stderr to both the host terminal and the API (for real-time log viewing).
|
|
@@ -40,19 +37,19 @@ async function buildProjectImage(tenantCode, projectCode, baseVersion, dockerfil
|
|
|
40
37
|
const text = buf;
|
|
41
38
|
buf = '';
|
|
42
39
|
if (!logTruncated) {
|
|
43
|
-
if (fullLog.length + text.length <=
|
|
40
|
+
if (fullLog.length + text.length <= constants_1.DOCKER_MAX_SESSION_LOG_BYTES) {
|
|
44
41
|
fullLog += text;
|
|
45
42
|
}
|
|
46
43
|
else {
|
|
47
|
-
const remaining =
|
|
44
|
+
const remaining = constants_1.DOCKER_MAX_SESSION_LOG_BYTES - fullLog.length;
|
|
48
45
|
fullLog += remaining > 0 ? text.slice(0, remaining) : '';
|
|
49
46
|
logTruncated = true;
|
|
50
47
|
logger_1.logger.warn('[docker] Build log exceeded 2 MB limit; remaining output will not be saved to S3');
|
|
51
48
|
}
|
|
52
49
|
}
|
|
53
50
|
if (apiClient) {
|
|
54
|
-
for (let offset = 0; offset < text.length; offset +=
|
|
55
|
-
const slice = text.slice(offset, offset +
|
|
51
|
+
for (let offset = 0; offset < text.length; offset += constants_1.DOCKER_MAX_LOG_CHUNK_BYTES) {
|
|
52
|
+
const slice = text.slice(offset, offset + constants_1.DOCKER_MAX_LOG_CHUNK_BYTES);
|
|
56
53
|
await apiClient.submitLogChunk({ agentId: agentId ?? '', projectCode, logType: 'docker-build', sessionId, seq: ++seq, text: slice })
|
|
57
54
|
.catch((e) => logger_1.logger.warn(`[docker] Failed to send log chunk: ${e}`));
|
|
58
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-image-builder.js","sourceRoot":"","sources":["../../src/docker/project-image-builder.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;
|
|
1
|
+
{"version":3,"file":"project-image-builder.js","sourceRoot":"","sources":["../../src/docker/project-image-builder.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAiBH,8CAgFC;AA/FD,iDAAqC;AAErC,uDAAuD;AACvD,uDAAsD;AACtD,sCAAqE;AAErE,4CAAuF;AACvF,iEAAuD;AACvD,iDAA6D;AAC7D,oCAAkC;AAElC;;;GAGG;AACI,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,WAAmB,EACnB,WAAmB,EACnB,cAAsB,EACtB,SAAqB,EACrB,OAAgB;IAEhB,MAAM,QAAQ,GAAG,IAAA,oCAAkB,EAAC,UAAU,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,IAAA,qCAAmB,GAAE,CAAA;IACxC,MAAM,UAAU,GAAG,GAAG,UAAU,IAAI,WAAW,EAAE,CAAA;IACjD,MAAM,KAAK,GAAG,IAAA,wBAAe,EAAC,UAAU,CAAC,CAAA;IACzC,MAAM,KAAK,GAAG,SAAS,CAAA;IACvB,MAAM,MAAM,GAAG,GAAG,KAAK,IAAI,UAAU,IAAI,KAAK,GAAG,CAAA;IACjD,eAAM,CAAC,IAAI,CAAC,oCAAoC,QAAQ,EAAE,CAAC,CAAA;IAE3D,MAAM,SAAS,GAAG,IAAA,4BAAa,GAAE,CAAA;IACjC,IAAI,GAAG,GAAG,CAAC,CAAA;IACX,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,YAAY,GAAG,KAAK,CAAA;IACxB,IAAI,GAAG,GAAG,EAAE,CAAA;IAEZ,MAAM,KAAK,GAAG,KAAK,IAAmB,EAAE;QACtC,IAAI,CAAC,GAAG;YAAE,OAAM;QAChB,MAAM,IAAI,GAAG,GAAG,CAAA;QAChB,GAAG,GAAG,EAAE,CAAA;QACR,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,wCAA4B,EAAE,CAAC;gBACjE,OAAO,IAAI,IAAI,CAAA;YACjB,CAAC;iBAAM,CAAC;gBACN,MAAM,SAAS,GAAG,wCAA4B,GAAG,OAAO,CAAC,MAAM,CAAA;gBAC/D,OAAO,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;gBACxD,YAAY,GAAG,IAAI,CAAA;gBACnB,eAAM,CAAC,IAAI,CAAC,kFAAkF,CAAC,CAAA;YACjG,CAAC;QACH,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,IAAI,sCAA0B,EAAE,CAAC;gBAChF,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,sCAA0B,CAAC,CAAA;gBACrE,MAAM,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;qBACjI,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,EAAE,CAAC,CAAC,CAAA;YAClF,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,IAAI,UAA6B,CAAA;IACjC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,IAAA,qBAAK,EAAC,IAAA,4BAAa,GAAE,EAAE;YAClC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB;YAC3D,aAAa,EAAE,iBAAiB,WAAW,EAAE;YAC7C,IAAI,EAAE,cAAc,EAAE,UAAU;SACjC,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAA,qCAAc,GAAE,EAAE,CAAC,CAAA;QAEhE,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9E,MAAM,MAAM,GAAG,CAAC,CAAS,EAAQ,EAAE;YACjC,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;YACzB,aAAa,CAAC,IAAI,CAAC,CAAA;YACnB,GAAG,IAAI,IAAI,CAAA;YACX,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;gBACtB,KAAK,KAAK,EAAE,CAAA;YACd,CAAC;QACH,CAAC,CAAA;QACD,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC/B,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QAC/B,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAA;QACtC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,IAAI,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAA;;gBACpB,MAAM,CAAC,IAAI,KAAK,CAAC,iCAAiC,IAAI,EAAE,CAAC,CAAC,CAAA;QACjE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,GAAG,UAAU,GAAG,IAAA,eAAO,EAAC,CAAC,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;IAErD,MAAM,KAAK,EAAE,CAAA;IAEb,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;QACzB,MAAM,SAAS,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;aAC1H,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,EAAE,CAAC,CAAC,CAAA;IAC1F,CAAC;IAED,IAAI,UAAU;QAAE,MAAM,UAAU,CAAA;IAChC,eAAM,CAAC,OAAO,CAAC,iCAAiC,QAAQ,EAAE,CAAC,CAAA;AAC7D,CAAC"}
|
|
@@ -10,6 +10,12 @@ export declare const CONTAINER_PROJECTS_BASE = "/workspace/projects";
|
|
|
10
10
|
export declare const CONTAINER_HOME = "/home/node";
|
|
11
11
|
/** Passthrough environment variables from host to container */
|
|
12
12
|
export declare const PASSTHROUGH_ENV_VARS: string[];
|
|
13
|
+
/**
|
|
14
|
+
* Subset of PASSTHROUGH_ENV_VARS that carry Claude / Anthropic credentials.
|
|
15
|
+
* Used by per-project containers where the other agent-specific vars are
|
|
16
|
+
* handled explicitly (token, apiUrl, configDir) rather than via passthrough.
|
|
17
|
+
*/
|
|
18
|
+
export declare const CLAUDE_CREDENTIAL_ENV_VARS: readonly ["ANTHROPIC_API_KEY", "CLAUDE_CODE_OAUTH_TOKEN"];
|
|
13
19
|
export interface ProjectDirMapping {
|
|
14
20
|
hostDir: string;
|
|
15
21
|
containerDir: string;
|
|
@@ -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;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;
|
|
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;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,2DAG7B,CAAA;AAEV,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACpB;AAuBD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,eAAe,EAAE,iBAAiB,EAAE,CAAA;CAAE,CAwD9F;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,eAAe,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAkC3E;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,CA4GzC"}
|
|
@@ -38,7 +38,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
38
38
|
};
|
|
39
39
|
})();
|
|
40
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
41
|
-
exports.PASSTHROUGH_ENV_VARS = exports.CONTAINER_HOME = exports.CONTAINER_PROJECTS_BASE = void 0;
|
|
41
|
+
exports.CLAUDE_CREDENTIAL_ENV_VARS = exports.PASSTHROUGH_ENV_VARS = exports.CONTAINER_HOME = exports.CONTAINER_PROJECTS_BASE = void 0;
|
|
42
42
|
exports.buildVolumeMounts = buildVolumeMounts;
|
|
43
43
|
exports.buildEnvArgs = buildEnvArgs;
|
|
44
44
|
exports.buildProjectVolumeMounts = buildProjectVolumeMounts;
|
|
@@ -64,14 +64,16 @@ exports.PASSTHROUGH_ENV_VARS = [
|
|
|
64
64
|
'CLAUDE_CODE_OAUTH_TOKEN',
|
|
65
65
|
];
|
|
66
66
|
/**
|
|
67
|
-
*
|
|
68
|
-
*
|
|
67
|
+
* Subset of PASSTHROUGH_ENV_VARS that carry Claude / Anthropic credentials.
|
|
68
|
+
* Used by per-project containers where the other agent-specific vars are
|
|
69
|
+
* handled explicitly (token, apiUrl, configDir) rather than via passthrough.
|
|
69
70
|
*/
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
71
|
+
exports.CLAUDE_CREDENTIAL_ENV_VARS = [
|
|
72
|
+
'ANTHROPIC_API_KEY',
|
|
73
|
+
'CLAUDE_CODE_OAUTH_TOKEN',
|
|
74
|
+
];
|
|
75
|
+
/** Mount the Claude Code config files (.claude dir and .claude.json) into the container */
|
|
76
|
+
function mountClaudeConfig(mounts, home) {
|
|
75
77
|
const claudeDir = path.join(home, '.claude');
|
|
76
78
|
if (fs.existsSync(claudeDir)) {
|
|
77
79
|
mounts.push('-v', `${claudeDir}:${path.posix.join(exports.CONTAINER_HOME, '.claude')}:rw`);
|
|
@@ -80,14 +82,29 @@ function buildVolumeMounts() {
|
|
|
80
82
|
if (fs.existsSync(claudeJson)) {
|
|
81
83
|
mounts.push('-v', `${claudeJson}:${path.posix.join(exports.CONTAINER_HOME, '.claude.json')}:rw`);
|
|
82
84
|
}
|
|
85
|
+
}
|
|
86
|
+
/** Compute the container-internal path for the agent config dir */
|
|
87
|
+
function getContainerConfigDir(hostConfigDir, home) {
|
|
88
|
+
const relativeToHome = path.relative(home, hostConfigDir);
|
|
89
|
+
const isUnderHome = !relativeToHome.startsWith('..');
|
|
90
|
+
return isUnderHome
|
|
91
|
+
? path.posix.join(exports.CONTAINER_HOME, (0, docker_utils_1.toPosixRelative)(relativeToHome))
|
|
92
|
+
: '/workspace/.config/ai-support-agent';
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Build volume mounts for the legacy single-container mode.
|
|
96
|
+
* Mounts home dirs, agent config, AWS credentials, and all project directories.
|
|
97
|
+
*/
|
|
98
|
+
function buildVolumeMounts() {
|
|
99
|
+
const home = os.homedir();
|
|
100
|
+
const mounts = [];
|
|
101
|
+
const projectMappings = [];
|
|
102
|
+
// Claude Code OAuth tokens and config — mount to container home
|
|
103
|
+
mountClaudeConfig(mounts, home);
|
|
83
104
|
// Agent config — mount to container home
|
|
84
105
|
const agentConfigDir = (0, config_manager_1.getConfigDir)();
|
|
85
106
|
if (fs.existsSync(agentConfigDir)) {
|
|
86
|
-
const
|
|
87
|
-
const isUnderHome = !relativeToHome.startsWith('..');
|
|
88
|
-
const containerConfigDir = isUnderHome
|
|
89
|
-
? path.posix.join(exports.CONTAINER_HOME, (0, docker_utils_1.toPosixRelative)(relativeToHome))
|
|
90
|
-
: `/workspace/.config/ai-support-agent`;
|
|
107
|
+
const containerConfigDir = getContainerConfigDir(agentConfigDir, home);
|
|
91
108
|
mounts.push('-v', `${agentConfigDir}:${containerConfigDir}:rw`);
|
|
92
109
|
}
|
|
93
110
|
// AWS credentials — mount to container home
|
|
@@ -143,11 +160,7 @@ function buildEnvArgs(projectMappings) {
|
|
|
143
160
|
// Map config dir to container-internal path
|
|
144
161
|
const hostConfigDir = (0, config_manager_1.getConfigDir)();
|
|
145
162
|
const home = os.homedir();
|
|
146
|
-
const
|
|
147
|
-
const isUnderHome = !relativeToHome.startsWith('..');
|
|
148
|
-
const containerConfigDir = isUnderHome
|
|
149
|
-
? path.posix.join(exports.CONTAINER_HOME, (0, docker_utils_1.toPosixRelative)(relativeToHome))
|
|
150
|
-
: `/workspace/.config/ai-support-agent`;
|
|
163
|
+
const containerConfigDir = getContainerConfigDir(hostConfigDir, home);
|
|
151
164
|
for (const key of exports.PASSTHROUGH_ENV_VARS) {
|
|
152
165
|
if (process.env[key]) {
|
|
153
166
|
if (key === 'AI_SUPPORT_AGENT_CONFIG_DIR') {
|
|
@@ -185,14 +198,7 @@ function buildProjectVolumeMounts(project, projectConfigHostDir) {
|
|
|
185
198
|
const mounts = [];
|
|
186
199
|
const envArgs = [];
|
|
187
200
|
// Claude Code OAuth tokens and config — mount to container home
|
|
188
|
-
|
|
189
|
-
if (fs.existsSync(claudeDir)) {
|
|
190
|
-
mounts.push('-v', `${claudeDir}:${path.posix.join(exports.CONTAINER_HOME, '.claude')}:rw`);
|
|
191
|
-
}
|
|
192
|
-
const claudeJson = path.join(home, '.claude.json');
|
|
193
|
-
if (fs.existsSync(claudeJson)) {
|
|
194
|
-
mounts.push('-v', `${claudeJson}:${path.posix.join(exports.CONTAINER_HOME, '.claude.json')}:rw`);
|
|
195
|
-
}
|
|
201
|
+
mountClaudeConfig(mounts, home);
|
|
196
202
|
// Per-project isolated config dir — mounts to /home/node/.ai-support-agent inside container
|
|
197
203
|
const containerConfigDir = path.posix.join(exports.CONTAINER_HOME, '.ai-support-agent');
|
|
198
204
|
fs.mkdirSync(projectConfigHostDir, { recursive: true, mode: 0o700 });
|
|
@@ -206,12 +212,14 @@ function buildProjectVolumeMounts(project, projectConfigHostDir) {
|
|
|
206
212
|
envArgs.push('-e', `AI_SUPPORT_AGENT_TOKEN=${project.token}`);
|
|
207
213
|
}
|
|
208
214
|
if (project.apiUrl) {
|
|
209
|
-
// Replace localhost/127.0.0.1 with host.docker.internal so the container can reach the host
|
|
210
|
-
|
|
215
|
+
// Replace localhost/127.0.0.1 with host.docker.internal so the container can reach the host.
|
|
216
|
+
// toContainerApiUrl uses a boundary lookahead to avoid false matches on
|
|
217
|
+
// hosts like `localhost.example.com`.
|
|
218
|
+
const containerApiUrl = (0, utils_1.toContainerApiUrl)(project.apiUrl);
|
|
211
219
|
envArgs.push('-e', `AI_SUPPORT_AGENT_API_URL=${containerApiUrl}`);
|
|
212
220
|
}
|
|
213
|
-
// Pass
|
|
214
|
-
for (const key of
|
|
221
|
+
// Pass Claude / Anthropic credential env vars if set
|
|
222
|
+
for (const key of exports.CLAUDE_CREDENTIAL_ENV_VARS) {
|
|
215
223
|
if (process.env[key]) {
|
|
216
224
|
envArgs.push('-e', `${key}=${process.env[key]}`);
|
|
217
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"volume-mount-builder.js","sourceRoot":"","sources":["../../src/docker/volume-mount-builder.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"volume-mount-builder.js","sourceRoot":"","sources":["../../src/docker/volume-mount-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,6 +32,13 @@ export declare class BrowserSession {
|
|
|
32
32
|
* Get the current page, launching browser if needed.
|
|
33
33
|
*/
|
|
34
34
|
getPage(): Promise<Page>;
|
|
35
|
+
/**
|
|
36
|
+
* Enable focus emulation so the page renders as if always focused.
|
|
37
|
+
* This keeps the text caret (cursor) visible in input fields even though
|
|
38
|
+
* the headless browser window itself never has OS-level focus.
|
|
39
|
+
* Safe no-op on non-Chromium engines (CDP unavailable).
|
|
40
|
+
*/
|
|
41
|
+
private enableFocusEmulation;
|
|
35
42
|
/**
|
|
36
43
|
* Check if a browser session is currently active.
|
|
37
44
|
*/
|
|
@@ -88,6 +95,13 @@ export declare class BrowserSession {
|
|
|
88
95
|
* Press a key combination.
|
|
89
96
|
*/
|
|
90
97
|
executeKeyboardPress(key: string, modifiers?: string[]): Promise<void>;
|
|
98
|
+
/**
|
|
99
|
+
* Get the currently selected text on the page.
|
|
100
|
+
* Reads the selection from a focused input/textarea, falling back to the
|
|
101
|
+
* document selection for normal page content. Returns an empty string when
|
|
102
|
+
* nothing is selected.
|
|
103
|
+
*/
|
|
104
|
+
getSelectedText(): Promise<string>;
|
|
91
105
|
/**
|
|
92
106
|
* Navigate back.
|
|
93
107
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-session.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/browser/browser-session.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAwC,IAAI,EAAE,MAAM,YAAY,CAAA;AAG5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAkB,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"browser-session.d.ts","sourceRoot":"","sources":["../../../../src/mcp/tools/browser/browser-session.ts"],"names":[],"mappings":"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"}
|