@aryasaatvik/motel 0.4.0 → 0.5.0

package/README.md

@@ -50,7 +50,7 @@ curl -fsSL https://bun.sh/install | bash
 the keyboard cheat sheet, or `c` to copy paste-ready setup instructions
 for any Effect/OTEL app you want to trace.
 
-Requirements: [Bun](https://bun.sh/) v1.1 or newer.
+Requirements: [Bun](https://bun.sh/) matching `package.json` `engines.bun` (`>=1.3.0`).
 
 ### macOS service from the maintained checkout
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aryasaatvik/motel",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "A local OpenTelemetry ingest + TUI viewer for development, backed by SQLite.",
   "type": "module",
   "license": "MIT",
@@ -91,17 +91,17 @@
     "prepublishOnly": "bun run web:build"
   },
   "devDependencies": {
-    "@effect/language-service": "0.87.1",
+    "@effect/language-service": "0.87.2",
     "@types/bun": "^1.3.14",
     "@types/react": "^19.2.17",
     "tegami": "1.4.0",
     "typescript": "^6.0.3"
   },
   "dependencies": {
-    "@effect/atom-react": "4.0.0-rc.112",
-    "@effect/opentelemetry": "4.0.0-rc.112",
-    "@effect/platform-bun": "4.0.0-rc.112",
-    "@effect/platform-node-shared": "4.0.0-rc.112",
+    "@effect/atom-react": "4.0.0-rc.117",
+    "@effect/opentelemetry": "4.0.0-rc.117",
+    "@effect/platform-bun": "4.0.0-rc.117",
+    "@effect/platform-node-shared": "4.0.0-rc.117",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-logs-otlp-http": "^0.219.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.219.0",
@@ -112,7 +112,7 @@
     "@opentelemetry/sdk-trace-node": "^2.8.0",
     "@opentui/core": "0.4.2",
     "@opentui/react": "0.4.2",
-    "effect": "4.0.0-rc.112",
+    "effect": "4.0.0-rc.117",
     "protobufjs": "7.6.4",
     "react": "^19.2.7",
     "scheduler": "^0.27.0"

package/src/cli.ts

@@ -16,7 +16,7 @@ const query = <A>(effect: Effect.Effect<A, unknown, TelemetryStoreReadonly>) =>
 
 const optional = (value: Option.Option<string>, fallback?: string) => Option.getOrElse(value, () => fallback)
 
-const searchOperand = Argument.string("service-or-filter").pipe(
+const searchOperand = Argument.String("service-or-filter").pipe(
 	Argument.mapTryCatch(
 		(value) => {
 			if (value.startsWith("attr.") && !isAttributeFilterToken(value)) {
@@ -34,8 +34,8 @@ const services = Command.make("services", {}, () =>
 ).pipe(Command.withDescription("List observed telemetry services"))
 
 const traces = Command.make("traces", {
-	service: Argument.string("service").pipe(Argument.optional),
-	limit: Argument.integer("limit").pipe(Argument.optional),
+	service: Argument.String("service").pipe(Argument.optional),
+	limit: Argument.Int("limit").pipe(Argument.optional),
 }, ({ service, limit }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) =>
 		store.listRecentTraces(optional(service, config.otel.serviceName)!, {
@@ -45,13 +45,13 @@ const traces = Command.make("traces", {
 ).pipe(Command.withDescription("List recent traces"))
 
 const trace = Command.make("trace", {
-	traceId: Argument.string("trace-id"),
+	traceId: Argument.String("trace-id"),
 }, ({ traceId }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.getTrace(traceId))),
 ).pipe(Command.withDescription("Get one trace"))
 
 const span = Command.make("span", {
-	spanId: Argument.string("span-id"),
+	spanId: Argument.String("span-id"),
 }, ({ spanId }) =>
 	Effect.promise(() => fetch(`${config.otel.queryUrl}/api/spans/${encodeURIComponent(spanId)}`).then((response) => response.json())).pipe(
 		Effect.andThen(json),
@@ -59,7 +59,7 @@ const span = Command.make("span", {
 ).pipe(Command.withDescription("Get one span"))
 
 const traceSpans = Command.make("trace-spans", {
-	traceId: Argument.string("trace-id"),
+	traceId: Argument.String("trace-id"),
 }, ({ traceId }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.listTraceSpans(traceId))),
 ).pipe(Command.withDescription("List spans in one trace"))
@@ -102,8 +102,8 @@ const searchTraces = Command.make("search-traces", {
 }).pipe(Command.withDescription("Search trace summaries by service, operation, and attributes"))
 
 const traceStats = Command.make("trace-stats", {
-	groupBy: Argument.string("groupBy"),
-	agg: Argument.choice("aggregation", ["count", "avg_duration", "p95_duration", "error_rate"]),
+	groupBy: Argument.String("groupBy"),
+	agg: Argument.Literals("aggregation", ["count", "avg_duration", "p95_duration", "error_rate"]),
 	args: searchOperand,
 }, ({ groupBy, agg, args }) => {
 	const values = args as ReadonlyArray<string>
@@ -121,7 +121,7 @@ const instructions = Command.make("instructions", {}, () => Console.log(otelServ
 	.pipe(Command.withDescription("Print Effect telemetry setup instructions"))
 
 const logs = Command.make("logs", {
-	service: Argument.string("service").pipe(Argument.optional),
+	service: Argument.String("service").pipe(Argument.optional),
 }, ({ service }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.listRecentLogs(optional(service, config.otel.serviceName)!))),
 ).pipe(Command.withDescription("List recent logs"))
@@ -141,7 +141,7 @@ const searchLogs = Command.make("search-logs", {
 }).pipe(Command.withDescription("Search logs by service, body, and attributes"))
 
 const logStats = Command.make("log-stats", {
-	groupBy: Argument.string("groupBy"),
+	groupBy: Argument.String("groupBy"),
 	args: searchOperand,
 }, ({ groupBy, args }) => {
 	const values = args as ReadonlyArray<string>
@@ -156,13 +156,13 @@ const logStats = Command.make("log-stats", {
 }).pipe(Command.withDescription("Aggregate log metrics"))
 
 const traceLogs = Command.make("trace-logs", {
-	traceId: Argument.string("trace-id"),
+	traceId: Argument.String("trace-id"),
 }, ({ traceId }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.listTraceLogs(traceId))),
 ).pipe(Command.withDescription("List logs for one trace"))
 
 const spanLogs = Command.make("span-logs", {
-	spanId: Argument.string("span-id"),
+	spanId: Argument.String("span-id"),
 }, ({ spanId }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.searchLogs({
 		spanId,
@@ -171,8 +171,8 @@ const spanLogs = Command.make("span-logs", {
 ).pipe(Command.withDescription("List logs for one span"))
 
 const facets = Command.make("facets", {
-	type: Argument.choice("type", ["traces", "logs"]),
-	field: Argument.string("field"),
+	type: Argument.Literals("type", ["traces", "logs"]),
+	field: Argument.String("field"),
 }, ({ type, field }) =>
 	query(Effect.flatMap(TelemetryStoreReadonly, (store) => store.listFacets({ type, field, limit: 20 }))),
 ).pipe(Command.withDescription("List facet values"))

package/src/mcp.ts

@@ -433,7 +433,8 @@ const ServerLayer = McpServer.toolkit(MotelToolkit).pipe(
 		}),
 	),
 	Layer.provide(BunStdio.layer),
-	Layer.provide(Logger.layer([Logger.consolePretty({ stderr: true })])),
+	// stdout carries the MCP stdio protocol, so logs must go to stderr.
+	Layer.provide(Layer.merge(Logger.layer([Logger.consolePretty()]), Layer.succeed(Logger.LogToStderr, true))),
 )
 
 Layer.launch(ServerLayer).pipe(BunRuntime.runMain)

package/src/motel.ts

@@ -40,7 +40,7 @@ const restart = Command.make("restart", {}, () =>
 
 const serviceManager = createLaunchAgentManager()
 const serviceInstall = Command.make("install", {
-	replace: Flag.boolean("replace").pipe(Flag.withDefault(false)),
+	replace: Flag.Boolean("replace").pipe(Flag.withDefault(false)),
 }, ({ replace }) =>
 	serviceManager.install(replace).pipe(Effect.andThen(json)),
 ).pipe(Command.withDescription("Install the per-user Motel LaunchAgent"))

package/src/services/AsyncIngest.ts

@@ -20,10 +20,9 @@
  */
 
 import * as BunWorker from "@effect/platform-bun/BunWorker"
-import { Context, Effect, Layer, Scope, Schema } from "effect"
+import { Context, Effect, Latch, Layer, Scope, Schema } from "effect"
 import * as RpcClient from "effect/unstable/rpc/RpcClient"
 import type { RpcClientError } from "effect/unstable/rpc/RpcClientError"
-import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
 import type { WorkerError } from "effect/unstable/workers/WorkerError"
 import { IngestProgress, WriterEvent, type IngestReadiness } from "../ingestReadiness.ts"
 import { IngestRpcs } from "./ingestRpc.ts"
@@ -52,14 +51,22 @@ export const AsyncIngestLive = Layer.effect(
 			const event = Schema.decodeUnknownSync(WriterEvent)(data)
 			progress.receive(event)
 		}
+		// Opens once the current worker has answered the platform handshake (or
+		// died). Effect's worker close message is only received after that
+		// handshake; one posted earlier is dropped and the platform finalizer
+		// then waits five seconds before terminating the worker.
+		let handshake = Latch.makeUnsafe(true)
 		const WorkerProtocol = RpcClient.layerProtocolWorker({ size: 1 }).pipe(
-			Layer.provide(RpcSerialization.layerMsgPack),
 			Layer.provide(BunWorker.layer(() => {
 				const worker = new Worker(new URL("./telemetryWorker.ts", import.meta.url), {
 					env: { ...process.env, MOTEL_INGEST_DIAGNOSTICS_CHANNEL: channelName },
 				})
-				worker.addEventListener("error", () => progress.fail())
-				worker.addEventListener("close", () => progress.fail())
+				const spawned = Latch.makeUnsafe(false)
+				handshake = spawned
+				const settle = () => spawned.openUnsafe()
+				worker.addEventListener("message", settle, { once: true })
+				worker.addEventListener("error", () => { settle(); progress.fail() })
+				worker.addEventListener("close", () => { settle(); progress.fail() })
 				return worker
 			})),
 		)
@@ -76,6 +83,10 @@ export const AsyncIngestLive = Layer.effect(
 		const getClient = yield* Effect.cached(Effect.gen(function*() {
 			const clientScope = yield* Scope.fork(scope, "sequential")
 			const protocolContext = yield* Layer.buildWithScope(WorkerProtocol, clientScope)
+			// Added after the protocol's finalizers, so it runs before them: a
+			// shutdown during worker startup waits for the handshake and then
+			// closes the writer gracefully instead of timing out and terminating it.
+			yield* Scope.addFinalizer(clientScope, Effect.suspend(() => handshake.await).pipe(Effect.timeoutOption("5 seconds")))
 			return yield* RpcClient.make(IngestRpcs).pipe(
 				Effect.provide(protocolContext),
 				Effect.provideService(Scope.Scope, clientScope),

package/src/services/telemetryWorker.ts

@@ -17,7 +17,6 @@
 import { BunRuntime } from "@effect/platform-bun"
 import * as BunWorkerRunner from "@effect/platform-bun/BunWorkerRunner"
 import { Effect, Layer } from "effect"
-import * as RpcSerialization from "effect/unstable/rpc/RpcSerialization"
 import * as RpcServer from "effect/unstable/rpc/RpcServer"
 import type { OtlpLogExportRequest, OtlpTraceExportRequest } from "../otlp.ts"
 import { WriterDiagnostics, type WriterEvent } from "../ingestReadiness.ts"
@@ -57,7 +56,6 @@ const WorkerLive = RpcServer.layer(IngestRpcs).pipe(
 	Layer.provide(IngestHandlers),
 	Layer.provide(TelemetryStoreWorkerLive),
 	Layer.provide(RpcServer.layerProtocolWorkerRunner),
-	Layer.provide(RpcSerialization.layerMsgPack),
 	Layer.provide(BunWorkerRunner.layer),
 )