Skip to content

fix(proxy): detect git branch per-request to fix stale branch header #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AntonYeromin wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(proxy): detect git branch per-request to fix stale branch header #217

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5f487e
fix(proxy): detect git branch per-request to fix stale branch header
AntonYeromin Mar 17, 2026
b625962
fix(proxy): cache branch detection with 30s TTL to avoid git call per…
AntonYeromin Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/providers/plugins/sso/proxy/plugins/header-injection.plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ProxyPlugin, PluginContext, ProxyInterceptor } from './types.js';
import { ProxyContext } from '../proxy-types.js';
import { ProviderRegistry } from '../../../../core/registry.js';
import { logger } from '../../../../../utils/logger.js';
import { detectGitBranch } from '../../../../../utils/processes.js';

export class HeaderInjectionPlugin implements ProxyPlugin {
id = '@codemie/proxy-headers';
Expand All @@ -22,11 +23,25 @@ export class HeaderInjectionPlugin implements ProxyPlugin {
}
}

const BRANCH_CACHE_TTL_MS = 30_000;

class HeaderInjectionInterceptor implements ProxyInterceptor {
name = 'header-injection';

private cachedBranch: string | undefined;
private branchCachedAt = 0;

constructor(private context: PluginContext) {}

private async getCurrentBranch(): Promise<string | undefined> {
if (Date.now() - this.branchCachedAt < BRANCH_CACHE_TTL_MS) {
return this.cachedBranch;
}
this.cachedBranch = await detectGitBranch(process.cwd()) ?? this.context.config.branch;
this.branchCachedAt = Date.now();
return this.cachedBranch;
}

async onRequest(context: ProxyContext): Promise<void> {
// Request and session ID headers
context.headers['X-CodeMie-Request-ID'] = context.requestId;
Expand Down Expand Up @@ -66,8 +81,9 @@ class HeaderInjectionInterceptor implements ProxyInterceptor {
if (config.repository) {
context.headers['X-CodeMie-Repository'] = config.repository;
}
if (config.branch) {
context.headers['X-CodeMie-Branch'] = config.branch;
const currentBranch = await this.getCurrentBranch();
if (currentBranch) {
context.headers['X-CodeMie-Branch'] = currentBranch;
}
if (config.project) {
context.headers['X-CodeMie-Project'] = config.project;
Expand Down
Loading