@imenam/mcp-github 1.1.49 → 1.1.50
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/__tests__/utils/git.test.js +9 -2
- package/dist/__tests__/utils/git.test.js.map +1 -1
- package/dist/handlers/deploy.d.ts.map +1 -1
- package/dist/handlers/deploy.js +11 -3
- package/dist/handlers/deploy.js.map +1 -1
- package/dist/handlers/git.d.ts.map +1 -1
- package/dist/handlers/git.js +4 -1
- package/dist/handlers/git.js.map +1 -1
- package/dist/utils/git.d.ts +16 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +49 -5
- package/dist/utils/git.js.map +1 -1
- package/package.json +1 -1
|
@@ -55,6 +55,13 @@ describe("execGitSecure", () => {
|
|
|
55
55
|
expect(calledWith).toContain("http.extraHeader");
|
|
56
56
|
expect(calledWith).toContain("Authorization: Basic");
|
|
57
57
|
});
|
|
58
|
+
it("injecte safe.directory='*' sur toutes les commandes git (avec token)", () => {
|
|
59
|
+
mockGetConfig.mockReturnValue(makeConfig());
|
|
60
|
+
mockExecSync.mockReturnValue(Buffer.from(""));
|
|
61
|
+
execGitSecure("status", {});
|
|
62
|
+
const calledWith = mockExecSync.mock.calls[0][0];
|
|
63
|
+
expect(calledWith).toContain("safe.directory='*'");
|
|
64
|
+
});
|
|
58
65
|
it("redacte le token dans les messages d'erreur", () => {
|
|
59
66
|
mockGetConfig.mockReturnValue(makeConfig());
|
|
60
67
|
const authHeader = `Authorization: Basic ${Buffer.from("x-access-token:ghp_test123").toString("base64")}`;
|
|
@@ -62,11 +69,11 @@ describe("execGitSecure", () => {
|
|
|
62
69
|
mockExecSync.mockImplementation(() => { throw error; });
|
|
63
70
|
expect(() => execGitSecure("status", {})).toThrow("[REDACTED_AUTH_HEADER]");
|
|
64
71
|
});
|
|
65
|
-
it("
|
|
72
|
+
it("préfixe git -c safe.directory='*' même sans token (sans http.extraHeader)", () => {
|
|
66
73
|
mockGetConfig.mockReturnValue(makeConfig({ GITHUB_TOKEN: null }));
|
|
67
74
|
mockExecSync.mockReturnValue(Buffer.from("output"));
|
|
68
75
|
execGitSecure("status", { cwd: "/repo" });
|
|
69
|
-
expect(mockExecSync).toHaveBeenCalledWith("status", { cwd: "/repo" });
|
|
76
|
+
expect(mockExecSync).toHaveBeenCalledWith("git -c safe.directory='*' status", { cwd: "/repo" });
|
|
70
77
|
});
|
|
71
78
|
});
|
|
72
79
|
describe("performClone", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/git.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"git.test.js","sourceRoot":"","sources":["../../../src/__tests__/utils/git.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAe/D,eAAO,MAAM,YAAY,EAAE,IAAI,EAyB9B,CAAC;AAEF,wBAAsB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAe/D,eAAO,MAAM,YAAY,EAAE,IAAI,EAyB9B,CAAC;AAEF,wBAAsB,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;;;;;;;;GAuCzD;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAoBvD;AAED,wBAAsB,cAAc;;;;;GAOnC"}
|
package/dist/handlers/deploy.js
CHANGED
|
@@ -37,9 +37,13 @@ export async function handleDeploy(_args, config) {
|
|
|
37
37
|
const authHeader = config.GITHUB_TOKEN
|
|
38
38
|
? `Authorization: Basic ${Buffer.from(`x-access-token:${config.GITHUB_TOKEN}`).toString("base64")}`
|
|
39
39
|
: null;
|
|
40
|
+
// safe.directory='*' : le checkout serveur peut ne pas appartenir à l'utilisateur
|
|
41
|
+
// qui exécute le deploy → on neutralise la protection "dubious ownership".
|
|
40
42
|
const gitPrefix = authHeader
|
|
41
|
-
? `git -c http.extraHeader="${authHeader}" -c http.prompt=false`
|
|
42
|
-
: `GIT_TERMINAL_PROMPT=0 git`;
|
|
43
|
+
? `git -c safe.directory='*' -c http.extraHeader="${authHeader}" -c http.prompt=false`
|
|
44
|
+
: `GIT_TERMINAL_PROMPT=0 git -c safe.directory='*'`;
|
|
45
|
+
// SHA avant deploy (best-effort, n'interrompt pas le flux en cas d'échec).
|
|
46
|
+
const shaBefore = (await execDeploy(`${gitPrefix} rev-parse HEAD`)).stdout.trim() || "(inconnu)";
|
|
43
47
|
const deployCommand = `${gitPrefix} fetch --all && ${gitPrefix} checkout ${config.TARGET_BRANCH} && ${gitPrefix} pull`;
|
|
44
48
|
const deployResult = await execDeploy(deployCommand);
|
|
45
49
|
if (deployResult.code !== 0) {
|
|
@@ -47,10 +51,14 @@ export async function handleDeploy(_args, config) {
|
|
|
47
51
|
logToFile(`[deploy] ${msg}`);
|
|
48
52
|
return { content: [{ type: "text", text: msg }], isError: true };
|
|
49
53
|
}
|
|
54
|
+
const shaAfter = (await execDeploy(`${gitPrefix} rev-parse HEAD`)).stdout.trim() || "(inconnu)";
|
|
55
|
+
const shaLine = shaBefore === shaAfter
|
|
56
|
+
? `SHA déployé : ${shaAfter} (inchangé — le checkout serveur était déjà à jour)`
|
|
57
|
+
: `SHA déployé : ${shaBefore} → ${shaAfter}`;
|
|
50
58
|
const location = config.LOCAL_DEPLOY
|
|
51
59
|
? `local:${config.SSH_REMOTE_PATH}`
|
|
52
60
|
: `${config.SSH_HOST}:${config.SSH_REMOTE_PATH}`;
|
|
53
|
-
const deployMsg = `Deploy réussi sur ${location} (branche: ${config.TARGET_BRANCH})\n\n${deployResult.stdout}`.trim();
|
|
61
|
+
const deployMsg = `Deploy réussi sur ${location} (branche: ${config.TARGET_BRANCH})\n${shaLine}\n\n${deployResult.stdout}`.trim();
|
|
54
62
|
logToFile(`[deploy] ${deployMsg}`);
|
|
55
63
|
return { content: [{ type: "text", text: deployMsg }] };
|
|
56
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUlE,IAAI,eAAe,GAAsB,IAAI,CAAC;AAE9C,MAAM,CAAC,MAAM,YAAY,GAAW;IAClC;QACE,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,8QAA8Q;QAC3R,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;IACD;QACE,IAAI,EAAE,MAAM;QACZ,WAAW,EAAE,8LAA8L;QAC3M,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;IACD;QACE,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,uGAAuG;QACpH,WAAW,EAAE;YACX,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE;SACf;KACF;CACF,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAU,EAAE,MAAW;IACxD,kBAAkB,EAAE,CAAC;IAErB,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,YAAY;QACpC,CAAC,CAAC,wBAAwB,MAAM,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACnG,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,SAAS,GAAG,UAAU;QAC1B,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/handlers/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/handlers/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAK/D,eAAO,MAAM,SAAS,EAAE,IAAI,EAuD3B,CAAC;AAEF,wBAAsB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAyCxD;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAqCvD;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAmD/D;AAED,wBAAsB,WAAW;;;;;GAGhC;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAY9D;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;;;;;
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/handlers/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAK/D,eAAO,MAAM,SAAS,EAAE,IAAI,EAuD3B,CAAC;AAEF,wBAAsB,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAyCxD;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAqCvD;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAmD/D;AAED,wBAAsB,WAAW;;;;;GAGhC;AAED,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG;;;;;GAY9D;AAED,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;;;;;GA4D/E"}
|
package/dist/handlers/git.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {} from "@modelcontextprotocol/sdk/types.js";
|
|
2
2
|
import fs from "fs";
|
|
3
3
|
import { logToFile } from "../logger.js";
|
|
4
|
-
import { getCurrentBranch, execGitSecure, performClone } from "../utils/git.js";
|
|
4
|
+
import { getCurrentBranch, execGitSecure, performClone, alignRepoOwnership } from "../utils/git.js";
|
|
5
5
|
export const GIT_TOOLS = [
|
|
6
6
|
{
|
|
7
7
|
name: "commit",
|
|
@@ -241,6 +241,9 @@ export async function handleInitWorkingDir(_args, config, octokit) {
|
|
|
241
241
|
execGitSecure(`push -u origin ${config.TARGET_BRANCH}`, execOptions);
|
|
242
242
|
steps.push(`Created and pushed new branch "${config.TARGET_BRANCH}"`);
|
|
243
243
|
}
|
|
244
|
+
// checkout/stash/pull ont pu créer des fichiers appartenant à root → réaligner
|
|
245
|
+
// sur l'utilisateur de l'agent avant qu'il ne reprenne l'édition.
|
|
246
|
+
alignRepoOwnership(repoPath);
|
|
244
247
|
const successMsg = `Working directory initialized:\n${steps.map(s => `- ${s}`).join("\n")}`;
|
|
245
248
|
logToFile(`[init_working_dir] ${successMsg}`);
|
|
246
249
|
return { content: [{ type: "text", text: successMsg }] };
|
package/dist/handlers/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/handlers/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/handlers/git.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/git.d.ts
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
export declare function getCurrentBranch(repoPath: string): string;
|
|
2
2
|
export declare function getGitAuthHeader(): string | null;
|
|
3
3
|
export declare function execGitSecure(command: string, options: any): string;
|
|
4
|
+
/**
|
|
5
|
+
* Aligne la propriété et les droits du dépôt sur l'utilisateur de l'agent.
|
|
6
|
+
*
|
|
7
|
+
* Le process MCP tourne typiquement en root (uid 0) dans le conteneur, alors que
|
|
8
|
+
* l'agent qui édite les fichiers tourne sous un autre utilisateur (ex. `node`,
|
|
9
|
+
* uid 1000). Sans réalignement, les fichiers clonés appartiennent à root:root et
|
|
10
|
+
* l'agent ne peut pas écrire (EACCES). On chown vers AGENT_USER et on rend l'arbre
|
|
11
|
+
* group-writable.
|
|
12
|
+
*
|
|
13
|
+
* Opt-in : sans AGENT_USER défini, aucune opération n'est tentée (on ne suppose pas
|
|
14
|
+
* l'existence d'un utilisateur par défaut comme "node" qui pourrait ne pas exister).
|
|
15
|
+
* No-op aussi sur Windows ou si le process ne tourne pas en root (rien à réaligner,
|
|
16
|
+
* et un chown échouerait de toute façon). Combiné avec `safe.directory='*'`, le git
|
|
17
|
+
* du MCP continue de fonctionner sur un dépôt qui ne lui appartient plus.
|
|
18
|
+
*/
|
|
19
|
+
export declare function alignRepoOwnership(repoPath: string): void;
|
|
4
20
|
export declare function performClone(): Promise<string>;
|
|
5
21
|
//# sourceMappingURL=git.d.ts.map
|
package/dist/utils/git.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAMA,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAKhD;
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAMA,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,GAAG,IAAI,CAKhD;AAcD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,UAY1D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAazD;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAuDpD"}
|
package/dist/utils/git.js
CHANGED
|
@@ -13,22 +13,62 @@ export function getGitAuthHeader() {
|
|
|
13
13
|
const auth = Buffer.from(`x-access-token:${GITHUB_TOKEN}`).toString('base64');
|
|
14
14
|
return `Authorization: Basic ${auth}`;
|
|
15
15
|
}
|
|
16
|
+
// `safe.directory='*'` désactive la protection "dubious ownership" de Git pour
|
|
17
|
+
// CE process. Indispensable car le MCP exécute git (souvent en root dans le
|
|
18
|
+
// conteneur) sur un dépôt qui peut appartenir à un autre utilisateur (ex. `node`,
|
|
19
|
+
// après alignRepoOwnership). Posé via `-c` sur la ligne de commande, il s'applique
|
|
20
|
+
// au process qui s'exécute réellement — contrairement à un `git config` côté agent.
|
|
21
|
+
const GIT_BASE = `git -c safe.directory='*'`;
|
|
22
|
+
function buildGitCommand(command, extra = "") {
|
|
23
|
+
const rest = command.startsWith("git ") ? command.slice(4) : command;
|
|
24
|
+
return `${GIT_BASE}${extra ? ` ${extra}` : ""} ${rest}`;
|
|
25
|
+
}
|
|
16
26
|
export function execGitSecure(command, options) {
|
|
17
27
|
const authHeader = getGitAuthHeader();
|
|
18
28
|
if (!authHeader) {
|
|
19
|
-
return execSync(command, options);
|
|
29
|
+
return execSync(buildGitCommand(command), options);
|
|
20
30
|
}
|
|
21
|
-
const secureCommand =
|
|
31
|
+
const secureCommand = buildGitCommand(command, `-c http.extraHeader="${authHeader}"`);
|
|
22
32
|
try {
|
|
23
33
|
return execSync(secureCommand, options);
|
|
24
34
|
}
|
|
25
35
|
catch (error) {
|
|
26
|
-
|
|
27
|
-
error.message = error.message.replace(authHeader, "[REDACTED_AUTH_HEADER]");
|
|
28
|
-
}
|
|
36
|
+
error.message = error.message.replace(authHeader, "[REDACTED_AUTH_HEADER]");
|
|
29
37
|
throw error;
|
|
30
38
|
}
|
|
31
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Aligne la propriété et les droits du dépôt sur l'utilisateur de l'agent.
|
|
42
|
+
*
|
|
43
|
+
* Le process MCP tourne typiquement en root (uid 0) dans le conteneur, alors que
|
|
44
|
+
* l'agent qui édite les fichiers tourne sous un autre utilisateur (ex. `node`,
|
|
45
|
+
* uid 1000). Sans réalignement, les fichiers clonés appartiennent à root:root et
|
|
46
|
+
* l'agent ne peut pas écrire (EACCES). On chown vers AGENT_USER et on rend l'arbre
|
|
47
|
+
* group-writable.
|
|
48
|
+
*
|
|
49
|
+
* Opt-in : sans AGENT_USER défini, aucune opération n'est tentée (on ne suppose pas
|
|
50
|
+
* l'existence d'un utilisateur par défaut comme "node" qui pourrait ne pas exister).
|
|
51
|
+
* No-op aussi sur Windows ou si le process ne tourne pas en root (rien à réaligner,
|
|
52
|
+
* et un chown échouerait de toute façon). Combiné avec `safe.directory='*'`, le git
|
|
53
|
+
* du MCP continue de fonctionner sur un dépôt qui ne lui appartient plus.
|
|
54
|
+
*/
|
|
55
|
+
export function alignRepoOwnership(repoPath) {
|
|
56
|
+
const owner = process.env.AGENT_USER;
|
|
57
|
+
if (!owner)
|
|
58
|
+
return;
|
|
59
|
+
if (process.platform === "win32")
|
|
60
|
+
return;
|
|
61
|
+
if (typeof process.getuid !== "function" || process.getuid() !== 0)
|
|
62
|
+
return;
|
|
63
|
+
try {
|
|
64
|
+
execSync(`chown -R ${owner} "${repoPath}"`);
|
|
65
|
+
execSync(`chmod -R g+rwX "${repoPath}"`);
|
|
66
|
+
logToFile(`[ownership] Dépôt ${repoPath} aligné sur l'utilisateur "${owner}" (group-writable)`);
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
logToFile(`[ownership] chown/chmod ignoré pour ${repoPath}: ${error.message}`);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
32
72
|
export async function performClone() {
|
|
33
73
|
const config = getConfig();
|
|
34
74
|
if (!config.GITHUB_TOKEN) {
|
|
@@ -46,6 +86,7 @@ export async function performClone() {
|
|
|
46
86
|
const finalRepoPath = path.join(config.CLONE_DIR, repo);
|
|
47
87
|
logToFile(`[CLONE] Destination calculée : ${finalRepoPath}`);
|
|
48
88
|
if (fs.existsSync(finalRepoPath)) {
|
|
89
|
+
alignRepoOwnership(finalRepoPath);
|
|
49
90
|
process.env.REPO_PATH = finalRepoPath;
|
|
50
91
|
await updateEnvFile("REPO_PATH", finalRepoPath);
|
|
51
92
|
return `Repository already cloned at ${finalRepoPath}. REPO_PATH updated. Use 'init_working_dir' to switch to the target branch.`;
|
|
@@ -61,6 +102,9 @@ export async function performClone() {
|
|
|
61
102
|
logToFile(`[CLONE] Configuration de l'identité Git (Agent Zero)...`);
|
|
62
103
|
execGitSecure(`config user.name "Agent Zero"`, { cwd: finalRepoPath });
|
|
63
104
|
execGitSecure(`config user.email "agentzero@arakei.net"`, { cwd: finalRepoPath });
|
|
105
|
+
// Le clone a été fait par le process MCP (root) → on rend le dépôt éditable
|
|
106
|
+
// par l'utilisateur de l'agent.
|
|
107
|
+
alignRepoOwnership(finalRepoPath);
|
|
64
108
|
process.env.REPO_PATH = finalRepoPath;
|
|
65
109
|
await updateEnvFile("REPO_PATH", finalRepoPath);
|
|
66
110
|
return `Successfully cloned ${config.TARGET_REPO} into ${finalRepoPath}. Run 'init_working_dir' to switch to the target branch.`;
|
package/dist/utils/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,OAAO,aAAa,CAAC,uBAAuB,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;AACrF,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,EAAE,CAAC;IACrC,IAAI,CAAC,YAAY;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC9E,OAAO,wBAAwB,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe,EAAE,OAAY;IACzD,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/utils/git.ts"],"names":[],"mappings":"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"}
|