@effect-tui/react 0.6.2 → 0.7.0

package/src/remote/Router.ts

@@ -4,6 +4,15 @@ import type { KeyMsg } from "@effect-tui/core"
 import { Context, Effect, type Layer } from "effect"
 import { TuiRpcs } from "./Procedures.js"
 
+// Log entry result type
+export interface LogEntryResult {
+	timestamp: string
+	level: string
+	message: string
+	file?: string
+	line?: number
+}
+
 // Service interface for the TUI session
 export interface TuiSessionImpl {
 	readonly getScreenshot: () => string
@@ -17,6 +26,7 @@ export interface TuiSessionImpl {
 		entryPath?: string
 		name?: string
 	}
+	readonly getLogEntries: (limit?: number) => { entries: LogEntryResult[]; total: number }
 }
 
 export class TuiSession extends Context.Tag("TuiSession")<TuiSession, TuiSessionImpl>() {}
@@ -27,7 +37,8 @@ export const HandlersLive: Layer.Layer<
 	| Rpc.Handler<"SendKey">
 	| Rpc.Handler<"Paste">
 	| Rpc.Handler<"Resize">
-	| Rpc.Handler<"Info">,
+	| Rpc.Handler<"Info">
+	| Rpc.Handler<"GetLogs">,
 	never,
 	TuiSession
 > = TuiRpcs.toLayer(
@@ -55,6 +66,8 @@ export const HandlersLive: Layer.Layer<
 			Resize: ({ width, height }) => Effect.sync(() => session.dispatchResize(width, height)),
 
 			Info: () => Effect.sync(() => session.getInfo()),
+
+			GetLogs: ({ limit }) => Effect.sync(() => session.getLogEntries(limit)),
 		}
 	}),
 )

package/src/remote/index.ts

@@ -13,8 +13,9 @@ export { getSocketPath, makeServerLayer } from "./Server.js"
 
 import * as fs from "node:fs"
 import { Effect, Exit, Layer, Scope } from "effect"
+import { getConsoleCapture } from "../console/ConsoleCapture.js"
 import type { TuiRenderer } from "../renderer-types.js"
-import type { TuiSessionImpl } from "./Router.js"
+import type { LogEntryResult, TuiSessionImpl } from "./Router.js"
 import { getSocketPath, makeServerLayer } from "./Server.js"
 
 export interface EnableRemoteOptions {
@@ -76,6 +77,19 @@ export function enableRemote(renderer: TuiRenderer, options?: EnableRemoteOption
 			entryPath: opts.entryPath,
 			name,
 		}),
+		getLogEntries: (limit?: number): { entries: LogEntryResult[]; total: number } => {
+			const all = getConsoleCapture().getEntries()
+			const total = all.length
+			const sliced = limit ? all.slice(-limit) : all
+			const entries: LogEntryResult[] = sliced.map((e) => ({
+				timestamp: e.timestamp.toISOString(),
+				level: e.level,
+				message: e.message,
+				file: e.location?.file,
+				line: e.location?.line,
+			}))
+			return { entries, total }
+		},
 	}
 
 	// Build and run the server layer

package/src/test/render-tui.ts

@@ -1,5 +1,5 @@
 import type { KeyMsg } from "@effect-tui/core"
-import type { ReactElement } from "react"
+import React, { type ReactElement, useState } from "react"
 import { flushPassiveEffects, flushSync } from "../reconciler/host-config.js"
 import { createRenderer, createRoot } from "../renderer.js"
 import { getVisibleLines, MockStdin, MockStdout, stripAnsi } from "./mock-streams.js"
@@ -69,7 +69,15 @@ export function renderTUI(element: ReactElement, options?: RenderTUIOptions): Re
 	})
 
 	const root = createRoot(renderer)
-	root.render(element, true) // sync mode
+	let bump: (() => void) | null = null
+	const Harness = ({ children }: { children: ReactElement }) => {
+		const [tick, setTick] = useState(0)
+		bump = () => setTick((value) => value + 1)
+		return React.cloneElement(children, { __renderTick: tick } as Record<string, unknown>)
+	}
+
+	const harnessed = React.createElement(Harness, null, element)
+	root.render(harnessed, true) // sync mode
 
 	// Flush effects
 	flushPassiveEffects()
@@ -79,12 +87,22 @@ export function renderTUI(element: ReactElement, options?: RenderTUIOptions): Re
 
 	const flush = () => {
 		// Flush React updates synchronously
-		flushSync(() => {})
+		flushSync(() => {
+			bump?.()
+		})
 		flushPassiveEffects()
 		// Clear buffer before re-render to get clean frame
 		stdout.clear()
 		renderer.requestRender()
 		renderer.flush()
+		// Flush updates scheduled during layout (e.g., viewport/content size callbacks)
+		flushSync(() => {
+			bump?.()
+		})
+		flushPassiveEffects()
+		stdout.clear()
+		renderer.requestRender()
+		renderer.flush()
 	}
 
 	return {