Skip to content

Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.

fix(opencode): restore process env keys on transport dispose (#4430)

HetCreepd17bac8d64dd
diff --git a/headroom/providers/opencode/_dist/index.js b/headroom/providers/opencode/_dist/index.js
index 28beecb92..8c4a8b081 100644
--- a/headroom/providers/opencode/_dist/index.js
+++ b/headroom/providers/opencode/_dist/index.js
@@ -19835,6 +19835,19 @@ function withShimEnv(env, proxyUrl, excludeHosts) {
}
return nextEnv;
}
+var PROCESS_ENV_KEYS = [PROXY_ENV, EXCLUDE_HOSTS_ENV, "NODE_OPTIONS"];
+function snapshotProcessEnv() {
+ return Object.fromEntries(PROCESS_ENV_KEYS.map((key) => [key, process.env[key]]));
+}
+function restoreProcessEnv(saved) {
+ for (const key of PROCESS_ENV_KEYS) {
+ if (saved[key] === void 0) {
+ delete process.env[key];
+ } else {
+ process.env[key] = saved[key];
+ }
+ }
+}
function installProcessEnv(proxyUrl, excludeHosts) {
process.env[PROXY_ENV] = proxyUrl;
withExcludeHostsEnv(process.env, excludeHosts);
@@ -20171,7 +20184,8 @@ function installHeadroomTransport(options) {
originalChildSpawn: childProcess.spawn,
originalChildExec: childProcess.exec,
originalChildExecFile: childProcess.execFile,
- originalChildFork: childProcess.fork
+ originalChildFork: childProcess.fork,
+ originalEnv: snapshotProcessEnv()
};
setState(state);
installProcessEnv(options.proxyUrl, excludeHosts);
@@ -20215,6 +20229,7 @@ function uninstallHeadroomTransport() {
childProcess.exec = state.originalChildExec;
childProcess.execFile = state.originalChildExecFile;
childProcess.fork = state.originalChildFork;
+ restoreProcessEnv(state.originalEnv);
syncBuiltinESMExports();
setState(void 0);
}
diff --git a/headroom/providers/opencode/hook-shim/handler.js b/headroom/providers/opencode/hook-shim/handler.js
index bee370b59..6b19a418b 100644
--- a/headroom/providers/opencode/hook-shim/handler.js
+++ b/headroom/providers/opencode/hook-shim/handler.js
@@ -50,6 +50,19 @@ function withShimEnv(env, proxyUrl2, excludeHosts) {
}
return nextEnv;
}
+var PROCESS_ENV_KEYS = [PROXY_ENV, EXCLUDE_HOSTS_ENV, "NODE_OPTIONS"];
+function snapshotProcessEnv() {
+ return Object.fromEntries(PROCESS_ENV_KEYS.map((key) => [key, process.env[key]]));
+}
+function restoreProcessEnv(saved) {
+ for (const key of PROCESS_ENV_KEYS) {
+ if (saved[key] === void 0) {
+ delete process.env[key];
+ } else {
+ process.env[key] = saved[key];
+ }
+ }
+}
function installProcessEnv(proxyUrl2, excludeHosts) {
process.env[PROXY_ENV] = proxyUrl2;
withExcludeHostsEnv(process.env, excludeHosts);
@@ -379,7 +392,8 @@ function installHeadroomTransport(options) {
originalChildSpawn: childProcess.spawn,
originalChildExec: childProcess.exec,
originalChildExecFile: childProcess.execFile,
- originalChildFork: childProcess.fork
+ originalChildFork: childProcess.fork,
+ originalEnv: snapshotProcessEnv()
};
setState(state);
installProcessEnv(options.proxyUrl, excludeHosts);
@@ -423,6 +437,7 @@ function uninstallHeadroomTransport() {
childProcess.exec = state.originalChildExec;
childProcess.execFile = state.originalChildExecFile;
childProcess.fork = state.originalChildFork;
+ restoreProcessEnv(state.originalEnv);
syncBuiltinESMExports();
setState(void 0);
}
diff --git a/plugins/opencode/src/transport.test.ts b/plugins/opencode/src/transport.test.ts
index 16459062d..917407789 100644
--- a/plugins/opencode/src/transport.test.ts
+++ b/plugins/opencode/src/transport.test.ts
@@ -476,6 +476,39 @@ describe("Headroom OpenCode transport", () => {
}
});
+ it("restores the process env keys it set once the last install is disposed", () => {
+ const keys = ["NODE_OPTIONS", "HEADROOM_OPENCODE_TRANSPORT_PROXY_URL", "HEADROOM_OPENCODE_EXCLUDE_HOSTS"] as const;
+ const saved = Object.fromEntries(keys.map((key) => [key, process.env[key]]));
+
+ try {
+ process.env.NODE_OPTIONS = "--trace-warnings";
+ delete process.env.HEADROOM_OPENCODE_TRANSPORT_PROXY_URL;
+ process.env.HEADROOM_OPENCODE_EXCLUDE_HOSTS = "keep.example.com";
+
+ const first = installHeadroomTransport({ proxyUrl: "http://127.0.0.1:8787/v1", excludeHosts: ["a.example.com"] });
+ const second = installHeadroomTransport({ proxyUrl: "http://127.0.0.1:8787/v1", excludeHosts: ["a.example.com"] });
+ expect(process.env.HEADROOM_OPENCODE_TRANSPORT_PROXY_URL).toBe("http://127.0.0.1:8787/v1");
+
+ // A nested dispose keeps the env: the transport is still installed.
+ first();
+ expect(process.env.HEADROOM_OPENCODE_TRANSPORT_PROXY_URL).toBe("http://127.0.0.1:8787/v1");
+
+ second();
+ expect(process.env.NODE_OPTIONS).toBe("--trace-warnings");
+ expect(process.env.HEADROOM_OPENCODE_TRANSPORT_PROXY_URL).toBeUndefined();
+ expect(process.env.HEADROOM_OPENCODE_EXCLUDE_HOSTS).toBe("keep.example.com");
+ } finally {
+ for (const key of keys) {
+ if (saved[key] === undefined) {
+ delete process.env[key];
+ } else {
+ process.env[key] = saved[key];
+ }
+ }
+ uninstallHeadroomTransport();
+ }
+ });
+
it("skips the shim preload when the bundle ships without it (#2798)", () => {
const originalNodeOptions = process.env.NODE_OPTIONS;
const originalSpawn = childProcess.spawn;
@@ -772,6 +805,7 @@ describe("Headroom OpenCode transport", () => {
expect(fetchMock.mock.calls[1][0]).toEqual(new URL("http://127.0.0.1:8787/v1/messages"));
expect(process.env.HEADROOM_OPENCODE_EXCLUDE_HOSTS).toBe("opencode.ai");
} finally {
+ uninstallHeadroomTransport();
globalThis.fetch = originalFetch;
if (originalExclude === undefined) {
delete process.env.HEADROOM_OPENCODE_EXCLUDE_HOSTS;
@@ -871,6 +905,8 @@ describe("Headroom OpenCode transport", () => {
expect(options.env.HEADROOM_OPENCODE_TRANSPORT_PROXY_URL).toBe("http://127.0.0.1:8787/v1");
}
} finally {
+ // Dispose first: uninstall now restores the env it saved at install time.
+ uninstallHeadroomTransport();
globalThis.fetch = originalFetch;
childProcess.spawn = originalSpawn;
if (originalExclude === undefined) {
diff --git a/plugins/opencode/src/transport.ts b/plugins/opencode/src/transport.ts
index 135fa3820..4fcc35829 100644
--- a/plugins/opencode/src/transport.ts
+++ b/plugins/opencode/src/transport.ts
@@ -51,6 +51,7 @@ interface TransportState {
originalChildExec: ChildExec;
originalChildExecFile: ChildExecFile;
originalChildFork: ChildFork;
+ originalEnv: Record<string, string | undefined>;
}
interface GlobalWithHeadroomTransport {
@@ -120,6 +121,23 @@ function withShimEnv(
return nextEnv;
}
+// installProcessEnv writes these process-wide keys; uninstall puts them back.
+const PROCESS_ENV_KEYS = [PROXY_ENV, EXCLUDE_HOSTS_ENV, "NODE_OPTIONS"] as const;
+
+function snapshotProcessEnv(): Record<string, string | undefined> {
+ return Object.fromEntries(PROCESS_ENV_KEYS.map((key) => [key, process.env[key]]));
+}
+
+function restoreProcessEnv(saved: Record<string, string | undefined>): void {
+ for (const key of PROCESS_ENV_KEYS) {
+ if (saved[key] === undefined) {
+ delete process.env[key];
+ } else {
+ process.env[key] = saved[key];
+ }
+ }
+}
+
function installProcessEnv(proxyUrl: string, excludeHosts: string[]): void {
process.env[PROXY_ENV] = proxyUrl;
withExcludeHostsEnv(process.env, excludeHosts);
@@ -562,6 +580,7 @@ export function installHeadroomTransport(options: InstallOptions): () => void {
originalChildExec: childProcess.exec,
originalChildExecFile: childProcess.execFile,
originalChildFork: childProcess.fork,
+ originalEnv: snapshotProcessEnv(),
};
setState(state);
@@ -611,6 +630,7 @@ export function uninstallHeadroomTransport(): void {
childProcess.exec = state.originalChildExec;
childProcess.execFile = state.originalChildExecFile;
childProcess.fork = state.originalChildFork;
+ restoreProcessEnv(state.originalEnv);
syncBuiltinESMExports();
setState(undefined);
}