fix(infra): drop consumer-less gateway supervision exports

steipete · steipete · commit f871b499b6cb · 2026-07-16T09:31:46.000-07:00
333c4f9 and 244f496 landed six exports with no production consumers, failing the hard-zero deadcode gate on every PR: a dead re-export block in restart-handoff (the contract module's real importer uses it directly), three result/mode types only referenced inside their own modules, and two supervision symbols whose only consumers were their tests. The types and helpers stay defined for the in-flight supervisor work to re-export alongside real consumers; the supervision test now proves mode resolution through the public isGatewayExternallySupervised surface.
diff --git a/src/cli/daemon-cli/restart-lock-replacement.ts b/src/cli/daemon-cli/restart-lock-replacement.ts
@@ -5,7 +5,7 @@ import {
 } from "../../infra/gateway-lock.js";
 import { sleep } from "../../utils.js";
 
-export type GatewayLockReplacementWaitResult =
+type GatewayLockReplacementWaitResult =
   | { status: "replacement"; attemptsUsed: number }
   | { status: "timeout" };
 
diff --git a/src/infra/gateway-supervision.test.ts b/src/infra/gateway-supervision.test.ts
@@ -2,11 +2,14 @@ import { describe, expect, it } from "vitest";
 import {
   assertGatewayServiceMutationAllowed,
   formatExternalSupervisorUpdateRequired,
-  GATEWAY_SUPERVISOR_MODE_ENV,
   isGatewayExternallySupervised,
-  resolveGatewaySupervisorMode,
 } from "./gateway-supervision.js";
 
+// The env variable name is part of the observable contract the messages
+// reference; the mode resolver is internal and proven through the public
+// isGatewayExternallySupervised surface.
+const GATEWAY_SUPERVISOR_MODE_ENV = "OPENCLAW_SUPERVISOR_MODE";
+
 describe("gateway supervision", () => {
   it.each([
     { value: undefined, expected: "auto" },
@@ -17,7 +20,6 @@ describe("gateway supervision", () => {
   ])("resolves $value as $expected", ({ value, expected }) => {
     const env = { [GATEWAY_SUPERVISOR_MODE_ENV]: value };
 
-    expect(resolveGatewaySupervisorMode(env)).toBe(expected);
     expect(isGatewayExternallySupervised(env)).toBe(expected === "external");
   });
 
diff --git a/src/infra/gateway-supervision.ts b/src/infra/gateway-supervision.ts
@@ -1,12 +1,10 @@
 // Defines gateway lifecycle ownership shared by service, restart, and update paths.
-export const GATEWAY_SUPERVISOR_MODE_ENV = "OPENCLAW_SUPERVISOR_MODE";
+const GATEWAY_SUPERVISOR_MODE_ENV = "OPENCLAW_SUPERVISOR_MODE";
 export const EXTERNAL_SUPERVISOR_UPDATE_REQUIRED_REASON = "external-supervisor-update-required";
 
-export type GatewaySupervisorMode = "auto" | "external";
+type GatewaySupervisorMode = "auto" | "external";
 
-export function resolveGatewaySupervisorMode(
-  env: NodeJS.ProcessEnv = process.env,
-): GatewaySupervisorMode {
+function resolveGatewaySupervisorMode(env: NodeJS.ProcessEnv = process.env): GatewaySupervisorMode {
   return env[GATEWAY_SUPERVISOR_MODE_ENV]?.trim().toLowerCase() === "external"
     ? "external"
     : "auto";
diff --git a/src/infra/restart-handoff.ts b/src/infra/restart-handoff.ts
@@ -14,12 +14,6 @@ import {
   getNodeSqliteKysely,
 } from "./kysely-sync.js";
 
-export {
-  createGatewayRestartHandoffCapabilities,
-  GATEWAY_RESTART_HANDOFF_PROTOCOL,
-  GATEWAY_RESTART_HANDOFF_PROTOCOL_VERSION,
-} from "./restart-handoff-contract.js";
-
 // Restart handoff rows let a supervisor explain a recent gateway restart after
 // the old process exits. The row is short-lived, bounded, and replaced on write.
 const GATEWAY_SUPERVISOR_RESTART_HANDOFF_KIND = "gateway-supervisor-restart-handoff";
@@ -77,7 +71,7 @@ export type GatewayRestartHandoff = {
   };
 };
 
-export type GatewayRestartHandoffConsumeResult =
+type GatewayRestartHandoffConsumeResult =
   | {
       status: "accepted";
       handoff: GatewayRestartHandoff;
diff --git a/src/infra/supervisor-markers.ts b/src/infra/supervisor-markers.ts
@@ -23,7 +23,7 @@ export const SUPERVISOR_HINT_ENV_VARS = [
 
 /** Supported supervisor families that can respawn the gateway after update/restart handoff. */
 export type RespawnSupervisor = "launchd" | "systemd" | "schtasks";
-export type GatewayRespawnSupervisor = RespawnSupervisor | "external";
+type GatewayRespawnSupervisor = RespawnSupervisor | "external";
 
 interface DetectRespawnSupervisorOptions {
   includeLinuxOpenClawGatewayServiceMarker?: boolean;
