3 files changed, 36 insertions, 1 deletions

diff --git a/packages/host-bin/src/config.test.ts b/packages/host-bin/src/config.test.ts
index a5cfde1..fc74a79 100644
--- a/packages/host-bin/src/config.test.ts
+++ b/packages/host-bin/src/config.test.ts
@@ -51,6 +51,26 @@ describe("envToConfigMap", () => {
 		expect(result["provider.openai-compat.baseURL"]).toBeUndefined();
 		expect(result["provider.openai-compat.model"]).toBeUndefined();
 	});
+
+	it("maps SURFACE_WS_PORT to surfaceWsPort", () => {
+		const result = envToConfigMap({ SURFACE_WS_PORT: "24206" });
+		expect(result.surfaceWsPort).toBe(24206);
+	});
+
+	it("ignores a non-numeric SURFACE_WS_PORT", () => {
+		const result = envToConfigMap({ SURFACE_WS_PORT: "abc" });
+		expect(result.surfaceWsPort).toBeUndefined();
+	});
+
+	it("ignores a non-positive SURFACE_WS_PORT", () => {
+		const result = envToConfigMap({ SURFACE_WS_PORT: "0" });
+		expect(result.surfaceWsPort).toBeUndefined();
+	});
+
+	it("omits surfaceWsPort when SURFACE_WS_PORT is unset", () => {
+		const result = envToConfigMap({});
+		expect(result.surfaceWsPort).toBeUndefined();
+	});
 });
 
 describe("configMapToAccess", () => {
diff --git a/packages/host-bin/src/config.ts b/packages/host-bin/src/config.ts
index f79ef4b..9a22c00 100644
--- a/packages/host-bin/src/config.ts
+++ b/packages/host-bin/src/config.ts
@@ -39,6 +39,14 @@ export function envToConfigMap(
 		}
 	}
 
+	const surfaceWsPort = env.SURFACE_WS_PORT;
+	if (surfaceWsPort !== undefined) {
+		const n = Number(surfaceWsPort);
+		if (Number.isFinite(n) && n > 0) {
+			map.surfaceWsPort = n;
+		}
+	}
+
 	return map;
 }
 
diff --git a/packages/host-bin/src/main.ts b/packages/host-bin/src/main.ts
index 1594dcc..420f12e 100644
--- a/packages/host-bin/src/main.ts
+++ b/packages/host-bin/src/main.ts
@@ -19,6 +19,7 @@ import {
 	type SecretsAccess,
 	type StorageNamespace,
 } from "@dispatch/kernel";
+import { extension as lspExt } from "@dispatch/lsp";
 import { extension as providerOpenaiCompatExt } from "@dispatch/provider-openai-compat";
 import { extension as sessionOrchestratorExt } from "@dispatch/session-orchestrator";
 import { extension as skillsExt } from "@dispatch/skills";
@@ -75,6 +76,7 @@ const CORE_EXTENSIONS: readonly Extension[] = [
 	sessionOrchestratorExt,
 	skillsExt,
 	cacheWarmingExt,
+	lspExt,
 	createTransportHttpExtension(),
 	// Surface extensions — dependency order: surface-registry first, then consumers.
 	createSurfaceRegistryExtension(),
@@ -169,8 +171,13 @@ async function boot(): Promise<void> {
 		}
 	}
 
+	let shuttingDown = false;
 	const shutdown = async () => {
-		logger.info("Shutting down — draining collector");
+		if (shuttingDown) return;
+		shuttingDown = true;
+		logger.info("Shutting down — deactivating extensions");
+		await host.deactivate();
+		logger.info("Draining collector");
 		await supervisor.stop();
 		process.exit(0);
 	};