From e7eada4802ceebd86c83bcd6e3eca70152e7f331 Mon Sep 17 00:00:00 2001
From: Adam Malczewski <github@tradam.dev>
Date: Thu, 11 Jun 2026 21:12:03 +0900
Subject: feat(lsp,cwd): LSP integration + per-conversation cwd; fix
 cache-warming cache bust
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

LSP + per-conversation CWD feature:
- new bundled `lsp` extension: hand-rolled JSON-RPC codec (framing/rpc), lazy
  one-server-per-(serverID,root), per-cwd config resolution, on-demand `lsp` tool
- `conversation-store`: getCwd/setCwd (cwdKey); `session-orchestrator` defaults a
  turn's cwd from the store
- `transport-http`: cwd + lsp status endpoints; wire types in transport-contract
- host-bin: register lsp; config wiring

Cache-warming fix (the warm read 0% on the first reheat after a message):
- warm assembled tools under a different cwd than the real turn (a reheat sends no
  cwd, and the warm service had no store fallback). The skills filter rewrites the
  cwd-sensitive `load_skill` description, so the tools block — the first bytes of
  the prompt-cache prefix — diverged and the cache missed entirely. Warm now
  resolves cwd as opts.cwd ?? conversationStore.getCwd(), mirroring handleMessage.
- capture warm sends as `provider.request` spans flagged `warm:true` (thread a
  child logger into providerOpts) so warm vs real bodies are diffable (obs §3.1).
- kernel logger: span-close now merges child-bound attrs like span-open, so a
  `warm:true` query finds the closed span (with usage/status), not just the open.

Tests: warm forwards a warm-flagged logger; warm falls back to stored cwd; logger
open/close attr consistency. Full suite green (873).
---
 packages/host-bin/src/config.test.ts | 20 ++++++++++++++++++++
 packages/host-bin/src/config.ts      |  8 ++++++++
 packages/host-bin/src/main.ts        |  9 ++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

(limited to 'packages/host-bin/src')

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);
 	};
-- 
cgit v1.2.3