@kitlangton/motel 0.2.6 → 0.2.7

package/AGENTS.md

@@ -132,7 +132,7 @@ The repo is wired up with `@effect/language-service` as a `tsconfig.json` `plugi
 
 ## Env Vars
 - `MOTEL_OTEL_ENABLED`: defaults to `false` (set to `true` to emit self-traces for debugging motel itself)
-- `MOTEL_OTEL_SERVICE_NAME`: defaults to `motel-otel-tui`
+- `MOTEL_OTEL_SERVICE_NAME`: defaults to `motel-otel-tui`; a nonblank explicit value also selects the initial TUI service, overriding the remembered selection (unset or blank values keep the remembered selection)
 - `MOTEL_OTEL_BASE_URL`: defaults to `http://127.0.0.1:27686`
 - `MOTEL_OTEL_HOST`: defaults to `127.0.0.1`
 - `MOTEL_OTEL_PORT`: defaults to `27686`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitlangton/motel",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "A local OpenTelemetry ingest + TUI viewer for development, backed by SQLite.",
   "type": "module",
   "license": "MIT",

package/src/config.ts

@@ -22,10 +22,13 @@ const parsedBaseUrl = new URL(baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`)
 export const resolveOtelUrl = (path: string) => new URL(path.startsWith("/") ? path.slice(1) : path, parsedBaseUrl).toString()
 const serverPort = parsePositiveInt(process.env.MOTEL_OTEL_PORT, Number.parseInt(parsedBaseUrl.port || "80", 10))
 
+// Preserve whether a service was requested so the TUI can override remembered state.
+export const explicitServiceName = process.env.MOTEL_OTEL_SERVICE_NAME?.trim() || null
+
 export const config = {
 	otel: {
 		enabled: parseBoolean(process.env.MOTEL_OTEL_ENABLED, false),
-		serviceName: process.env.MOTEL_OTEL_SERVICE_NAME?.trim() || "motel-otel-tui",
+		serviceName: explicitServiceName ?? "motel-otel-tui",
 		baseUrl,
 		host: process.env.MOTEL_OTEL_HOST?.trim() || parsedBaseUrl.hostname,
 		port: serverPort,

package/src/ui/atoms.ts

@@ -1,5 +1,5 @@
 import * as Atom from "effect/unstable/reactivity/Atom"
-import { config } from "../config.ts"
+import { config, explicitServiceName } from "../config.ts"
 import type { LogItem, TraceItem, TraceSummaryItem } from "../domain.ts"
 import type { ThemeName } from "./theme.ts"
 import { readLastService, readLastTheme } from "./persistence.ts"
@@ -77,7 +77,7 @@ export const logStateAtom = Atom.make(initialLogState).pipe(Atom.keepAlive)
 export const serviceLogStateAtom = Atom.make(initialServiceLogState).pipe(Atom.keepAlive)
 export const selectedServiceLogIndexAtom = Atom.make(0).pipe(Atom.keepAlive)
 export const selectedTraceIndexAtom = Atom.make(0).pipe(Atom.keepAlive)
-export const selectedTraceServiceAtom = Atom.make<string | null>(readLastService() ?? config.otel.serviceName).pipe(Atom.keepAlive)
+export const selectedTraceServiceAtom = Atom.make<string | null>(explicitServiceName ?? readLastService() ?? config.otel.serviceName).pipe(Atom.keepAlive)
 export const refreshNonceAtom = Atom.make(0).pipe(Atom.keepAlive)
 export const noticeAtom = Atom.make<string | null>(null).pipe(Atom.keepAlive)
 export const selectedSpanIndexAtom = Atom.make<number | null>(null).pipe(Atom.keepAlive)

package/src/ui/serviceSelection.test.ts

@@ -0,0 +1,50 @@
+import { describe, expect, test } from "bun:test"
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs"
+import { tmpdir } from "node:os"
+import { join } from "node:path"
+
+describe("initial TUI service selection", () => {
+	for (const remembered of [undefined, "svc-b", " \n"]) {
+		for (const explicit of [undefined, "", " \t ", "svc-a", " svc-a ", "motel-otel-tui"]) {
+			test(`env=${JSON.stringify(explicit)}, remembered=${JSON.stringify(remembered)}`, () => {
+				const dir = mkdtempSync(join(tmpdir(), "motel-service-selection-"))
+				try {
+					if (remembered !== undefined) writeFileSync(join(dir, "last-service.txt"), remembered)
+					const env = { ...process.env }
+					for (const key of Object.keys(env)) {
+						if (key.startsWith("MOTEL_")) delete env[key]
+					}
+					env.MOTEL_RUNTIME_DIR = dir
+					env.MOTEL_OTEL_DB_PATH = join(dir, "telemetry.sqlite")
+					if (explicit !== undefined) env.MOTEL_OTEL_SERVICE_NAME = explicit
+
+					// Fresh processes exercise import-time config and persistence without module-cache leakage.
+					const result = Bun.spawnSync([process.execPath, "--no-env-file", "--eval", `
+						import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry"
+						import { config } from "./src/config.ts"
+						import { selectedTraceServiceAtom } from "./src/ui/atoms.ts"
+						const registry = AtomRegistry.make()
+						const initial = registry.get(selectedTraceServiceAtom)
+						registry.set(selectedTraceServiceAtom, "switched-service")
+						console.log(JSON.stringify({
+							initial,
+							serviceName: config.otel.serviceName,
+							switched: registry.get(selectedTraceServiceAtom),
+						}))
+						registry.dispose()
+					`], { cwd: join(import.meta.dir, "../.."), env, timeout: 5_000 })
+
+					expect(result.exitCode).toBe(0)
+					expect(result.stderr.toString()).toBe("")
+					expect(JSON.parse(result.stdout.toString())).toEqual({
+						initial: explicit?.trim() || remembered?.trim() || "motel-otel-tui",
+						serviceName: explicit?.trim() || "motel-otel-tui",
+						switched: "switched-service",
+					})
+				} finally {
+					rmSync(dir, { recursive: true, force: true })
+				}
+			})
+		}
+	}
+})