@ai-support-agent/cli 0.1.16 → 0.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/claude-code-runner.d.ts.map +1 -1
- package/dist/commands/claude-code-runner.js +5 -0
- package/dist/commands/claude-code-runner.js.map +1 -1
- package/dist/terminal/terminal-session.d.ts.map +1 -1
- package/dist/terminal/terminal-session.js +10 -0
- package/dist/terminal/terminal-session.js.map +1 -1
- package/dist/utils/claude-json-oauth-sync.d.ts +48 -0
- package/dist/utils/claude-json-oauth-sync.d.ts.map +1 -0
- package/dist/utils/claude-json-oauth-sync.js +340 -0
- package/dist/utils/claude-json-oauth-sync.js.map +1 -0
- package/dist/vscode/vscode-server.d.ts.map +1 -1
- package/dist/vscode/vscode-server.js +10 -0
- package/dist/vscode/vscode-server.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"claude-code-runner.d.ts","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAO7C,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAGlF,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AACxF,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AACnF,YAAY,EAAE,sBAAsB,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,4BAA4B;AAC5B,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,EAAE,CAAA;QACd,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;QAClB,UAAU,EAAE,MAAM,CAAA;KACnB,CAAA;CACF;AAED,uCAAuC;AACvC,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACjC,MAAM,EAAE,MAAM,IAAI,CAAA;CACnB;AAED,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,2BAA2B;AAC3B,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;IAClE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;;;;OAKG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACzC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,gBAAgB,CAqJ7E"}
|
|
@@ -7,6 +7,7 @@ const constants_1 = require("../constants");
|
|
|
7
7
|
const logger_1 = require("../logger");
|
|
8
8
|
const activity_timeout_1 = require("../utils/activity-timeout");
|
|
9
9
|
const claude_config_validator_1 = require("../utils/claude-config-validator");
|
|
10
|
+
const claude_json_oauth_sync_1 = require("../utils/claude-json-oauth-sync");
|
|
10
11
|
const stream_parser_1 = require("../utils/stream-parser");
|
|
11
12
|
const claude_code_args_1 = require("./claude-code-args");
|
|
12
13
|
const claude_code_stream_1 = require("./claude-code-stream");
|
|
@@ -61,6 +62,10 @@ function runClaudeCode(options) {
|
|
|
61
62
|
}
|
|
62
63
|
const args = (0, claude_code_args_1.buildClaudeArgs)(message, { allowedTools, addDirs, locale, mcpConfigPath, systemPrompt });
|
|
63
64
|
(0, claude_config_validator_1.ensureClaudeJsonIntegrity)();
|
|
65
|
+
// Web 経由で OAuth Token が設定されているなら ~/.claude.json の
|
|
66
|
+
// oauthAccount キーを確保する。chat の --print 経路でも将来の claude CLI
|
|
67
|
+
// 仕様変更で要求される可能性があるため defensive に呼ぶ。
|
|
68
|
+
(0, claude_json_oauth_sync_1.ensureClaudeJsonOAuthAccount)(envVarsOverride, { prefix: '[chat]' });
|
|
64
69
|
const child = (0, child_process_1.spawn)('claude', args, {
|
|
65
70
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
66
71
|
env,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code-runner.js","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"claude-code-runner.js","sourceRoot":"","sources":["../../src/commands/claude-code-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-session.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"terminal-session.d.ts","sourceRoot":"","sources":["../../src/terminal/terminal-session.ts"],"names":[],"mappings":"AA+DA;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,CAAA;CACrB;AAED,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;AAC1C,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAA;AAEjD,qBAAa,eAAe;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,OAAO,CAAC,YAAY,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;IACjC,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,SAAS,CAA6C;IAC9D,OAAO,CAAC,aAAa,CAA4B;IAEjD;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,GAAE,MAA4B,GAAG,MAAM;gBAyBhE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,sBAA2B;IA6FnE,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAIpC,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAIpC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI;IAI5C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAMzB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI;IAQxC,IAAI,IAAI,IAAI;IAOZ,OAAO,CAAC,aAAa;IAWrB,OAAO,IAAI,OAAO;IAIlB,OAAO,IAAI,mBAAmB;IAY9B,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,cAAc;CAMvB"}
|
|
@@ -41,6 +41,8 @@ const path = __importStar(require("path"));
|
|
|
41
41
|
const env_vars_filter_1 = require("../env-vars-filter");
|
|
42
42
|
const logger_1 = require("../logger");
|
|
43
43
|
const security_1 = require("../security");
|
|
44
|
+
const claude_config_validator_1 = require("../utils/claude-config-validator");
|
|
45
|
+
const claude_json_oauth_sync_1 = require("../utils/claude-json-oauth-sync");
|
|
44
46
|
const constants_1 = require("./constants");
|
|
45
47
|
const sandbox_init_script_1 = require("./sandbox-init-script");
|
|
46
48
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -164,6 +166,14 @@ class TerminalSession {
|
|
|
164
166
|
for (const [key, value] of Object.entries(filteredOverride)) {
|
|
165
167
|
env[key] = value;
|
|
166
168
|
}
|
|
169
|
+
// Claude Code 対話モードは ~/.claude.json の oauthAccount キーが
|
|
170
|
+
// 存在しないと CLAUDE_CODE_OAUTH_TOKEN env を持っていても /login プロンプトを出す。
|
|
171
|
+
// PTY 起動前に、(1) JSON 破損があれば backup から復元、(2) oauthAccount placeholder
|
|
172
|
+
// を確保する。両者は ~/.claude.json を触るため順序が重要 (integrity 先 → oauth-sync 後)。
|
|
173
|
+
(0, claude_config_validator_1.ensureClaudeJsonIntegrity)();
|
|
174
|
+
(0, claude_json_oauth_sync_1.ensureClaudeJsonOAuthAccount)(filteredOverride, {
|
|
175
|
+
prefix: `[terminal:${sessionId}]`,
|
|
176
|
+
});
|
|
167
177
|
this.ptyProcess = pty.spawn(shell, shellArgs, {
|
|
168
178
|
name: 'xterm-256color',
|
|
169
179
|
cols: this.cols,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-session.js","sourceRoot":"","sources":["../../src/terminal/terminal-session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"terminal-session.js","sourceRoot":"","sources":["../../src/terminal/terminal-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `~/.claude.json` の `oauthAccount` セクション同期 helper。
|
|
3
|
+
*
|
|
4
|
+
* Claude Code CLI v2.1.150 は、`CLAUDE_CODE_OAUTH_TOKEN` env を渡しても
|
|
5
|
+
* 対話モード (TTY) 起動時に `~/.claude.json` の `oauthAccount` キーが
|
|
6
|
+
* 存在しないと `/login` プロンプトを出す。
|
|
7
|
+
*
|
|
8
|
+
* 実機検証で「`oauthAccount: {}` (空オブジェクト) が `~/.claude.json` に
|
|
9
|
+
* 存在していれば対話モードでも認証通過する」ことが判明している
|
|
10
|
+
* (claude auth status が `{"loggedIn": true, "authMethod": "oauth_token"}` を返す)。
|
|
11
|
+
*
|
|
12
|
+
* agent は PTY / code-server を spawn する前にこの helper を呼び、
|
|
13
|
+
* envVarsOverride に `CLAUDE_CODE_OAUTH_TOKEN` が含まれていれば
|
|
14
|
+
* `~/.claude.json` の `oauthAccount` キーを確保する。
|
|
15
|
+
*
|
|
16
|
+
* 設計上の注意:
|
|
17
|
+
*
|
|
18
|
+
* - `~/.claude.json` はホスト/コンテナで volume mount 共有されているケースが
|
|
19
|
+
* 多い (mbc-ai-01 では複数プロジェクトコンテナが同一ファイルを参照)。
|
|
20
|
+
* 並列 spawn による lost-update を防ぐため、`O_CREAT|O_EXCL` lockfile
|
|
21
|
+
* 方式で排他制御する。
|
|
22
|
+
* - atomic write: 一時ファイルに書き込んでから rename で置換する。
|
|
23
|
+
* 書き込み途中で kill されても破損ファイルが残らない。
|
|
24
|
+
* - mode 0o600 を明示的に chmod する。`writeFileSync` の mode は
|
|
25
|
+
* 既存ファイルには適用されない Node.js 仕様への対策。
|
|
26
|
+
* - 既存 `oauthAccount` が **オブジェクト型** の場合のみ温存する。
|
|
27
|
+
* `false`/`""`/`0`/`[]`/`null` 等の不正値は再生成対象とする。
|
|
28
|
+
*/
|
|
29
|
+
/**
|
|
30
|
+
* envVarsOverride に `CLAUDE_CODE_OAUTH_TOKEN` が含まれていれば、
|
|
31
|
+
* `~/.claude.json` に `oauthAccount` キー（オブジェクト）を存在させる。
|
|
32
|
+
*
|
|
33
|
+
* 動作:
|
|
34
|
+
* - envVarsOverride に CLAUDE_CODE_OAUTH_TOKEN が無い / 不正な場合は何もしない
|
|
35
|
+
* - 並列 spawn での lost update を防ぐため lockfile で排他
|
|
36
|
+
* - `~/.claude.json` が存在しない or 破損している場合は最小限の JSON で新規作成
|
|
37
|
+
* (破損時は `.claude.json.broken-<ts>` にバックアップを残す)
|
|
38
|
+
* - トップレベルが object でない場合 (配列/プリミティブ) は corrupted 扱い
|
|
39
|
+
* - 既に `oauthAccount` がオブジェクトとして存在すれば変更しない
|
|
40
|
+
* (既存値が空オブジェクト `{}` でも書き換え発生せず、mtime も変化しない)
|
|
41
|
+
* - atomic write + 明示的 chmod 0o600
|
|
42
|
+
*
|
|
43
|
+
* 失敗は warn してスキップ（spawn 自体は止めない）。
|
|
44
|
+
*/
|
|
45
|
+
export declare function ensureClaudeJsonOAuthAccount(envVarsOverride: Record<string, string> | undefined, ctx: {
|
|
46
|
+
prefix: string;
|
|
47
|
+
}): void;
|
|
48
|
+
//# sourceMappingURL=claude-json-oauth-sync.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-json-oauth-sync.d.ts","sourceRoot":"","sources":["../../src/utils/claude-json-oauth-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AA4MH;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,4BAA4B,CAC1C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EACnD,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACtB,IAAI,CAwBN"}
|
|
@@ -0,0 +1,340 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* `~/.claude.json` の `oauthAccount` セクション同期 helper。
|
|
4
|
+
*
|
|
5
|
+
* Claude Code CLI v2.1.150 は、`CLAUDE_CODE_OAUTH_TOKEN` env を渡しても
|
|
6
|
+
* 対話モード (TTY) 起動時に `~/.claude.json` の `oauthAccount` キーが
|
|
7
|
+
* 存在しないと `/login` プロンプトを出す。
|
|
8
|
+
*
|
|
9
|
+
* 実機検証で「`oauthAccount: {}` (空オブジェクト) が `~/.claude.json` に
|
|
10
|
+
* 存在していれば対話モードでも認証通過する」ことが判明している
|
|
11
|
+
* (claude auth status が `{"loggedIn": true, "authMethod": "oauth_token"}` を返す)。
|
|
12
|
+
*
|
|
13
|
+
* agent は PTY / code-server を spawn する前にこの helper を呼び、
|
|
14
|
+
* envVarsOverride に `CLAUDE_CODE_OAUTH_TOKEN` が含まれていれば
|
|
15
|
+
* `~/.claude.json` の `oauthAccount` キーを確保する。
|
|
16
|
+
*
|
|
17
|
+
* 設計上の注意:
|
|
18
|
+
*
|
|
19
|
+
* - `~/.claude.json` はホスト/コンテナで volume mount 共有されているケースが
|
|
20
|
+
* 多い (mbc-ai-01 では複数プロジェクトコンテナが同一ファイルを参照)。
|
|
21
|
+
* 並列 spawn による lost-update を防ぐため、`O_CREAT|O_EXCL` lockfile
|
|
22
|
+
* 方式で排他制御する。
|
|
23
|
+
* - atomic write: 一時ファイルに書き込んでから rename で置換する。
|
|
24
|
+
* 書き込み途中で kill されても破損ファイルが残らない。
|
|
25
|
+
* - mode 0o600 を明示的に chmod する。`writeFileSync` の mode は
|
|
26
|
+
* 既存ファイルには適用されない Node.js 仕様への対策。
|
|
27
|
+
* - 既存 `oauthAccount` が **オブジェクト型** の場合のみ温存する。
|
|
28
|
+
* `false`/`""`/`0`/`[]`/`null` 等の不正値は再生成対象とする。
|
|
29
|
+
*/
|
|
30
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
31
|
+
if (k2 === undefined) k2 = k;
|
|
32
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
33
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
34
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
35
|
+
}
|
|
36
|
+
Object.defineProperty(o, k2, desc);
|
|
37
|
+
}) : (function(o, m, k, k2) {
|
|
38
|
+
if (k2 === undefined) k2 = k;
|
|
39
|
+
o[k2] = m[k];
|
|
40
|
+
}));
|
|
41
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
42
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
43
|
+
}) : function(o, v) {
|
|
44
|
+
o["default"] = v;
|
|
45
|
+
});
|
|
46
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
47
|
+
var ownKeys = function(o) {
|
|
48
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
49
|
+
var ar = [];
|
|
50
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
51
|
+
return ar;
|
|
52
|
+
};
|
|
53
|
+
return ownKeys(o);
|
|
54
|
+
};
|
|
55
|
+
return function (mod) {
|
|
56
|
+
if (mod && mod.__esModule) return mod;
|
|
57
|
+
var result = {};
|
|
58
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
59
|
+
__setModuleDefault(result, mod);
|
|
60
|
+
return result;
|
|
61
|
+
};
|
|
62
|
+
})();
|
|
63
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
64
|
+
exports.ensureClaudeJsonOAuthAccount = ensureClaudeJsonOAuthAccount;
|
|
65
|
+
const fs = __importStar(require("fs"));
|
|
66
|
+
const os = __importStar(require("os"));
|
|
67
|
+
const path = __importStar(require("path"));
|
|
68
|
+
const logger_1 = require("../logger");
|
|
69
|
+
/** ~/.claude.json のパスを返す */
|
|
70
|
+
function getClaudeJsonPath() {
|
|
71
|
+
return path.join(os.homedir(), '.claude.json');
|
|
72
|
+
}
|
|
73
|
+
/** 排他ロック用ファイル */
|
|
74
|
+
function getLockPath() {
|
|
75
|
+
return path.join(os.homedir(), '.claude.json.lock');
|
|
76
|
+
}
|
|
77
|
+
/** 破損ファイルダンプ用パス（タイムスタンプ付） */
|
|
78
|
+
function getBrokenDumpPath() {
|
|
79
|
+
const ts = new Date().toISOString().replace(/[:.]/g, '-');
|
|
80
|
+
return path.join(os.homedir(), `.claude.json.broken-${ts}`);
|
|
81
|
+
}
|
|
82
|
+
/** ロック取得試行間隔・最大試行数 */
|
|
83
|
+
const LOCK_RETRY_INTERVAL_MS = 50;
|
|
84
|
+
const LOCK_RETRY_MAX = 40; // 50ms × 40 = 最大 2 秒待つ
|
|
85
|
+
/** ロックファイルがこの年齢を超えていたら stale とみなして奪う */
|
|
86
|
+
const LOCK_STALE_MS = 30_000;
|
|
87
|
+
/**
|
|
88
|
+
* `O_CREAT|O_EXCL` で lock ファイルを排他作成する。
|
|
89
|
+
* 既に存在し、stale 判定でない場合は false を返す。
|
|
90
|
+
*/
|
|
91
|
+
function acquireLock(lockPath) {
|
|
92
|
+
try {
|
|
93
|
+
const fd = fs.openSync(lockPath, fs.constants.O_WRONLY | fs.constants.O_CREAT | fs.constants.O_EXCL, 0o600);
|
|
94
|
+
return fd;
|
|
95
|
+
}
|
|
96
|
+
catch (error) {
|
|
97
|
+
const err = error;
|
|
98
|
+
if (err.code === 'EEXIST') {
|
|
99
|
+
// stale check
|
|
100
|
+
try {
|
|
101
|
+
const stat = fs.statSync(lockPath);
|
|
102
|
+
if (Date.now() - stat.mtimeMs > LOCK_STALE_MS) {
|
|
103
|
+
logger_1.logger.warn(`[claude-json-sync] Removing stale lock file (age ${Math.round((Date.now() - stat.mtimeMs) / 1000)}s)`);
|
|
104
|
+
fs.unlinkSync(lockPath);
|
|
105
|
+
// 再帰でもう一度試行
|
|
106
|
+
return acquireLock(lockPath);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
// stat 失敗時はロック取得失敗扱い
|
|
111
|
+
}
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
114
|
+
throw error;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
function releaseLock(fd, lockPath) {
|
|
118
|
+
try {
|
|
119
|
+
fs.closeSync(fd);
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
// 既に閉じている可能性
|
|
123
|
+
}
|
|
124
|
+
try {
|
|
125
|
+
fs.unlinkSync(lockPath);
|
|
126
|
+
}
|
|
127
|
+
catch {
|
|
128
|
+
// 既に削除されている可能性
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
/**
|
|
132
|
+
* lock を取得して fn を実行。取得できなければ null 返却。
|
|
133
|
+
* 短時間（最大 2 秒）リトライする。
|
|
134
|
+
*/
|
|
135
|
+
function withLock(lockPath, fn) {
|
|
136
|
+
for (let i = 0; i < LOCK_RETRY_MAX; i++) {
|
|
137
|
+
const fd = acquireLock(lockPath);
|
|
138
|
+
if (fd !== null) {
|
|
139
|
+
try {
|
|
140
|
+
return fn();
|
|
141
|
+
}
|
|
142
|
+
finally {
|
|
143
|
+
releaseLock(fd, lockPath);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
// busy-wait（同期）。Node.js の同期 spawn 直前のため非同期化しない
|
|
147
|
+
const start = Date.now();
|
|
148
|
+
while (Date.now() - start < LOCK_RETRY_INTERVAL_MS) {
|
|
149
|
+
// spin
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
/**
|
|
155
|
+
* トップレベルが plain object かどうか
|
|
156
|
+
*/
|
|
157
|
+
function isPlainObject(value) {
|
|
158
|
+
return (typeof value === 'object' &&
|
|
159
|
+
value !== null &&
|
|
160
|
+
!Array.isArray(value));
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* 既存 oauthAccount が「有効な object（再 login 済みの正規メタデータ）」か。
|
|
164
|
+
* 空オブジェクト `{}` も placeholder として有効とみなす（再書き込みを避ける）。
|
|
165
|
+
* 配列・プリミティブ・null は無効として再生成する。
|
|
166
|
+
*/
|
|
167
|
+
function hasValidOauthAccount(data) {
|
|
168
|
+
if (!('oauthAccount' in data))
|
|
169
|
+
return false;
|
|
170
|
+
const v = data.oauthAccount;
|
|
171
|
+
return isPlainObject(v);
|
|
172
|
+
}
|
|
173
|
+
/**
|
|
174
|
+
* OAuth token の妥当性を簡易検証。
|
|
175
|
+
* - 文字列でなければ無効
|
|
176
|
+
* - trim 後に空ならば無効
|
|
177
|
+
* - `'undefined'` / `'null'` の literal を弾く
|
|
178
|
+
*/
|
|
179
|
+
function isAcceptableToken(token) {
|
|
180
|
+
if (typeof token !== 'string')
|
|
181
|
+
return false;
|
|
182
|
+
const trimmed = token.trim();
|
|
183
|
+
if (trimmed === '')
|
|
184
|
+
return false;
|
|
185
|
+
if (trimmed === 'undefined' || trimmed === 'null')
|
|
186
|
+
return false;
|
|
187
|
+
return true;
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* 書き換え戦略:
|
|
191
|
+
*
|
|
192
|
+
* 1. **tmp + rename (atomic)**: tmp ファイルに書いてから `fs.renameSync` で
|
|
193
|
+
* 原子的に置換。POSIX rename atomicity により、書き込み途中で kill されても
|
|
194
|
+
* 破損ファイルが残らない。**ローカルディスク上のファイルでは最善**。
|
|
195
|
+
*
|
|
196
|
+
* 2. **直接 write (fallback)**: rename が `EBUSY` で失敗した場合に使う。
|
|
197
|
+
* Linux では **docker bind mount された個別ファイル** に対する rename が
|
|
198
|
+
* `EBUSY` で拒否される（マウントポイント自体を置換することになるため）。
|
|
199
|
+
* mbc-ai-01 では `~/.claude.json` がコンテナにファイル単位で bind mount
|
|
200
|
+
* されており、この経路が必須。
|
|
201
|
+
* fallback では partial write 耐性が無いが、ホスト側のロックで並列性は
|
|
202
|
+
* 既に防いでいるため運用上の影響は限定的。
|
|
203
|
+
*
|
|
204
|
+
* いずれの経路でも書き込み後に明示的に `chmod 0o600` を呼ぶ。
|
|
205
|
+
*/
|
|
206
|
+
function atomicWriteJson(targetPath, data) {
|
|
207
|
+
// claude CLI と同じく minified で書く（差分ノイズを抑える）
|
|
208
|
+
const json = JSON.stringify(data);
|
|
209
|
+
// Path 1: tmp + rename を試す（atomic）
|
|
210
|
+
const dir = path.dirname(targetPath);
|
|
211
|
+
const tmpPath = path.join(dir, `.claude.json.tmp.${process.pid}.${Date.now()}`);
|
|
212
|
+
let tmpWritten = false;
|
|
213
|
+
try {
|
|
214
|
+
fs.writeFileSync(tmpPath, json, { mode: 0o600 });
|
|
215
|
+
tmpWritten = true;
|
|
216
|
+
try {
|
|
217
|
+
fs.chmodSync(tmpPath, 0o600);
|
|
218
|
+
}
|
|
219
|
+
catch {
|
|
220
|
+
// chmod 失敗は致命的ではない
|
|
221
|
+
}
|
|
222
|
+
fs.renameSync(tmpPath, targetPath);
|
|
223
|
+
tmpWritten = false; // rename 成功 → tmp は無くなった
|
|
224
|
+
}
|
|
225
|
+
catch (error) {
|
|
226
|
+
const err = error;
|
|
227
|
+
if (err.code === 'EBUSY' || err.code === 'EXDEV' || err.code === 'EPERM') {
|
|
228
|
+
// EBUSY: docker bind mount された file への rename (Linux の制約)
|
|
229
|
+
// EXDEV: cross-device link (まず起きないが念のため)
|
|
230
|
+
// EPERM: 一部 FS で rename 不可
|
|
231
|
+
// → 直接 write にフォールバック
|
|
232
|
+
logger_1.logger.debug(`[claude-json-sync] rename failed (${err.code}); falling back to direct write (bind-mount path)`);
|
|
233
|
+
fs.writeFileSync(targetPath, json, { mode: 0o600 });
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
// 他のエラーは上位に伝播
|
|
237
|
+
throw error;
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
finally {
|
|
241
|
+
// tmp が残っていれば掃除
|
|
242
|
+
if (tmpWritten) {
|
|
243
|
+
try {
|
|
244
|
+
fs.unlinkSync(tmpPath);
|
|
245
|
+
}
|
|
246
|
+
catch {
|
|
247
|
+
// 既に消えていれば無視
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
// 最終的な target に対して mode を保証 (既存ファイルは writeFileSync の mode を無視するため)
|
|
252
|
+
try {
|
|
253
|
+
fs.chmodSync(targetPath, 0o600);
|
|
254
|
+
}
|
|
255
|
+
catch {
|
|
256
|
+
// chmod 失敗は致命的ではない
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
/**
|
|
260
|
+
* envVarsOverride に `CLAUDE_CODE_OAUTH_TOKEN` が含まれていれば、
|
|
261
|
+
* `~/.claude.json` に `oauthAccount` キー（オブジェクト）を存在させる。
|
|
262
|
+
*
|
|
263
|
+
* 動作:
|
|
264
|
+
* - envVarsOverride に CLAUDE_CODE_OAUTH_TOKEN が無い / 不正な場合は何もしない
|
|
265
|
+
* - 並列 spawn での lost update を防ぐため lockfile で排他
|
|
266
|
+
* - `~/.claude.json` が存在しない or 破損している場合は最小限の JSON で新規作成
|
|
267
|
+
* (破損時は `.claude.json.broken-<ts>` にバックアップを残す)
|
|
268
|
+
* - トップレベルが object でない場合 (配列/プリミティブ) は corrupted 扱い
|
|
269
|
+
* - 既に `oauthAccount` がオブジェクトとして存在すれば変更しない
|
|
270
|
+
* (既存値が空オブジェクト `{}` でも書き換え発生せず、mtime も変化しない)
|
|
271
|
+
* - atomic write + 明示的 chmod 0o600
|
|
272
|
+
*
|
|
273
|
+
* 失敗は warn してスキップ（spawn 自体は止めない）。
|
|
274
|
+
*/
|
|
275
|
+
function ensureClaudeJsonOAuthAccount(envVarsOverride, ctx) {
|
|
276
|
+
const token = envVarsOverride?.CLAUDE_CODE_OAUTH_TOKEN;
|
|
277
|
+
if (!isAcceptableToken(token))
|
|
278
|
+
return;
|
|
279
|
+
const claudeJsonPath = getClaudeJsonPath();
|
|
280
|
+
const lockPath = getLockPath();
|
|
281
|
+
try {
|
|
282
|
+
const result = withLock(lockPath, () => {
|
|
283
|
+
return syncOauthAccount(claudeJsonPath, ctx);
|
|
284
|
+
});
|
|
285
|
+
if (result === null) {
|
|
286
|
+
logger_1.logger.warn(`${ctx.prefix} Could not acquire lock on ${lockPath} after ${(LOCK_RETRY_INTERVAL_MS * LOCK_RETRY_MAX) / 1000}s; skipping oauthAccount sync (another agent process may be writing)`);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
catch (error) {
|
|
290
|
+
logger_1.logger.warn(`${ctx.prefix} Failed to sync ~/.claude.json for OAuth login: ${error instanceof Error ? error.message : String(error)}`);
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
/**
|
|
294
|
+
* ロック取得済み前提で実行する同期本体。
|
|
295
|
+
*/
|
|
296
|
+
function syncOauthAccount(claudeJsonPath, ctx) {
|
|
297
|
+
let data = {};
|
|
298
|
+
let needBackup = false;
|
|
299
|
+
if (fs.existsSync(claudeJsonPath)) {
|
|
300
|
+
const raw = fs.readFileSync(claudeJsonPath, 'utf-8');
|
|
301
|
+
let parsed;
|
|
302
|
+
try {
|
|
303
|
+
parsed = JSON.parse(raw);
|
|
304
|
+
}
|
|
305
|
+
catch {
|
|
306
|
+
needBackup = true;
|
|
307
|
+
parsed = null;
|
|
308
|
+
}
|
|
309
|
+
if (isPlainObject(parsed)) {
|
|
310
|
+
data = parsed;
|
|
311
|
+
}
|
|
312
|
+
else if (parsed !== null) {
|
|
313
|
+
// 配列 / 文字列 / 数値 / boolean 等のトップレベル値 → corrupted 扱い
|
|
314
|
+
needBackup = true;
|
|
315
|
+
}
|
|
316
|
+
if (needBackup) {
|
|
317
|
+
// 破損データを後で確認できるよう退避
|
|
318
|
+
try {
|
|
319
|
+
const dumpPath = getBrokenDumpPath();
|
|
320
|
+
fs.writeFileSync(dumpPath, raw, { mode: 0o600 });
|
|
321
|
+
logger_1.logger.warn(`${ctx.prefix} ~/.claude.json was corrupted or non-object; dumped to ${dumpPath} and recreating minimal file`);
|
|
322
|
+
}
|
|
323
|
+
catch {
|
|
324
|
+
logger_1.logger.warn(`${ctx.prefix} ~/.claude.json was corrupted; recreating minimal file (backup dump failed)`);
|
|
325
|
+
}
|
|
326
|
+
data = {};
|
|
327
|
+
}
|
|
328
|
+
}
|
|
329
|
+
// 既存 oauthAccount がオブジェクトとして存在すれば変更しない
|
|
330
|
+
if (hasValidOauthAccount(data)) {
|
|
331
|
+
return 'noop';
|
|
332
|
+
}
|
|
333
|
+
// 追加 or 不正値の上書き
|
|
334
|
+
const wasPresent = 'oauthAccount' in data;
|
|
335
|
+
const next = { ...data, oauthAccount: {} };
|
|
336
|
+
atomicWriteJson(claudeJsonPath, next);
|
|
337
|
+
logger_1.logger.info(`${ctx.prefix} ${wasPresent ? 'Replaced invalid oauthAccount with placeholder' : 'Added oauthAccount placeholder'} in ~/.claude.json (CLAUDE_CODE_OAUTH_TOKEN authentication)`);
|
|
338
|
+
return wasPresent ? 'updated' : 'created';
|
|
339
|
+
}
|
|
340
|
+
//# sourceMappingURL=claude-json-oauth-sync.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude-json-oauth-sync.js","sourceRoot":"","sources":["../../src/utils/claude-json-oauth-sync.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"AA2BA,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"}
|
|
@@ -41,6 +41,8 @@ const net = __importStar(require("net"));
|
|
|
41
41
|
const path = __importStar(require("path"));
|
|
42
42
|
const env_vars_filter_1 = require("../env-vars-filter");
|
|
43
43
|
const logger_1 = require("../logger");
|
|
44
|
+
const claude_config_validator_1 = require("../utils/claude-config-validator");
|
|
45
|
+
const claude_json_oauth_sync_1 = require("../utils/claude-json-oauth-sync");
|
|
44
46
|
const sandbox_init_script_1 = require("../terminal/sandbox-init-script");
|
|
45
47
|
const utils_1 = require("../utils");
|
|
46
48
|
const constants_1 = require("./constants");
|
|
@@ -109,6 +111,14 @@ class VsCodeServer {
|
|
|
109
111
|
for (const [key, value] of Object.entries(filteredOverride)) {
|
|
110
112
|
codeServerEnv[key] = value;
|
|
111
113
|
}
|
|
114
|
+
// Claude Code 対話モード (VS Code 内蔵ターミナルから claude を実行) は
|
|
115
|
+
// ~/.claude.json の oauthAccount キーが存在しないと CLAUDE_CODE_OAUTH_TOKEN env を
|
|
116
|
+
// 持っていても /login プロンプトを出す。code-server 起動前に、
|
|
117
|
+
// (1) JSON 破損があれば backup から復元、(2) oauthAccount placeholder を確保。
|
|
118
|
+
(0, claude_config_validator_1.ensureClaudeJsonIntegrity)();
|
|
119
|
+
(0, claude_json_oauth_sync_1.ensureClaudeJsonOAuthAccount)(filteredOverride, {
|
|
120
|
+
prefix: '[vscode-server]',
|
|
121
|
+
});
|
|
112
122
|
this.process = (0, child_process_1.spawn)('code-server', [
|
|
113
123
|
'--bind-addr', `${constants_1.VSCODE_BIND_HOST}:${this.port}`,
|
|
114
124
|
'--auth', 'none',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"vscode-server.js","sourceRoot":"","sources":["../../src/vscode/vscode-server.ts"],"names":[],"mappings":"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"}
|