mark/vibn-agent-runner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: clean git credentials before push to avoid double-auth URLs

Browse Source 
Made-with: Cursor
This commit is contained in:
mawkone
2026-02-26 15:01:42 -08:00
parent d3c3270309
commit 45bca13479
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dist/tools.js vendored
View File

@@ -377,13 +377,21 @@ async function gitCommitAndPush(message, ctx) {
try { try {
await execAsync('git add -A', { cwd }); await execAsync('git add -A', { cwd });
await execAsync(`git commit -m "${message.replace(/"/g, '\\"')}"`, { cwd }); await execAsync(`git commit -m "${message.replace(/"/g, '\\"')}"`, { cwd });
// Ensure remote has credentials // Get current remote URL, strip any existing credentials, re-inject cleanly
const remoteUrl = (await execAsync('git remote get-url origin', { cwd })).stdout.trim(); let remoteUrl = '';
const authedUrl = remoteUrl.startsWith('https://') try {
? remoteUrl.replace('https://', `https://${username}:${apiToken}@`) remoteUrl = (await execAsync('git remote get-url origin', { cwd })).stdout.trim();
: remoteUrl; }
await execAsync(`git push "${authedUrl}" HEAD`, { cwd, timeout: 60000 }); catch { /* no remote yet */ }
return { success: true, message }; const cleanUrl = remoteUrl.replace(/https:\/\/[^@]+@/, 'https://');
const baseUrl = cleanUrl || apiUrl;
const authedUrl = baseUrl.replace('https://', `https://${username}:${apiToken}@`);
await execAsync(`git remote set-url origin "${authedUrl}"`, { cwd }).catch(async () => {
await execAsync(`git remote add origin "${authedUrl}"`, { cwd });
});
const branch = (await execAsync('git rev-parse --abbrev-ref HEAD', { cwd })).stdout.trim();
await execAsync(`git push -u origin "${branch}"`, { cwd, timeout: 60000 });
return { success: true, message, branch };
} }
catch (err) { catch (err) {
const cleaned = (err.message || '').replace(new RegExp(apiToken, 'g'), '***'); const cleaned = (err.message || '').replace(new RegExp(apiToken, 'g'), '***');

24
src/tools.ts
View File

@@ -372,14 +372,24 @@ async function gitCommitAndPush(message: string, ctx: ToolContext): Promise<unkn
await execAsync('git add -A', { cwd }); await execAsync('git add -A', { cwd });
await execAsync(`git commit -m "${message.replace(/"/g, '\\"')}"`, { cwd }); await execAsync(`git commit -m "${message.replace(/"/g, '\\"')}"`, { cwd });
// Ensure remote has credentials // Get current remote URL, strip any existing credentials, re-inject cleanly
const remoteUrl = (await execAsync('git remote get-url origin', { cwd })).stdout.trim(); let remoteUrl = '';
const authedUrl = remoteUrl.startsWith('https://') try {
? remoteUrl.replace('https://', `https://${username}:${apiToken}@`) remoteUrl = (await execAsync('git remote get-url origin', { cwd })).stdout.trim();
: remoteUrl; } catch { /* no remote yet */ }
await execAsync(`git push "${authedUrl}" HEAD`, { cwd, timeout: 60_000 });
return { success: true, message }; const cleanUrl = remoteUrl.replace(/https:\/\/[^@]+@/, 'https://');
const baseUrl = cleanUrl || apiUrl;
const authedUrl = baseUrl.replace('https://', `https://${username}:${apiToken}@`);
await execAsync(`git remote set-url origin "${authedUrl}"`, { cwd }).catch(async () => {
await execAsync(`git remote add origin "${authedUrl}"`, { cwd });
});
const branch = (await execAsync('git rev-parse --abbrev-ref HEAD', { cwd })).stdout.trim();
await execAsync(`git push -u origin "${branch}"`, { cwd, timeout: 60_000 });
return { success: true, message, branch };
} catch (err: any) { } catch (err: any) {
const cleaned = (err.message || '').replace(new RegExp(apiToken, 'g'), '***'); const cleaned = (err.message || '').replace(new RegExp(apiToken, 'g'), '***');
return { error: `Git operation failed: ${cleaned}` }; return { error: `Git operation failed: ${cleaned}` };