@ai-support-agent/cli 0.1.30-beta.3 → 0.1.30-beta.5
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/api-client.d.ts.map +1 -1
- package/dist/api-client.js +7 -1
- package/dist/api-client.js.map +1 -1
- package/dist/browser/browser-local-server.d.ts.map +1 -1
- package/dist/browser/browser-local-server.js +5 -4
- package/dist/browser/browser-local-server.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +5 -3
- package/dist/constants.js.map +1 -1
- package/dist/docker/docker-utils.d.ts.map +1 -1
- package/dist/docker/docker-utils.js +1 -2
- package/dist/docker/docker-utils.js.map +1 -1
- package/dist/docker/volume-mount-builder.js +2 -2
- package/dist/docker/volume-mount-builder.js.map +1 -1
- package/dist/mcp/tools/browser/browser-session-manager.d.ts +0 -15
- package/dist/mcp/tools/browser/browser-session-manager.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-session-manager.js +1 -31
- package/dist/mcp/tools/browser/browser-session-manager.js.map +1 -1
- package/dist/mcp/tools/browser/browser-session.d.ts +8 -0
- package/dist/mcp/tools/browser/browser-session.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-session.js +56 -46
- package/dist/mcp/tools/browser/browser-session.js.map +1 -1
- package/dist/mcp/tools/browser/browser-types.d.ts +1 -0
- package/dist/mcp/tools/browser/browser-types.d.ts.map +1 -1
- package/dist/mcp/tools/browser/browser-types.js +3 -1
- package/dist/mcp/tools/browser/browser-types.js.map +1 -1
- package/dist/mcp/tools/browser.d.ts.map +1 -1
- package/dist/mcp/tools/browser.js +2 -2
- package/dist/mcp/tools/browser.js.map +1 -1
- package/dist/mcp/tools/db-query.d.ts.map +1 -1
- package/dist/mcp/tools/db-query.js +3 -2
- package/dist/mcp/tools/db-query.js.map +1 -1
- package/dist/pending-result-store.d.ts.map +1 -1
- package/dist/pending-result-store.js +5 -11
- package/dist/pending-result-store.js.map +1 -1
- package/dist/repo-sync.d.ts.map +1 -1
- package/dist/repo-sync.js +5 -1
- package/dist/repo-sync.js.map +1 -1
- package/dist/security.js +2 -2
- package/dist/security.js.map +1 -1
- package/dist/terminal/constants.d.ts +0 -1
- package/dist/terminal/constants.d.ts.map +1 -1
- package/dist/terminal/constants.js +1 -2
- package/dist/terminal/constants.js.map +1 -1
- package/dist/terminal/terminal-session-manager.d.ts.map +1 -1
- package/dist/terminal/terminal-session-manager.js +0 -3
- package/dist/terminal/terminal-session-manager.js.map +1 -1
- package/dist/utils.d.ts +15 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +26 -0
- package/dist/utils.js.map +1 -1
- package/dist/vscode/constants.d.ts +2 -0
- package/dist/vscode/constants.d.ts.map +1 -1
- package/dist/vscode/constants.js +3 -1
- package/dist/vscode/constants.js.map +1 -1
- package/dist/vscode/vscode-server.d.ts.map +1 -1
- package/dist/vscode/vscode-server.js +1 -1
- package/dist/vscode/vscode-server.js.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.d.ts +22 -1
- package/dist/vscode/vscode-tunnel-websocket.d.ts.map +1 -1
- package/dist/vscode/vscode-tunnel-websocket.js +39 -5
- package/dist/vscode/vscode-tunnel-websocket.js.map +1 -1
- package/package.json +1 -1
package/dist/repo-sync.js
CHANGED
|
@@ -195,7 +195,11 @@ function buildCloneUrl(url, authMethod, authSecret) {
|
|
|
195
195
|
parsed.password = authSecret;
|
|
196
196
|
return parsed.toString();
|
|
197
197
|
}
|
|
198
|
-
catch {
|
|
198
|
+
catch (error) {
|
|
199
|
+
// Do NOT log the url or the secret — only the failure fact + error message.
|
|
200
|
+
logger_1.logger.warn('Failed to embed credentials into repo URL', {
|
|
201
|
+
error: (0, utils_1.getErrorMessage)(error),
|
|
202
|
+
});
|
|
199
203
|
return url;
|
|
200
204
|
}
|
|
201
205
|
}
|
package/dist/repo-sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-sync.js","sourceRoot":"","sources":["../src/repo-sync.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8BA,wBASC;AAaD,4CA0BC;AA2HD,
|
|
1
|
+
{"version":3,"file":"repo-sync.js","sourceRoot":"","sources":["../src/repo-sync.ts"],"names":[],"mappings":"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"}
|
package/dist/security.js
CHANGED
|
@@ -156,7 +156,7 @@ function validateBindMountPathSync(hostPath) {
|
|
|
156
156
|
}
|
|
157
157
|
const allBlocked = [...exports.BLOCKED_PATH_PREFIXES, ...getSensitiveHomePaths()];
|
|
158
158
|
for (const prefix of allBlocked) {
|
|
159
|
-
const prefixWithoutSlash =
|
|
159
|
+
const prefixWithoutSlash = (0, utils_1.stripTrailingSlash)(prefix);
|
|
160
160
|
if (resolved === prefixWithoutSlash || resolved.startsWith(prefix)) {
|
|
161
161
|
return `Access denied: ${prefix} paths are blocked`;
|
|
162
162
|
}
|
|
@@ -183,7 +183,7 @@ async function validateFilePath(filePath, baseDir) {
|
|
|
183
183
|
}
|
|
184
184
|
const allBlocked = [...exports.BLOCKED_PATH_PREFIXES, ...getSensitiveHomePaths()];
|
|
185
185
|
for (const prefix of allBlocked) {
|
|
186
|
-
const prefixWithoutSlash =
|
|
186
|
+
const prefixWithoutSlash = (0, utils_1.stripTrailingSlash)(prefix);
|
|
187
187
|
if (resolved === prefixWithoutSlash || resolved.startsWith(prefix)) {
|
|
188
188
|
return `Access denied: ${prefix} paths are blocked`;
|
|
189
189
|
}
|
package/dist/security.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CA,sDAKC;AAED,oCAMC;AAED,0CAOC;AAQD,8CAEC;AAkBD,0DAIC;AASD,8DAwBC;AAED,4CAwBC;AAED,wDAkBC;AAlLD,uCAAwB;AACxB,uCAAwB;AACxB,2CAA4B;AAE5B,2CAAwD;AACxD,iCAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,6 @@
|
|
|
24
24
|
* TERMINAL_SESSION_GRACE_MS so both ends keep the session for the same window.
|
|
25
25
|
*/
|
|
26
26
|
export declare const SESSION_GRACE_TIMEOUT_MS: number;
|
|
27
|
-
export declare const MAX_CONCURRENT_SESSIONS = 5;
|
|
28
27
|
/**
|
|
29
28
|
* Upper bound (in bytes) of the per-session scrollback ring buffer kept by
|
|
30
29
|
* TerminalSession. PTY output is appended to the buffer alongside the live
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/terminal/constants.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,QAoBjC,CAAA;AACJ
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/terminal/constants.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,wBAAwB,QAoBjC,CAAA;AACJ;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B,QAAa,CAAA;AACrD,eAAO,MAAM,qBAAqB,KAAK,CAAA;AACvC,eAAO,MAAM,qBAAqB,KAAK,CAAA;AACvC,eAAO,MAAM,mCAAmC,OAAO,CAAA;AACvD,eAAO,MAAM,iCAAiC,QAA2B,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.TERMINAL_WS_MAX_RECONNECT_RETRIES = exports.TERMINAL_WS_RECONNECT_BASE_DELAY_MS = exports.TERMINAL_DEFAULT_ROWS = exports.TERMINAL_DEFAULT_COLS = exports.SCROLLBACK_BUFFER_MAX_BYTES = exports.
|
|
3
|
+
exports.TERMINAL_WS_MAX_RECONNECT_RETRIES = exports.TERMINAL_WS_RECONNECT_BASE_DELAY_MS = exports.TERMINAL_DEFAULT_ROWS = exports.TERMINAL_DEFAULT_COLS = exports.SCROLLBACK_BUFFER_MAX_BYTES = exports.SESSION_GRACE_TIMEOUT_MS = void 0;
|
|
4
4
|
const constants_1 = require("../constants");
|
|
5
5
|
/**
|
|
6
6
|
* Grace window kept after a transient WebSocket disconnect before the PTY is
|
|
@@ -48,7 +48,6 @@ exports.SESSION_GRACE_TIMEOUT_MS = (() => {
|
|
|
48
48
|
process.stderr.write(`[terminal] ${constants_1.ENV_VARS.TERMINAL_GRACE_MS}="${raw}" は無効です（正の整数ミリ秒が必要）。デフォルト ${DEFAULT_MS}ms を使用します\n`);
|
|
49
49
|
return DEFAULT_MS;
|
|
50
50
|
})();
|
|
51
|
-
exports.MAX_CONCURRENT_SESSIONS = 5;
|
|
52
51
|
/**
|
|
53
52
|
* Upper bound (in bytes) of the per-session scrollback ring buffer kept by
|
|
54
53
|
* TerminalSession. PTY output is appended to the buffer alongside the live
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/terminal/constants.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACU,QAAA,wBAAwB,GAAG,CAAC,GAAG,EAAE;IAC5C,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,aAAa;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAA;IAC3D,6EAA6E;IAC7E,2BAA2B;IAC3B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,UAAU,CAAA;IACtD,qEAAqE;IACrE,mEAAmE;IACnE,oEAAoE;IACpE,iCAAiC;IACjC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAC1B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,MAAM,CAAA;IAC1D,CAAC;IACD,oEAAoE;IACpE,wEAAwE;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,cAAc,oBAAQ,CAAC,iBAAiB,KAAK,GAAG,6BAA6B,UAAU,aAAa,CACrG,CAAA;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAC,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/terminal/constants.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACU,QAAA,wBAAwB,GAAG,CAAC,GAAG,EAAE;IAC5C,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,aAAa;IAC1C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAQ,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAA;IAC3D,6EAA6E;IAC7E,2BAA2B;IAC3B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,UAAU,CAAA;IACtD,qEAAqE;IACrE,mEAAmE;IACnE,oEAAoE;IACpE,iCAAiC;IACjC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAA;QAC1B,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,MAAM,CAAA;IAC1D,CAAC;IACD,oEAAoE;IACpE,wEAAwE;IACxE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,cAAc,oBAAQ,CAAC,iBAAiB,KAAK,GAAG,6BAA6B,UAAU,aAAa,CACrG,CAAA;IACD,OAAO,UAAU,CAAA;AACnB,CAAC,CAAC,EAAE,CAAA;AACJ;;;;;;;GAOG;AACU,QAAA,2BAA2B,GAAG,GAAG,GAAG,IAAI,CAAA,CAAC,oBAAoB;AAC7D,QAAA,qBAAqB,GAAG,EAAE,CAAA;AAC1B,QAAA,qBAAqB,GAAG,EAAE,CAAA;AAC1B,QAAA,mCAAmC,GAAG,IAAI,CAAA;AAC1C,QAAA,iCAAiC,GAAG,MAAM,CAAC,iBAAiB,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-session-manager.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAElF;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG,eAAe,GAAG,MAAM,CAAA;AAExE,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,GACtC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAE9C,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmD;IAC/E,OAAO,CAAC,cAAc,CAAI;IAE1B,aAAa,CAAC,OAAO,GAAE,sBAA2B,GAAG,eAAe,GAAG,IAAI;IAM3E;;;;;;;;OAQG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,YAAY;IAgB1E;;;;;OAKG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,eAAe,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"terminal-session-manager.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-session-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAA;AAG5E,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAElF;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG,eAAe,GAAG,MAAM,CAAA;AAExE,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,eAAe,CAAA;CAAE,GACtC;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,mBAAmB,CAAA;CAAE,CAAA;AAE9C,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;IAC9D;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmD;IAC/E,OAAO,CAAC,cAAc,CAAI;IAE1B,aAAa,CAAC,OAAO,GAAE,sBAA2B,GAAG,eAAe,GAAG,IAAI;IAM3E;;;;;;;;OAQG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,mBAAmB,GAAG,YAAY;IAgB1E;;;;;OAKG;IACH,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B,GAAG,eAAe,GAAG,IAAI;IA4BpG,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAI1D,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IASxC,YAAY,IAAI,mBAAmB,EAAE;IAIrC;;;OAGG;IACH,QAAQ,IAAI,IAAI;IAUhB;;;;;OAKG;IACH,kBAAkB,IAAI,IAAI;IAM1B,OAAO,CAAC,kBAAkB;IAqB1B,OAAO,CAAC,eAAe;IAQvB,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
|
|
@@ -60,9 +60,6 @@ class TerminalSessionManager {
|
|
|
60
60
|
logger_1.logger.debug(`[terminal] Resuming session within grace window: ${sessionId}`);
|
|
61
61
|
return existing;
|
|
62
62
|
}
|
|
63
|
-
if (this.sessions.size >= constants_1.MAX_CONCURRENT_SESSIONS) {
|
|
64
|
-
return null;
|
|
65
|
-
}
|
|
66
63
|
const session = new terminal_session_1.TerminalSession(sessionId, options);
|
|
67
64
|
// Use the internal exit slot so the manager cleanup survives the websocket
|
|
68
65
|
// handler re-registering the public onExit (see bug #2).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-session-manager.js","sourceRoot":"","sources":["../../src/terminal/terminal-session-manager.ts"],"names":[],"mappings":";;;AAAA,yDAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"terminal-session-manager.js","sourceRoot":"","sources":["../../src/terminal/terminal-session-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -49,8 +49,23 @@ export declare function truncateString(text: string, limit: number, suffix?: str
|
|
|
49
49
|
* cannot drift between subsystems.
|
|
50
50
|
*/
|
|
51
51
|
export declare function sanitizeNameSegment(s: string): string;
|
|
52
|
+
/**
|
|
53
|
+
* Remove a single trailing slash from a path/prefix.
|
|
54
|
+
*
|
|
55
|
+
* Single source of truth for the `replace(/\/$/, '')` idiom used in
|
|
56
|
+
* path-prefix containment checks (security path guards and Docker volume
|
|
57
|
+
* mount builders), so the normalization stays identical across them.
|
|
58
|
+
*/
|
|
59
|
+
export declare function stripTrailingSlash(path: string): string;
|
|
52
60
|
export declare function validateApiUrl(url: string): string | null;
|
|
53
61
|
export declare function isAuthenticationError(error: unknown): boolean;
|
|
62
|
+
/**
|
|
63
|
+
* 認証エラー(401/403)を除く 4xx クライアントエラーかどうかを判定する。
|
|
64
|
+
*
|
|
65
|
+
* 401/403 は再ログインで解消し得るため除外する。それ以外の 4xx は
|
|
66
|
+
* 「コマンドが存在しない／無効」を意味し、再試行しても無駄なので判別に使う。
|
|
67
|
+
*/
|
|
68
|
+
export declare function isNonAuthClientError(error: unknown): boolean;
|
|
54
69
|
/**
|
|
55
70
|
* AxiosError のレスポンスデータが SSO_AUTH_REQUIRED エラーかどうかを判定する。
|
|
56
71
|
*
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAGnD;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,SAAQ,GAAG,IAAI,CAIrF;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAE7C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAgBtD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,SAAQ,GAAG,MAAM,CAGlF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUzD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI7D;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAK9D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,cAAc,CAM1F;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAGpD;AAED;;;GAGG;AACH,wBAAgB,MAAM,IAAI,MAAM,CAE/B"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAMA,wBAAgB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,CAGnD;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,SAAQ,GAAG,IAAI,CAIrF;AAED;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAG1D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CAE7C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAgBtD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,SAAQ,GAAG,MAAM,CAGlF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAUzD;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI7D;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAK5D;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAK9D;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,OAAO,CAEpC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,cAAc,CAM1F;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,CAGpD;AAED;;;GAGG;AACH,wBAAgB,MAAM,IAAI,MAAM,CAE/B"}
|
package/dist/utils.js
CHANGED
|
@@ -47,8 +47,10 @@ exports.parseString = parseString;
|
|
|
47
47
|
exports.parseNumber = parseNumber;
|
|
48
48
|
exports.truncateString = truncateString;
|
|
49
49
|
exports.sanitizeNameSegment = sanitizeNameSegment;
|
|
50
|
+
exports.stripTrailingSlash = stripTrailingSlash;
|
|
50
51
|
exports.validateApiUrl = validateApiUrl;
|
|
51
52
|
exports.isAuthenticationError = isAuthenticationError;
|
|
53
|
+
exports.isNonAuthClientError = isNonAuthClientError;
|
|
52
54
|
exports.isSsoAuthRequiredError = isSsoAuthRequiredError;
|
|
53
55
|
exports.buildWsUrl = buildWsUrl;
|
|
54
56
|
exports.isInDocker = isInDocker;
|
|
@@ -156,6 +158,16 @@ function truncateString(text, limit, suffix = '...') {
|
|
|
156
158
|
function sanitizeNameSegment(s) {
|
|
157
159
|
return s.toLowerCase().replace(/[^a-z0-9-]/g, '-');
|
|
158
160
|
}
|
|
161
|
+
/**
|
|
162
|
+
* Remove a single trailing slash from a path/prefix.
|
|
163
|
+
*
|
|
164
|
+
* Single source of truth for the `replace(/\/$/, '')` idiom used in
|
|
165
|
+
* path-prefix containment checks (security path guards and Docker volume
|
|
166
|
+
* mount builders), so the normalization stays identical across them.
|
|
167
|
+
*/
|
|
168
|
+
function stripTrailingSlash(path) {
|
|
169
|
+
return path.replace(/\/$/, '');
|
|
170
|
+
}
|
|
159
171
|
function validateApiUrl(url) {
|
|
160
172
|
try {
|
|
161
173
|
const parsed = new URL(url);
|
|
@@ -174,6 +186,20 @@ function isAuthenticationError(error) {
|
|
|
174
186
|
const status = error.response?.status;
|
|
175
187
|
return status === 401 || status === 403;
|
|
176
188
|
}
|
|
189
|
+
/**
|
|
190
|
+
* 認証エラー(401/403)を除く 4xx クライアントエラーかどうかを判定する。
|
|
191
|
+
*
|
|
192
|
+
* 401/403 は再ログインで解消し得るため除外する。それ以外の 4xx は
|
|
193
|
+
* 「コマンドが存在しない／無効」を意味し、再試行しても無駄なので判別に使う。
|
|
194
|
+
*/
|
|
195
|
+
function isNonAuthClientError(error) {
|
|
196
|
+
if (!axios_1.default.isAxiosError(error))
|
|
197
|
+
return false;
|
|
198
|
+
const status = error.response?.status;
|
|
199
|
+
if (status === undefined)
|
|
200
|
+
return false;
|
|
201
|
+
return status >= 400 && status < 500 && status !== 401 && status !== 403;
|
|
202
|
+
}
|
|
177
203
|
/**
|
|
178
204
|
* AxiosError のレスポンスデータが SSO_AUTH_REQUIRED エラーかどうかを判定する。
|
|
179
205
|
*
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,oCAGC;AAMD,sBAEC;AAED,0CAIC;AAYD,8BAGC;AAOD,wCAEC;AAOD,0BAEC;AAOD,0CAgBC;AAED,kCAGC;AAED,kCAGC;AAED,wCAGC;AAaD,kDAEC;AAED,wCAUC;AAED,sDAIC;AASD,wDAKC;AAED,gCAKC;AAOD,gCAEC;AAcD,8CAKC;AAOD,kDAMC;AAQD,4CAMC;AAQD,sCAGC;AAMD,wBAEC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,8 @@ export declare const HTTP_RESPONSE_CHUNK_SIZE: number;
|
|
|
14
14
|
export declare const HEALTH_CHECK_INTERVAL_MS: number;
|
|
15
15
|
/** code-server 起動タイムアウト（30秒） */
|
|
16
16
|
export declare const STARTUP_TIMEOUT_MS: number;
|
|
17
|
+
/** 起動完了待ちのヘルスチェックポーリング間隔（500ミリ秒） */
|
|
18
|
+
export declare const STARTUP_HEALTH_POLL_MS = 500;
|
|
17
19
|
/** SIGTERM 送信後に SIGKILL を発行するまでの猶予時間（5秒） */
|
|
18
20
|
export declare const VSCODE_SIGKILL_DELAY_MS = 5000;
|
|
19
21
|
/** ヘルスチェック HTTP リクエストのタイムアウト（5秒） */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vscode/constants.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,eAAO,MAAM,sBAAsB,QAAiB,CAAA;AAEpD,4BAA4B;AAC5B,eAAO,MAAM,mBAAmB,OAAO,CAAA;AAEvC,uCAAuC;AACvC,eAAO,MAAM,gBAAgB,cAAc,CAAA;AAE3C,yBAAyB;AACzB,eAAO,MAAM,iCAAiC,OAAO,CAAA;AAErD,0BAA0B;AAC1B,eAAO,MAAM,+BAA+B,QAA2B,CAAA;AAEvE,mCAAmC;AACnC,eAAO,MAAM,wBAAwB,QAAa,CAAA;AAElD,qBAAqB;AACrB,eAAO,MAAM,wBAAwB,QAAY,CAAA;AAEjD,gCAAgC;AAChC,eAAO,MAAM,kBAAkB,QAAY,CAAA;AAE3C,4CAA4C;AAC5C,eAAO,MAAM,uBAAuB,OAAQ,CAAA;AAE5C,oCAAoC;AACpC,eAAO,MAAM,+BAA+B,OAAQ,CAAA;AAEpD,iCAAiC;AACjC,eAAO,MAAM,4BAA4B,QAAS,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/vscode/constants.ts"],"names":[],"mappings":"AAAA,kCAAkC;AAClC,eAAO,MAAM,sBAAsB,QAAiB,CAAA;AAEpD,4BAA4B;AAC5B,eAAO,MAAM,mBAAmB,OAAO,CAAA;AAEvC,uCAAuC;AACvC,eAAO,MAAM,gBAAgB,cAAc,CAAA;AAE3C,yBAAyB;AACzB,eAAO,MAAM,iCAAiC,OAAO,CAAA;AAErD,0BAA0B;AAC1B,eAAO,MAAM,+BAA+B,QAA2B,CAAA;AAEvE,mCAAmC;AACnC,eAAO,MAAM,wBAAwB,QAAa,CAAA;AAElD,qBAAqB;AACrB,eAAO,MAAM,wBAAwB,QAAY,CAAA;AAEjD,gCAAgC;AAChC,eAAO,MAAM,kBAAkB,QAAY,CAAA;AAE3C,oCAAoC;AACpC,eAAO,MAAM,sBAAsB,MAAM,CAAA;AAEzC,4CAA4C;AAC5C,eAAO,MAAM,uBAAuB,OAAQ,CAAA;AAE5C,oCAAoC;AACpC,eAAO,MAAM,+BAA+B,OAAQ,CAAA;AAEpD,iCAAiC;AACjC,eAAO,MAAM,4BAA4B,QAAS,CAAA"}
|
package/dist/vscode/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.VSCODE_HTTP_PROXY_TIMEOUT_MS = exports.HEALTH_CHECK_REQUEST_TIMEOUT_MS = exports.VSCODE_SIGKILL_DELAY_MS = exports.STARTUP_TIMEOUT_MS = exports.HEALTH_CHECK_INTERVAL_MS = exports.HTTP_RESPONSE_CHUNK_SIZE = exports.VSCODE_WS_MAX_RECONNECT_RETRIES = exports.VSCODE_WS_RECONNECT_BASE_DELAY_MS = exports.VSCODE_BIND_HOST = exports.VSCODE_DEFAULT_PORT = exports.VSCODE_IDLE_TIMEOUT_MS = void 0;
|
|
3
|
+
exports.VSCODE_HTTP_PROXY_TIMEOUT_MS = exports.HEALTH_CHECK_REQUEST_TIMEOUT_MS = exports.VSCODE_SIGKILL_DELAY_MS = exports.STARTUP_HEALTH_POLL_MS = exports.STARTUP_TIMEOUT_MS = exports.HEALTH_CHECK_INTERVAL_MS = exports.HTTP_RESPONSE_CHUNK_SIZE = exports.VSCODE_WS_MAX_RECONNECT_RETRIES = exports.VSCODE_WS_RECONNECT_BASE_DELAY_MS = exports.VSCODE_BIND_HOST = exports.VSCODE_DEFAULT_PORT = exports.VSCODE_IDLE_TIMEOUT_MS = void 0;
|
|
4
4
|
/** code-server アイドルタイムアウト（10分） */
|
|
5
5
|
exports.VSCODE_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
|
|
6
6
|
/** code-server のデフォルトポート */
|
|
@@ -17,6 +17,8 @@ exports.HTTP_RESPONSE_CHUNK_SIZE = 512 * 1024;
|
|
|
17
17
|
exports.HEALTH_CHECK_INTERVAL_MS = 30 * 1000;
|
|
18
18
|
/** code-server 起動タイムアウト（30秒） */
|
|
19
19
|
exports.STARTUP_TIMEOUT_MS = 30 * 1000;
|
|
20
|
+
/** 起動完了待ちのヘルスチェックポーリング間隔（500ミリ秒） */
|
|
21
|
+
exports.STARTUP_HEALTH_POLL_MS = 500;
|
|
20
22
|
/** SIGTERM 送信後に SIGKILL を発行するまでの猶予時間（5秒） */
|
|
21
23
|
exports.VSCODE_SIGKILL_DELAY_MS = 5_000;
|
|
22
24
|
/** ヘルスチェック HTTP リクエストのタイムアウト（5秒） */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/vscode/constants.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AACrB,QAAA,sBAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEpD,4BAA4B;AACf,QAAA,mBAAmB,GAAG,IAAI,CAAA;AAEvC,uCAAuC;AAC1B,QAAA,gBAAgB,GAAG,WAAW,CAAA;AAE3C,yBAAyB;AACZ,QAAA,iCAAiC,GAAG,IAAI,CAAA;AAErD,0BAA0B;AACb,QAAA,+BAA+B,GAAG,MAAM,CAAC,iBAAiB,CAAA;AAEvE,mCAAmC;AACtB,QAAA,wBAAwB,GAAG,GAAG,GAAG,IAAI,CAAA;AAElD,qBAAqB;AACR,QAAA,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjD,gCAAgC;AACnB,QAAA,kBAAkB,GAAG,EAAE,GAAG,IAAI,CAAA;AAE3C,4CAA4C;AAC/B,QAAA,uBAAuB,GAAG,KAAK,CAAA;AAE5C,oCAAoC;AACvB,QAAA,+BAA+B,GAAG,KAAK,CAAA;AAEpD,iCAAiC;AACpB,QAAA,4BAA4B,GAAG,MAAM,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/vscode/constants.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AACrB,QAAA,sBAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEpD,4BAA4B;AACf,QAAA,mBAAmB,GAAG,IAAI,CAAA;AAEvC,uCAAuC;AAC1B,QAAA,gBAAgB,GAAG,WAAW,CAAA;AAE3C,yBAAyB;AACZ,QAAA,iCAAiC,GAAG,IAAI,CAAA;AAErD,0BAA0B;AACb,QAAA,+BAA+B,GAAG,MAAM,CAAC,iBAAiB,CAAA;AAEvE,mCAAmC;AACtB,QAAA,wBAAwB,GAAG,GAAG,GAAG,IAAI,CAAA;AAElD,qBAAqB;AACR,QAAA,wBAAwB,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjD,gCAAgC;AACnB,QAAA,kBAAkB,GAAG,EAAE,GAAG,IAAI,CAAA;AAE3C,oCAAoC;AACvB,QAAA,sBAAsB,GAAG,GAAG,CAAA;AAEzC,4CAA4C;AAC/B,QAAA,uBAAuB,GAAG,KAAK,CAAA;AAE5C,oCAAoC;AACvB,QAAA,+BAA+B,GAAG,KAAK,CAAA;AAEpD,iCAAiC;AACpB,QAAA,4BAA4B,GAAG,MAAM,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-server.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vscode-server.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"AA8BA,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACzC;AAED;;;;;;GAMG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAA4B;IAC3C,OAAO,CAAC,IAAI,CAAQ;IACpB,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAoC;IACpE,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,WAAW,CAA8C;IACjE,OAAO,CAAC,OAAO,CAAQ;gBAEX,OAAO,EAAE,mBAAmB;IAOxC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,OAAO,IAAI,MAAM;IAIjB;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6F5B;;OAEG;IACH,IAAI,IAAI,IAAI;IAsBZ;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,UAAU;YAWJ,WAAW;YAkBX,YAAY;IAa1B;;OAEG;YACW,oBAAoB;IAqBlC,OAAO,CAAC,kBAAkB;IAU1B;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB;IAc5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAM3B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IA+B5B;;OAEG;IACH,OAAO,CAAC,eAAe;CA6BxB"}
|
|
@@ -236,7 +236,7 @@ class VsCodeServer {
|
|
|
236
236
|
return;
|
|
237
237
|
}
|
|
238
238
|
catch {
|
|
239
|
-
await (0, utils_1.sleep)(
|
|
239
|
+
await (0, utils_1.sleep)(constants_1.STARTUP_HEALTH_POLL_MS);
|
|
240
240
|
}
|
|
241
241
|
}
|
|
242
242
|
throw new Error(`code-server failed to start within ${constants_1.STARTUP_TIMEOUT_MS}ms`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,uCAAwB;AACxB,2CAA4B;AAC5B,yCAA0B;AAC1B,2CAA4B;AAE5B,wDAA0D;AAC1D,sCAAkC;AAClC,8EAA4E;AAC5E,4EAA8E;AAC9E,yEAMwC;AACxC,oCAA+D;AAE/D,
|
|
1
|
+
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAmD;AACnD,uCAAwB;AACxB,2CAA4B;AAC5B,yCAA0B;AAC1B,2CAA4B;AAE5B,wDAA0D;AAC1D,sCAAkC;AAClC,8EAA4E;AAC5E,4EAA8E;AAC9E,yEAMwC;AACxC,oCAA+D;AAE/D,2CASoB;AAcpB;;;;;;GAMG;AACH,MAAa,YAAY;IACf,OAAO,GAAwB,IAAI,CAAA;IACnC,IAAI,CAAQ;IACH,aAAa,CAAQ;IACrB,UAAU,CAAQ;IAClB,eAAe,CAAoC;IAC5D,SAAS,GAAyC,IAAI,CAAA;IACtD,WAAW,GAA0C,IAAI,CAAA;IACzD,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAY,OAA4B;QACtC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,IAAI,IAAI,+BAAmB,CAAA;QACxD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,aAAa,CAAA;QAC9B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAA;QACpC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,CAAA;IAChD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,OAAO,CAAA;IACrB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,eAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;YAC/C,OAAM;QACR,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAE/D,eAAM,CAAC,IAAI,CAAC,2CAA2C,4BAAgB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAEvF,IAAI,CAAC;YACH,IAAI,CAAC,oBAAoB,EAAE,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,IAAI,CAAC,qDAAqD,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC5F,CAAC;QAED,oDAAoD;QACpD,qDAAqD;QACrD,EAAE;QACF,wDAAwD;QACxD,qDAAqD;QACrD,sDAAsD;QACtD,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,aAAa,GAAsB;YACvC,GAAG,OAAO,CAAC,GAAG;YACd,kCAAkC;YAClC,aAAa,EAAE,GAAG,IAAI,CAAC,UAAU,sBAAsB;YACvD,eAAe,EAAE,GAAG,IAAI,CAAC,UAAU,wBAAwB;SAC5D,CAAA;QACD,MAAM,gBAAgB,GAAG,IAAA,uCAAqB,EAAC,IAAI,CAAC,eAAe,EAAE;YACnE,MAAM,EAAE,iBAAiB;SAC1B,CAAC,CAAA;QACF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC5D,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QAC5B,CAAC;QAED,qDAAqD;QACrD,wEAAwE;QACxE,2CAA2C;QAC3C,gEAAgE;QAChE,IAAA,mDAAyB,GAAE,CAAA;QAC3B,IAAA,qDAA4B,EAAC,gBAAgB,EAAE;YAC7C,MAAM,EAAE,iBAAiB;SAC1B,CAAC,CAAA;QAEF,IAAI,CAAC,OAAO,GAAG,IAAA,qBAAK,EAAC,aAAa,EAAE;YAClC,aAAa,EAAE,GAAG,4BAAgB,IAAI,IAAI,CAAC,IAAI,EAAE;YACjD,QAAQ,EAAE,MAAM;YAChB,qBAAqB;YACrB,wBAAwB;YACxB,oCAAoC;YACpC,IAAI,CAAC,UAAU;SAChB,EAAE;YACD,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;YACjC,GAAG,EAAE,aAAa;SACnB,CAAC,CAAA;QAEF,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAA;QACzB,MAAM,UAAU,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;YAClD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;gBACvB,eAAM,CAAC,KAAK,CAAC,oCAAoC,IAAA,uBAAe,EAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACxE,MAAM,CAAC,IAAI,KAAK,CACd,0FAA0F,CAC3F,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACvC,eAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACvC,eAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACnE,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAC/B,eAAM,CAAC,IAAI,CAAC,wCAAwC,IAAI,YAAY,MAAM,GAAG,CAAC,CAAA;YAC9E,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;YACpB,IAAI,CAAC,UAAU,EAAE,CAAA;QACnB,CAAC,CAAC,CAAA;QAEF,mDAAmD;QACnD,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;QACrD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,cAAc,EAAE,CAAA;QACrB,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAEvB,eAAM,CAAC,IAAI,CAAC,gDAAgD,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED;;OAEG;IACH,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAM;QAEzB,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,UAAU,EAAE,CAAA;QAEjB,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC5B,0BAA0B;YAC1B,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;oBACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC9B,CAAC;YACH,CAAC,EAAE,mCAAuB,CAAC,CAAA;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,+BAA+B,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACvE,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;IACrB,CAAC;IAED;;OAEG;IACH,KAAK;QACH,IAAI,CAAC,cAAc,EAAE,CAAA;IACvB,CAAC;IAEO,cAAc;QACpB,IAAI,IAAI,CAAC,SAAS;YAAE,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAChD,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,eAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;YAC7D,IAAI,CAAC,IAAI,EAAE,CAAA;QACb,CAAC,EAAE,kCAAsB,CAAC,CAAC,KAAK,EAAE,CAAA;IACpC,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACjC,eAAM,CAAC,IAAI,CAAC,wCAAwC,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YAC/E,CAAC,CAAC,CAAA;QACJ,CAAC,EAAE,oCAAwB,CAAC,CAAA;IAC9B,CAAC;IAEO,UAAU;QAChB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAC5B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QACvB,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,4BAAgB,IAAI,IAAI,CAAC,IAAI,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE;gBAC9E,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;oBAC3B,OAAO,EAAE,CAAA;gBACX,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,gCAAgC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;gBACrE,CAAC;gBACD,GAAG,CAAC,MAAM,EAAE,CAAA;YACd,CAAC,CAAC,CAAA;YACF,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;YACvB,GAAG,CAAC,UAAU,CAAC,2CAA+B,EAAE,GAAG,EAAE;gBACnD,GAAG,CAAC,OAAO,EAAE,CAAA;gBACb,MAAM,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAA;YAC3C,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACxB,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,8BAAkB,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,WAAW,EAAE,CAAA;gBACxB,OAAM;YACR,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAA,aAAK,EAAC,kCAAsB,CAAC,CAAA;YACrC,CAAC;QACH,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,8BAAkB,IAAI,CAAC,CAAA;IAC/E,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,oBAAoB,CAAC,aAAqB;QACtD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;QAChE,IAAI,WAAW;YAAE,OAAO,aAAa,CAAA;QAErC,4BAA4B;QAC5B,eAAM,CAAC,IAAI,CAAC,wBAAwB,aAAa,uCAAuC,CAAC,CAAA;QACzF,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;YACjC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,4BAAgB,EAAE,GAAG,EAAE;gBACtC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBAC7B,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;oBACtB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBACnC,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAA;gBACtE,CAAC;YACH,CAAC,CAAC,CAAA;YACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,kBAAkB,CAAC,IAAY;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,EAAE,CAAA;YACjC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,4BAAgB,EAAE,GAAG,EAAE;gBACzC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;YACnC,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;;;;;OAMG;IACK,oBAAoB;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACjD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,CAAA;QAC/E,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAE7C,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QAEnE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;QAC3F,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAE3C,eAAM,CAAC,KAAK,CAAC,kDAAkD,UAAU,EAAE,CAAC,CAAA;IAC9E,CAAC;IAED;;OAEG;IACK,mBAAmB,CAAC,UAAkB,EAAE,WAAmB;QACjE,MAAM,aAAa,GAAG,IAAA,4CAAsB,EAAC,WAAW,CAAC,CAAA;QACzD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,IAAA,wCAAkB,EAAC,aAAa,CAAC,CAAC,CAAA;QACrF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,EAAE,IAAA,uCAAiB,EAAC,aAAa,CAAC,CAAC,CAAA;IACrF,CAAC;IAED;;OAEG;IACK,oBAAoB,CAAC,UAAkB,EAAE,WAAmB;QAClE,MAAM,cAAc,GAAG,IAAA,gCAAU,GAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,CAAA;QAEpE,MAAM,kBAAkB,GAAG;YACzB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;SACrD,CAAA;QACD,MAAM,iBAAiB,GAAG;YACxB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,CAAC,SAAS,CAAC;YACjB,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;SAC7B,CAAA;QAED,OAAO;YACL,kCAAkC,EAAE;gBAClC,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,iBAAiB;aACjC;YACD,oCAAoC,EAAE;gBACpC,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,iBAAiB;aACjC;YACD,wCAAwC,EAAE,cAAc;YACxD,0CAA0C,EAAE,cAAc;YAC1D,yBAAyB,EAAE,WAAW;YACtC,kCAAkC,EAAE,IAAI;YACxC,wCAAwC,EAAE,OAAO;YACjD,0BAA0B,EAAE,QAAQ;SACrC,CAAA;IACH,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,WAAmB,EAAE,QAAiC;QAC5E,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;QAE5D,oDAAoD;QACpD,IAAI,QAAQ,GAA4B,EAAE,CAAA;QAC1C,IAAI,CAAC;YACH,QAAQ,GAAG,IAAA,oBAAY,EAA0B,YAAY,CAAC,CAAA;QAChE,CAAC;QAAC,MAAM,CAAC;YACP,8CAA8C;QAChD,CAAC;QACD,MAAM,MAAM,GAA4B,EAAE,GAAG,QAAQ,EAAE,GAAG,QAAQ,EAAE,CAAA;QACpE,MAAM,WAAW,GAAG;YAClB,kCAAkC;YAClC,oCAAoC;SACrC,CAAA;QACD,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;YAC9B,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAI,QAAQ,CAAC,GAAG,CAA6B,EAAE,GAAI,QAAQ,CAAC,GAAG,CAA6B,EAAE,CAAA;YAChH,CAAC;QACH,CAAC;QACD,EAAE,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAE/D,6CAA6C;QAC7C,2CAA2C;QAC3C,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAA;QAClE,MAAM,WAAW,GAAG,IAAA,uDAAiC,GAAE,CAAA;QACvD,EAAE,CAAC,aAAa,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACzE,CAAC;CACF;AArVD,oCAqVC"}
|
|
@@ -28,6 +28,15 @@ export interface VsCodeServerMessage {
|
|
|
28
28
|
message?: string;
|
|
29
29
|
conversationId?: string;
|
|
30
30
|
url?: string;
|
|
31
|
+
/**
|
|
32
|
+
* Browser resume request. When `true` on a `browser_open`, the agent reuses an
|
|
33
|
+
* existing live browser session for this `sessionId` and immediately re-sends
|
|
34
|
+
* the current frame/URL/ready state instead of creating a fresh session. If no
|
|
35
|
+
* live session exists, the agent replies `resume_failed` so the Web client can
|
|
36
|
+
* fall back to a normal (non-resume) open. Absent/false → current new-session
|
|
37
|
+
* behavior (backward compatible).
|
|
38
|
+
*/
|
|
39
|
+
resume?: boolean;
|
|
31
40
|
x?: number;
|
|
32
41
|
y?: number;
|
|
33
42
|
button?: string;
|
|
@@ -45,11 +54,18 @@ export interface VsCodeServerMessage {
|
|
|
45
54
|
selectionStart?: number;
|
|
46
55
|
selectionEnd?: number;
|
|
47
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* `resume_failed` メッセージの `reason` が取り得る値。
|
|
59
|
+
* - `'not_found'`: 対象 sessionId のセッションが Map に存在しない
|
|
60
|
+
* - `'dead'`: セッションは存在するが live ではない（事前チェック時、または
|
|
61
|
+
* getOrCreate 後の TOCTOU 再確認でアイドルクローズ完了を検知した場合）
|
|
62
|
+
*/
|
|
63
|
+
export type ResumeFailureReason = 'not_found' | 'dead';
|
|
48
64
|
/**
|
|
49
65
|
* Agent → API Server メッセージ
|
|
50
66
|
*/
|
|
51
67
|
export interface VsCodeAgentMessage {
|
|
52
|
-
type: 'vscode_ready' | 'vscode_stopped' | 'port_forward_ready' | 'port_forward_stopped' | 'http_response' | 'ws_frame' | 'error' | 'browser_ready' | 'browser_frame' | 'browser_screenshot_result' | 'browser_selection_result' | 'browser_action_log' | 'browser_stopped' | 'browser_script_result' | 'browser_script_progress' | 'browser_file_chooser_opened' | 'browser_cursor_update' | 'browser_focus_changed';
|
|
68
|
+
type: 'vscode_ready' | 'vscode_stopped' | 'port_forward_ready' | 'port_forward_stopped' | 'http_response' | 'ws_frame' | 'error' | 'browser_ready' | 'browser_frame' | 'browser_screenshot_result' | 'browser_selection_result' | 'browser_action_log' | 'browser_stopped' | 'browser_script_result' | 'browser_script_progress' | 'browser_file_chooser_opened' | 'browser_cursor_update' | 'browser_focus_changed' | 'resume_failed';
|
|
53
69
|
sessionId?: string;
|
|
54
70
|
targetPort?: number;
|
|
55
71
|
requestId?: string;
|
|
@@ -70,6 +86,11 @@ export interface VsCodeAgentMessage {
|
|
|
70
86
|
pageTitle?: string;
|
|
71
87
|
text?: string;
|
|
72
88
|
timestamp?: number;
|
|
89
|
+
/**
|
|
90
|
+
* 失敗・停止理由。`resume_failed` の場合は {@link ResumeFailureReason}
|
|
91
|
+
* （`'not_found' | 'dead'`）に限定される。`browser_stopped` 等では
|
|
92
|
+
* 任意のエラーメッセージ文字列が入るため型は `string` のまま。
|
|
93
|
+
*/
|
|
73
94
|
reason?: string;
|
|
74
95
|
entries?: Array<{
|
|
75
96
|
timestamp: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-tunnel-websocket.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,IAAI,CAAA;AAE1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAA;AAG3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIzD,OAAO,EACL,qBAAqB,
|
|
1
|
+
{"version":3,"file":"vscode-tunnel-websocket.d.ts","sourceRoot":"","sources":["../../src/vscode/vscode-tunnel-websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,7 @@ const project_dir_1 = require("../project-dir");
|
|
|
49
49
|
const utils_1 = require("../utils");
|
|
50
50
|
const browser_session_manager_1 = require("../mcp/tools/browser/browser-session-manager");
|
|
51
51
|
const browser_security_1 = require("../mcp/tools/browser/browser-security");
|
|
52
|
+
const browser_types_1 = require("../mcp/tools/browser/browser-types");
|
|
52
53
|
const browser_script_executor_1 = require("../browser/browser-script-executor");
|
|
53
54
|
const constants_2 = require("./constants");
|
|
54
55
|
const vscode_server_1 = require("./vscode-server");
|
|
@@ -104,7 +105,7 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
104
105
|
vsCodeServerEnvSignature = '';
|
|
105
106
|
wsProxy = null;
|
|
106
107
|
portForwardSessions = new Map();
|
|
107
|
-
browserSessionManager = new browser_session_manager_1.BrowserSessionManager(
|
|
108
|
+
browserSessionManager = new browser_session_manager_1.BrowserSessionManager();
|
|
108
109
|
browserLocalServer = null;
|
|
109
110
|
browserLocalPort = 0;
|
|
110
111
|
pendingFileChoosers = new Map();
|
|
@@ -526,8 +527,34 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
526
527
|
// browser_cursor_update, freezing the client cursor at the previous session's
|
|
527
528
|
// last shape. Deleting here guarantees the first move after (re)open is sent.
|
|
528
529
|
this.lastSentCursor.delete(sessionId);
|
|
530
|
+
// Resume request: reuse an existing LIVE session for this sessionId and
|
|
531
|
+
// immediately re-stream its current state. If no live session exists, reply
|
|
532
|
+
// resume_failed so the Web client can fall back to a normal open. A failed
|
|
533
|
+
// resume NEVER creates a new session (mirrors the Terminal resume contract).
|
|
534
|
+
if (msg.resume === true) {
|
|
535
|
+
const existing = this.browserSessionManager.get(sessionId);
|
|
536
|
+
if (!existing || !existing.isAlive) {
|
|
537
|
+
const reason = existing ? 'dead' : 'not_found';
|
|
538
|
+
logger_1.logger.warn(`[vscode-ws] Browser resume failed (session=${sessionId}): ${reason}`);
|
|
539
|
+
this.send({ type: 'resume_failed', sessionId, reason });
|
|
540
|
+
return;
|
|
541
|
+
}
|
|
542
|
+
}
|
|
529
543
|
try {
|
|
530
544
|
const session = await this.browserSessionManager.getOrCreate(sessionId);
|
|
545
|
+
// TOCTOU guard for resume: the live pre-check above (get + isAlive) and the
|
|
546
|
+
// getOrCreate below straddle an await microtask boundary. An idle-timeout
|
|
547
|
+
// close() that completes within that window leaves the now-closed session
|
|
548
|
+
// lingering in the manager's Map, so getOrCreate can resolve a dead session.
|
|
549
|
+
// Without this re-check, getPage() would launch a fresh browser and we'd
|
|
550
|
+
// falsely report browser_ready (resume becoming a silent new-session open).
|
|
551
|
+
// Re-confirm liveness and fail the resume instead of resurrecting it.
|
|
552
|
+
if (msg.resume === true && !session.isAlive) {
|
|
553
|
+
const reason = 'dead';
|
|
554
|
+
logger_1.logger.warn(`[vscode-ws] Browser resume failed (session=${sessionId}): ${reason}`);
|
|
555
|
+
this.send({ type: 'resume_failed', sessionId, reason });
|
|
556
|
+
return;
|
|
557
|
+
}
|
|
531
558
|
// Wire up action log notifications so in-process operations are relayed to Web UI
|
|
532
559
|
session.actionLog.onChange = (entry) => {
|
|
533
560
|
this.send({
|
|
@@ -549,12 +576,19 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
549
576
|
if (msg.conversationId) {
|
|
550
577
|
this.browserSessionManager.linkConversation(msg.conversationId, sessionId);
|
|
551
578
|
}
|
|
552
|
-
|
|
553
|
-
|
|
579
|
+
if (msg.resume === true) {
|
|
580
|
+
// Resume: the existing page already holds the user's state. Never
|
|
581
|
+
// navigate (that would discard it) — just ensure the page is live and
|
|
582
|
+
// re-surface any focused field, then fall through to re-stream + ready.
|
|
583
|
+
await session.getPage();
|
|
584
|
+
await session.reportFocusNow();
|
|
585
|
+
}
|
|
586
|
+
else if (msg.url) {
|
|
587
|
+
// Navigate to URL if provided
|
|
554
588
|
const validation = (0, browser_security_1.validateUrl)(msg.url);
|
|
555
589
|
if (validation.valid) {
|
|
556
590
|
const page = await session.getPage();
|
|
557
|
-
await page.goto(msg.url, { waitUntil: 'domcontentloaded', timeout:
|
|
591
|
+
await page.goto(msg.url, { waitUntil: 'domcontentloaded', timeout: browser_types_1.SELECTOR_TIMEOUT_NAVIGATION_MS });
|
|
558
592
|
// Re-report focus on the freshly loaded document so an autofocused
|
|
559
593
|
// field (e.g. a login form) surfaces its overlay caret without a
|
|
560
594
|
// subsequent focus change. focusin only fires on focus CHANGES.
|
|
@@ -626,7 +660,7 @@ class VsCodeTunnelWebSocket extends base_websocket_1.BaseWebSocketConnection {
|
|
|
626
660
|
}
|
|
627
661
|
try {
|
|
628
662
|
const page = await session.getPage();
|
|
629
|
-
await page.goto(msg.url, { waitUntil: 'domcontentloaded', timeout:
|
|
663
|
+
await page.goto(msg.url, { waitUntil: 'domcontentloaded', timeout: browser_types_1.SELECTOR_TIMEOUT_NAVIGATION_MS });
|
|
630
664
|
// Record the navigation BEFORE the focus re-report so the action-log entry
|
|
631
665
|
// never depends on reportFocusNow succeeding (it already swallows its own
|
|
632
666
|
// errors, but keeping the log independent guards against future changes).
|