@ai-support-agent/cli 0.0.15-beta.1 → 0.0.16-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/chat-executor.d.ts.map +1 -1
- package/dist/commands/chat-executor.js +21 -3
- package/dist/commands/chat-executor.js.map +1 -1
- package/dist/git-credential-setup.d.ts +41 -0
- package/dist/git-credential-setup.d.ts.map +1 -0
- package/dist/git-credential-setup.js +228 -0
- package/dist/git-credential-setup.js.map +1 -0
- package/dist/repo-sync.js +2 -2
- package/dist/repo-sync.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"chat-executor.d.ts","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAKzC,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAsB,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,KAAK,aAAa,EAAe,KAAK,qBAAqB,EAAiB,MAAM,UAAU,CAAA;AAW1M,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1F;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,IAAI,CAAA;CAAE,CAAC,CAE1E;AAED,qCAAqC;AACrC,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,WAAW,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,SAAS,CAAA;IACjB,YAAY,CAAC,EAAE,iBAAiB,CAAA;IAChC,cAAc,CAAC,EAAE,aAAa,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,aAAa,CAAC,EAAE,qBAAqB,CAAA;IACrC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,aAAa,CAAC,CA2BnG;AA6LD,wBAAgB,2BAA2B,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,MAAM,CAMrF;AAED,wBAAgB,mBAAmB,CACjC,cAAc,EAAE,MAAM,GAAG,IAAI,EAC7B,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CAGR"}
|
|
@@ -8,6 +8,7 @@ exports.buildConversationFileNotice = buildConversationFileNotice;
|
|
|
8
8
|
exports.buildMetadataNotice = buildMetadataNotice;
|
|
9
9
|
const aws_credential_builder_1 = require("../aws-credential-builder");
|
|
10
10
|
const constants_1 = require("../constants");
|
|
11
|
+
const git_credential_setup_1 = require("../git-credential-setup");
|
|
11
12
|
const logger_1 = require("../logger");
|
|
12
13
|
const types_1 = require("../types");
|
|
13
14
|
const utils_1 = require("../utils");
|
|
@@ -100,6 +101,8 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
100
101
|
}
|
|
101
102
|
return rawSendChunk(type, content);
|
|
102
103
|
};
|
|
104
|
+
let cleanupDownloads;
|
|
105
|
+
let cleanupGitCredentials;
|
|
103
106
|
try {
|
|
104
107
|
const allowedTools = serverConfig?.claudeCodeConfig?.allowedTools;
|
|
105
108
|
const systemPrompt = serverConfig?.claudeCodeConfig?.systemPrompt;
|
|
@@ -130,11 +133,22 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
130
133
|
awsEnv = awsResult.env;
|
|
131
134
|
await sendAwsCredentialNotices(awsResult, projectCode, sendChunk);
|
|
132
135
|
}
|
|
136
|
+
// Git 認証情報を取得（SSH ラッパー + credential helper）
|
|
137
|
+
let gitEnv;
|
|
138
|
+
if (projectConfig?.repositories?.length) {
|
|
139
|
+
try {
|
|
140
|
+
const gitCredResult = await (0, git_credential_setup_1.buildGitCredentialEnv)(client, projectConfig.repositories);
|
|
141
|
+
gitEnv = gitCredResult.env;
|
|
142
|
+
cleanupGitCredentials = gitCredResult.cleanup;
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
logger_1.logger.warn(`[chat] Git credential setup failed: ${(0, utils_1.getErrorMessage)(error)}`);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
133
148
|
// 添付ファイルのダウンロード
|
|
134
149
|
const chatFiles = (0, file_transfer_1.parseChatFiles)(payload.files);
|
|
135
150
|
const conversationId = (0, utils_1.parseString)(payload.conversationId);
|
|
136
151
|
let filePathsNotice = '';
|
|
137
|
-
let cleanupDownloads;
|
|
138
152
|
if (chatFiles.length > 0 && projectDir && conversationId) {
|
|
139
153
|
const downloadResult = await (0, file_transfer_1.downloadChatFiles)(client, agentId, chatFiles, projectDir, conversationId);
|
|
140
154
|
cleanupDownloads = downloadResult.cleanup;
|
|
@@ -162,6 +176,7 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
162
176
|
addDirs?.length ? `addDirs: ${addDirs.join(', ')}` : null,
|
|
163
177
|
locale ? `locale=${locale}` : null,
|
|
164
178
|
awsEnv ? 'AWS credentials' : null,
|
|
179
|
+
gitEnv && Object.keys(gitEnv).length > 0 ? 'Git credentials' : null,
|
|
165
180
|
mcpConfigPath ? 'MCP config' : null,
|
|
166
181
|
history.length > 0 ? `${history.length} history messages` : null,
|
|
167
182
|
chatFiles.length > 0 ? `${chatFiles.length} attached files` : null,
|
|
@@ -176,7 +191,7 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
176
191
|
allowedTools,
|
|
177
192
|
addDirs,
|
|
178
193
|
locale,
|
|
179
|
-
awsEnv,
|
|
194
|
+
awsEnv: { ...awsEnv, ...gitEnv },
|
|
180
195
|
mcpConfigPath,
|
|
181
196
|
cwd: projectDir ? (0, project_dir_1.getWorkspaceDir)(projectDir) : undefined,
|
|
182
197
|
systemPrompt,
|
|
@@ -202,11 +217,14 @@ async function executeClaudeCodeChat(payload, commandId, client, agentId, server
|
|
|
202
217
|
metadata: result.metadata,
|
|
203
218
|
...(collectedToolCalls.length > 0 ? { toolCalls: collectedToolCalls } : {}),
|
|
204
219
|
});
|
|
205
|
-
//
|
|
220
|
+
// 一時ファイルをクリーンアップ
|
|
206
221
|
cleanupDownloads?.();
|
|
222
|
+
cleanupGitCredentials?.();
|
|
207
223
|
return (0, types_1.successResult)(result.text);
|
|
208
224
|
}
|
|
209
225
|
catch (error) {
|
|
226
|
+
cleanupDownloads?.();
|
|
227
|
+
cleanupGitCredentials?.();
|
|
210
228
|
return (0, shared_chat_utils_1.handleChatError)(error, commandId, 'chat', sendChunk);
|
|
211
229
|
}
|
|
212
230
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"chat-executor.js","sourceRoot":"","sources":["../../src/commands/chat-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { ApiClient } from './api-client';
|
|
2
|
+
import type { ProjectConfigResponse } from './types';
|
|
3
|
+
export interface GitCredentialResult {
|
|
4
|
+
env: Record<string, string>;
|
|
5
|
+
cleanup: () => void;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* リポジトリURLからホスト名を抽出する
|
|
9
|
+
* SSH: git@gitlab.com:org/repo.git → gitlab.com
|
|
10
|
+
* HTTPS: https://github.com/org/repo.git → github.com
|
|
11
|
+
*/
|
|
12
|
+
export declare function extractHostFromUrl(url: string): string;
|
|
13
|
+
/**
|
|
14
|
+
* リポジトリURLからパスを抽出する（credential helper のマッチング用）
|
|
15
|
+
* SSH: git@gitlab.com:org/repo.git → org/repo.git
|
|
16
|
+
* HTTPS: https://github.com/org/repo.git → org/repo.git
|
|
17
|
+
*/
|
|
18
|
+
export declare function extractPathFromUrl(url: string): string;
|
|
19
|
+
/**
|
|
20
|
+
* SSHラッパースクリプトを生成する
|
|
21
|
+
* ホスト名に応じて適切なSSH鍵を選択する
|
|
22
|
+
*/
|
|
23
|
+
export declare function buildSshWrapperScript(entries: {
|
|
24
|
+
host: string;
|
|
25
|
+
keyPath: string;
|
|
26
|
+
}[]): string;
|
|
27
|
+
/**
|
|
28
|
+
* Git credential helper スクリプトを生成する
|
|
29
|
+
* stdin から protocol/host/path を読み取り、一致するリポジトリのトークンを返す
|
|
30
|
+
*/
|
|
31
|
+
export declare function buildCredentialHelperScript(entries: {
|
|
32
|
+
host: string;
|
|
33
|
+
pathPrefix: string;
|
|
34
|
+
token: string;
|
|
35
|
+
}[]): string;
|
|
36
|
+
/**
|
|
37
|
+
* プロジェクトのリポジトリ認証情報をセットアップし、
|
|
38
|
+
* Claude Code サブプロセスに渡す環境変数とクリーンアップ関数を返す
|
|
39
|
+
*/
|
|
40
|
+
export declare function buildGitCredentialEnv(client: ApiClient, repositories: NonNullable<ProjectConfigResponse['repositories']>): Promise<GitCredentialResult>;
|
|
41
|
+
//# sourceMappingURL=git-credential-setup.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-credential-setup.d.ts","sourceRoot":"","sources":["../src/git-credential-setup.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAA;AAGpD,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAatD;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAetD;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,MAAM,CA2B1F;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,GAAG,MAAM,CAoClH;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,WAAW,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,GAC/D,OAAO,CAAC,mBAAmB,CAAC,CA2D9B"}
|
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.extractHostFromUrl = extractHostFromUrl;
|
|
37
|
+
exports.extractPathFromUrl = extractPathFromUrl;
|
|
38
|
+
exports.buildSshWrapperScript = buildSshWrapperScript;
|
|
39
|
+
exports.buildCredentialHelperScript = buildCredentialHelperScript;
|
|
40
|
+
exports.buildGitCredentialEnv = buildGitCredentialEnv;
|
|
41
|
+
const crypto = __importStar(require("crypto"));
|
|
42
|
+
const fs = __importStar(require("fs"));
|
|
43
|
+
const os = __importStar(require("os"));
|
|
44
|
+
const path = __importStar(require("path"));
|
|
45
|
+
const logger_1 = require("./logger");
|
|
46
|
+
const repo_sync_1 = require("./repo-sync");
|
|
47
|
+
const utils_1 = require("./utils");
|
|
48
|
+
/**
|
|
49
|
+
* リポジトリURLからホスト名を抽出する
|
|
50
|
+
* SSH: git@gitlab.com:org/repo.git → gitlab.com
|
|
51
|
+
* HTTPS: https://github.com/org/repo.git → github.com
|
|
52
|
+
*/
|
|
53
|
+
function extractHostFromUrl(url) {
|
|
54
|
+
// SSH形式: git@host:path
|
|
55
|
+
const sshMatch = url.match(/^[^@]+@([^:]+):/);
|
|
56
|
+
if (sshMatch) {
|
|
57
|
+
return sshMatch[1];
|
|
58
|
+
}
|
|
59
|
+
// HTTPS形式
|
|
60
|
+
try {
|
|
61
|
+
return new URL(url).hostname;
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return '';
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* リポジトリURLからパスを抽出する（credential helper のマッチング用）
|
|
69
|
+
* SSH: git@gitlab.com:org/repo.git → org/repo.git
|
|
70
|
+
* HTTPS: https://github.com/org/repo.git → org/repo.git
|
|
71
|
+
*/
|
|
72
|
+
function extractPathFromUrl(url) {
|
|
73
|
+
// SSH形式: git@host:path
|
|
74
|
+
const sshMatch = url.match(/^[^@]+@[^:]+:(.+)$/);
|
|
75
|
+
if (sshMatch) {
|
|
76
|
+
return sshMatch[1];
|
|
77
|
+
}
|
|
78
|
+
// HTTPS形式
|
|
79
|
+
try {
|
|
80
|
+
const parsed = new URL(url);
|
|
81
|
+
// 先頭の / を除去
|
|
82
|
+
return parsed.pathname.replace(/^\//, '');
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
return '';
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* SSHラッパースクリプトを生成する
|
|
90
|
+
* ホスト名に応じて適切なSSH鍵を選択する
|
|
91
|
+
*/
|
|
92
|
+
function buildSshWrapperScript(entries) {
|
|
93
|
+
const cases = entries.map((entry) => ` ${entry.host})\n exec ssh -i "${entry.keyPath}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "$@"\n ;;`).join('\n');
|
|
94
|
+
return `#!/bin/sh
|
|
95
|
+
# Extract hostname from ssh arguments
|
|
96
|
+
# Git calls: ssh [options...] user@host command
|
|
97
|
+
# Find the first non-option argument and extract host from user@host
|
|
98
|
+
HOST=""
|
|
99
|
+
for arg in "$@"; do
|
|
100
|
+
case "$arg" in
|
|
101
|
+
-*) ;;
|
|
102
|
+
*)
|
|
103
|
+
HOST=$(echo "$arg" | sed 's/.*@//')
|
|
104
|
+
break
|
|
105
|
+
;;
|
|
106
|
+
esac
|
|
107
|
+
done
|
|
108
|
+
|
|
109
|
+
case "$HOST" in
|
|
110
|
+
${cases}
|
|
111
|
+
*)
|
|
112
|
+
exec ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "$@"
|
|
113
|
+
;;
|
|
114
|
+
esac
|
|
115
|
+
`;
|
|
116
|
+
}
|
|
117
|
+
/**
|
|
118
|
+
* Git credential helper スクリプトを生成する
|
|
119
|
+
* stdin から protocol/host/path を読み取り、一致するリポジトリのトークンを返す
|
|
120
|
+
*/
|
|
121
|
+
function buildCredentialHelperScript(entries) {
|
|
122
|
+
const conditions = entries.map((entry) => {
|
|
123
|
+
return ` if [ "$host" = "${entry.host}" ]; then
|
|
124
|
+
case "$path" in
|
|
125
|
+
${entry.pathPrefix}*)
|
|
126
|
+
echo "protocol=$protocol"
|
|
127
|
+
echo "host=$host"
|
|
128
|
+
echo "username=x-access-token"
|
|
129
|
+
echo "password=${entry.token}"
|
|
130
|
+
exit 0
|
|
131
|
+
;;
|
|
132
|
+
esac
|
|
133
|
+
fi`;
|
|
134
|
+
}).join('\n');
|
|
135
|
+
return `#!/bin/sh
|
|
136
|
+
# Git credential helper - reads protocol/host/path from stdin
|
|
137
|
+
# Only respond to 'get' operation (ignore 'store' and 'erase')
|
|
138
|
+
if [ "$1" != "get" ]; then
|
|
139
|
+
exit 0
|
|
140
|
+
fi
|
|
141
|
+
|
|
142
|
+
protocol=""
|
|
143
|
+
host=""
|
|
144
|
+
path=""
|
|
145
|
+
|
|
146
|
+
while IFS='=' read -r key value; do
|
|
147
|
+
case "$key" in
|
|
148
|
+
protocol) protocol="$value" ;;
|
|
149
|
+
host) host="$value" ;;
|
|
150
|
+
path) path="$value" ;;
|
|
151
|
+
esac
|
|
152
|
+
done
|
|
153
|
+
|
|
154
|
+
${conditions}
|
|
155
|
+
`;
|
|
156
|
+
}
|
|
157
|
+
/**
|
|
158
|
+
* プロジェクトのリポジトリ認証情報をセットアップし、
|
|
159
|
+
* Claude Code サブプロセスに渡す環境変数とクリーンアップ関数を返す
|
|
160
|
+
*/
|
|
161
|
+
async function buildGitCredentialEnv(client, repositories) {
|
|
162
|
+
if (repositories.length === 0) {
|
|
163
|
+
return { env: {}, cleanup: () => { } };
|
|
164
|
+
}
|
|
165
|
+
const tempFiles = [];
|
|
166
|
+
const sshEntries = [];
|
|
167
|
+
const httpsEntries = [];
|
|
168
|
+
for (const repo of repositories) {
|
|
169
|
+
try {
|
|
170
|
+
const credentials = await client.getRepoCredentials(repo.repositoryId);
|
|
171
|
+
const host = extractHostFromUrl(credentials.repositoryUrl);
|
|
172
|
+
if (!host) {
|
|
173
|
+
logger_1.logger.warn(`[git-cred] Could not extract host from URL for repository ${repo.repositoryName}`);
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
if (credentials.authMethod === 'ssh') {
|
|
177
|
+
await addSshEntry(credentials.authSecret, host, sshEntries, tempFiles);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
const pathPrefix = extractPathFromUrl(credentials.repositoryUrl);
|
|
181
|
+
httpsEntries.push({ host, pathPrefix, token: credentials.authSecret });
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
catch (error) {
|
|
185
|
+
logger_1.logger.warn(`[git-cred] Failed to get credentials for repository ${repo.repositoryName}: ${(0, utils_1.getErrorMessage)(error)}`);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
const env = {};
|
|
189
|
+
// SSH ラッパースクリプト
|
|
190
|
+
if (sshEntries.length > 0) {
|
|
191
|
+
const wrapperPath = writeTempScript(buildSshWrapperScript(sshEntries), 'git-ssh-wrapper');
|
|
192
|
+
tempFiles.push(wrapperPath);
|
|
193
|
+
env.GIT_SSH_COMMAND = wrapperPath;
|
|
194
|
+
}
|
|
195
|
+
// HTTPS credential helper
|
|
196
|
+
if (httpsEntries.length > 0) {
|
|
197
|
+
const helperPath = writeTempScript(buildCredentialHelperScript(httpsEntries), 'git-credential-helper');
|
|
198
|
+
tempFiles.push(helperPath);
|
|
199
|
+
// GIT_CONFIG_COUNT + GIT_CONFIG_KEY_N + GIT_CONFIG_VALUE_N で credential.helper を設定
|
|
200
|
+
env.GIT_CONFIG_COUNT = '1';
|
|
201
|
+
env.GIT_CONFIG_KEY_0 = 'credential.helper';
|
|
202
|
+
env.GIT_CONFIG_VALUE_0 = `!${helperPath}`;
|
|
203
|
+
}
|
|
204
|
+
const cleanup = () => {
|
|
205
|
+
for (const filePath of tempFiles) {
|
|
206
|
+
try {
|
|
207
|
+
fs.unlinkSync(filePath);
|
|
208
|
+
}
|
|
209
|
+
catch {
|
|
210
|
+
logger_1.logger.warn(`[git-cred] Failed to delete temporary file: ${filePath}`);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
};
|
|
214
|
+
return { env, cleanup };
|
|
215
|
+
}
|
|
216
|
+
async function addSshEntry(authSecret, host, sshEntries, tempFiles) {
|
|
217
|
+
const tmpKeyPath = path.join(os.tmpdir(), `ssh-key-${crypto.randomBytes(16).toString('hex')}`);
|
|
218
|
+
const normalizedKey = (0, repo_sync_1.normalizePemKey)(authSecret);
|
|
219
|
+
fs.writeFileSync(tmpKeyPath, normalizedKey, { mode: 0o600 });
|
|
220
|
+
tempFiles.push(tmpKeyPath);
|
|
221
|
+
sshEntries.push({ host, keyPath: tmpKeyPath });
|
|
222
|
+
}
|
|
223
|
+
function writeTempScript(content, prefix) {
|
|
224
|
+
const scriptPath = path.join(os.tmpdir(), `${prefix}-${crypto.randomBytes(16).toString('hex')}.sh`);
|
|
225
|
+
fs.writeFileSync(scriptPath, content, { mode: 0o700 });
|
|
226
|
+
return scriptPath;
|
|
227
|
+
}
|
|
228
|
+
//# sourceMappingURL=git-credential-setup.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git-credential-setup.js","sourceRoot":"","sources":["../src/git-credential-setup.ts"],"names":[],"mappings":"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"}
|
package/dist/repo-sync.js
CHANGED
|
@@ -119,7 +119,7 @@ async function cloneRepository(repoDir, repositoryUrl, branch, authMethod, authS
|
|
|
119
119
|
// 全ブランチを取得（サポート対象の環境に応じてブランチ切り替えが必要なため）
|
|
120
120
|
await execFileAsync('git', ['clone', '--no-single-branch', cloneUrl, repoDir], { env: { ...process.env, ...env }, timeout: constants_1.GIT_CLONE_TIMEOUT });
|
|
121
121
|
// デフォルトブランチをチェックアウト
|
|
122
|
-
await execFileAsync('git', ['checkout',
|
|
122
|
+
await execFileAsync('git', ['checkout', branch], {
|
|
123
123
|
cwd: repoDir,
|
|
124
124
|
env: { ...process.env, ...env },
|
|
125
125
|
timeout: constants_1.GIT_CHECKOUT_TIMEOUT,
|
|
@@ -139,7 +139,7 @@ async function pullRepository(repoDir, branch, authMethod, authSecret) {
|
|
|
139
139
|
env: { ...process.env, ...env },
|
|
140
140
|
timeout: constants_1.GIT_FETCH_TIMEOUT,
|
|
141
141
|
});
|
|
142
|
-
await execFileAsync('git', ['checkout',
|
|
142
|
+
await execFileAsync('git', ['checkout', branch], {
|
|
143
143
|
cwd: repoDir,
|
|
144
144
|
env: { ...process.env, ...env },
|
|
145
145
|
timeout: constants_1.GIT_CHECKOUT_TIMEOUT,
|
package/dist/repo-sync.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repo-sync.js","sourceRoot":"","sources":["../src/repo-sync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"repo-sync.js","sourceRoot":"","sources":["../src/repo-sync.ts"],"names":[],"mappings":"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"}
|