@tui-sandbox/library 10.3.0 → 10.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tui-sandbox/library",
-  "version": "10.3.0",
+  "version": "10.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/mikavilpas/tui-sandbox"
@@ -12,31 +12,32 @@
   },
   "dependencies": {
     "@catppuccin/palette": "1.7.1",
-    "@trpc/client": "11.1.2",
-    "@trpc/server": "11.1.2",
+    "@trpc/client": "11.4.1",
+    "@trpc/server": "11.4.1",
     "@xterm/addon-attach": "0.11.0",
     "@xterm/addon-fit": "0.10.0",
     "@xterm/xterm": "5.5.0",
     "command-exists": "1.2.9",
-    "core-js": "3.42.0",
+    "core-js": "3.43.0",
     "cors": "2.8.5",
     "dree": "5.1.5",
     "express": "5.1.0",
     "neovim": "5.3.0",
     "node-pty": "1.0.0",
     "prettier": "3.5.3",
-    "tsx": "4.19.4",
+    "tsx": "4.20.3",
     "type-fest": "4.41.0",
     "winston": "3.17.0"
   },
   "devDependencies": {
     "@types/command-exists": "1.2.3",
-    "@types/cors": "2.8.18",
-    "@types/express": "5.0.1",
-    "@types/node": "22.15.18",
+    "@types/cors": "2.8.19",
+    "@types/express": "5.0.3",
+    "@types/node": "24.0.1",
     "nodemon": "3.1.10",
     "vite": "6.3.5",
-    "vitest": "3.1.3"
+    "vitest": "3.2.3",
+    "zod": "4.0.0-beta.20250505T195954"
   },
   "peerDependencies": {
     "cypress": "^13 || ^14",

package/src/browser/neovim-client.ts

@@ -1,8 +1,12 @@
 import { TerminalClient as NeovimTerminalClient } from "../client/index.js"
 import { TerminalTerminalClient } from "../client/terminal-terminal-client.js"
+import type {
+  ExCommandClientInput,
+  LuaCodeClientInput,
+  PollLuaCodeClientInput,
+} from "../server/applications/neovim/neovimRouter.js"
+import type { StartTerminalGenericArguments } from "../server/applications/terminal/TerminalTestApplication.js"
 import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js"
-import type { ExCommandClientInput, LuaCodeClientInput, PollLuaCodeClientInput } from "../server/server.js"
-import type { StartTerminalGenericArguments } from "../server/terminal/TerminalTestApplication.js"
 import type {
   BlockingShellCommandOutput,
   RunExCommandOutput,

package/src/client/neovim-terminal-client.ts

@@ -1,8 +1,13 @@
 import { createTRPCClient, httpBatchLink, httpSubscriptionLink, splitLink } from "@trpc/client"
 import type { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
+import type {
+  ExCommandClientInput,
+  LuaCodeClientInput,
+  PollLuaCodeClientInput,
+} from "../server/applications/neovim/neovimRouter.js"
 import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js"
-import type { AppRouter, ExCommandClientInput, LuaCodeClientInput, PollLuaCodeClientInput } from "../server/server.js"
+import type { AppRouter } from "../server/server.js"
 import type {
   BlockingShellCommandOutput,
   RunExCommandOutput,

package/src/client/terminal-terminal-client.ts

@@ -1,9 +1,9 @@
 import { createTRPCClient, httpBatchLink, httpSubscriptionLink, splitLink } from "@trpc/client"
 import type { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
+import type { StartTerminalGenericArguments } from "../server/applications/terminal/TerminalTestApplication.js"
 import type { BlockingCommandClientInput } from "../server/blockingCommandInputSchema.js"
 import type { AppRouter } from "../server/server.js"
-import type { StartTerminalGenericArguments } from "../server/terminal/TerminalTestApplication.js"
 import type { BlockingShellCommandOutput, TestDirectory } from "../server/types.js"
 import "./style.css"
 import { getTabId, startTerminal } from "./websocket-client.js"

package/src/client/websocket-client.ts

@@ -2,7 +2,7 @@ import { flavors } from "@catppuccin/palette"
 import { FitAddon } from "@xterm/addon-fit"
 import { Terminal } from "@xterm/xterm"
 import "@xterm/xterm/css/xterm.css"
-import z from "zod"
+import { z } from "zod"
 import type { TabId } from "../server/utilities/tabId.ts"
 import "./style.css"
 import { validateMouseEvent } from "./validateMouseEvent.js"

package/src/scripts/tui.ts

@@ -1,12 +1,12 @@
 import assert from "node:assert"
 import path from "node:path"
+import { installDependencies } from "../server/applications/neovim/api.js"
+import type { StdoutOrStderrMessage } from "../server/applications/neovim/NeovimApplication.js"
+import { NeovimApplication } from "../server/applications/neovim/NeovimApplication.js"
+import { prepareNewTestDirectory } from "../server/applications/neovim/prepareNewTestDirectory.js"
 import { createCypressSupportFile } from "../server/cypress-support/createCypressSupportFile.js"
 import type { TestServerConfig } from "../server/index.js"
 import { startTestServer, updateTestdirectorySchemaFile } from "../server/index.js"
-import { installDependencies } from "../server/neovim/index.js"
-import type { StdoutOrStderrMessage } from "../server/neovim/NeovimApplication.js"
-import { NeovimApplication } from "../server/neovim/NeovimApplication.js"
-import { prepareNewTestDirectory } from "../server/neovim/prepareNewTestDirectory.js"
 
 //
 // This is the main entrypoint to tui-sandbox

package/src/server/{neovim → applications/neovim}/NeovimApplication.ts

@@ -5,10 +5,10 @@ import { access } from "fs/promises"
 import type { NeovimClient as NeovimApiClient } from "neovim"
 import { tmpdir } from "os"
 import path, { join } from "path"
-import type { TestDirectory, TestEnvironmentCommonEnvironmentVariables } from "../types.js"
-import { DisposableSingleApplication } from "../utilities/DisposableSingleApplication.js"
-import type { Lazy } from "../utilities/Lazy.js"
-import { TerminalApplication } from "../utilities/TerminalApplication.js"
+import type { TestDirectory, TestEnvironmentCommonEnvironmentVariables } from "../../types.js"
+import { DisposableSingleApplication } from "../../utilities/DisposableSingleApplication.js"
+import type { Lazy } from "../../utilities/Lazy.js"
+import { TerminalApplication } from "../../utilities/TerminalApplication.js"
 import { connectNeovimApi } from "./NeovimJavascriptApiClient.js"
 
 /*

package/src/server/{neovim → applications/neovim}/NeovimJavascriptApiClient.test.ts

@@ -37,6 +37,11 @@ it("connects right away if the socket file is already there", async () => {
   await lazyClient.get()
 
   vi.advanceTimersByTime(pollingInterval)
-  expect(mocked.attach).toHaveBeenCalledWith({ socket: "foosocket" })
+  expect(mocked.attach).toHaveBeenCalledWith({
+    socket: "foosocket",
+    options: {
+      logger: expect.any(Object) as never,
+    },
+  } satisfies Partial<Parameters<typeof attach>[0]>)
   expect(mocked.attach).toHaveBeenCalledTimes(1)
 })

package/src/server/{neovim → applications/neovim}/NeovimJavascriptApiClient.ts

@@ -1,13 +1,27 @@
 import { access } from "fs/promises"
 import type { NeovimClient as NeovimApiClient } from "neovim"
 import { attach } from "neovim"
-import { Lazy } from "../utilities/Lazy.js"
+import { createLogger, format, transports } from "winston"
+import { Lazy } from "../../utilities/Lazy.js"
 
 export type NeovimJavascriptApiClient = NeovimApiClient
 
 export type PollingInterval = 100
 
 export function connectNeovimApi(socketPath: string): Lazy<Promise<NeovimJavascriptApiClient>> {
+  // When a custom logger is provided to attach(), we can hide debug level log
+  // messages
+  //
+  // https://github.com/neovim/node-client/blob/e0568e32e0fc8837ad900146bfd5ca27b9416235/README.md#logging
+  const logger = createLogger({
+    level: "warn",
+    transports: [
+      new transports.Console({
+        format: format.combine(format.colorize(), format.simple()),
+      }),
+    ],
+  })
+
   // it takes about 100ms for the socket file to be created - best make this
   // Lazy so that we don't wait for it unnecessarily.
   return new Lazy(async () => {
@@ -27,6 +41,11 @@ export function connectNeovimApi(socketPath: string): Lazy<Promise<NeovimJavascr
     // this.
     process.env["ALLOW_CONSOLE"] = "1"
 
-    return attach({ socket: socketPath })
+    return attach({
+      socket: socketPath,
+      options: {
+        logger,
+      },
+    })
   })
 }

package/src/server/{neovim/index.ts → applications/neovim/api.ts}

@@ -2,23 +2,23 @@ import assert from "assert"
 import "core-js/proposals/async-explicit-resource-management.js"
 import { access } from "fs/promises"
 import path from "path"
-import type { BlockingCommandInput } from "../blockingCommandInputSchema.js"
-import type { ExCommandInput, LuaCodeInput } from "../server.js"
-import { executeBlockingShellCommand } from "../terminal/runBlockingShellCommand.js"
+import type { BlockingCommandInput } from "../../blockingCommandInputSchema.js"
 import type {
   BlockingShellCommandOutput,
   RunExCommandOutput,
   RunLuaCodeOutput,
   StartNeovimGenericArguments,
   TestDirectory,
-} from "../types.js"
-import type { DirectoriesConfig } from "../updateTestdirectorySchemaFile.js"
-import { convertEventEmitterToAsyncGenerator } from "../utilities/generator.js"
-import { Lazy } from "../utilities/Lazy.js"
-import type { TabId } from "../utilities/tabId.js"
-import { timeout } from "../utilities/timeout.js"
+} from "../../types.js"
+import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
+import { convertEventEmitterToAsyncGenerator } from "../../utilities/generator.js"
+import { Lazy } from "../../utilities/Lazy.js"
+import type { TabId } from "../../utilities/tabId.js"
+import { timeout } from "../../utilities/timeout.js"
+import { executeBlockingShellCommand } from "../terminal/runBlockingShellCommand.js"
 import type { StdoutOrStderrMessage, TerminalDimensions } from "./NeovimApplication.js"
 import { NeovimApplication } from "./NeovimApplication.js"
+import type { ExCommandInput, LuaCodeInput } from "./neovimRouter.js"
 import { prepareNewTestDirectory } from "./prepareNewTestDirectory.js"
 
 const neovims = new Map<TabId["tabId"], NeovimApplication>()

package/src/server/{neovim → applications/neovim}/environment/createTempDir.ts

@@ -4,10 +4,10 @@ import { Type } from "dree"
 import { constants, readdirSync, statSync } from "fs"
 import { access, mkdir, mkdtemp } from "fs/promises"
 import path from "path"
-import { convertDree, getDirectoryTree } from "../../dirtree/index.js"
-import type { TestDirectory } from "../../types.js"
-import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
-import { updateTestdirectorySchemaFile } from "../../updateTestdirectorySchemaFile.js"
+import { convertDree, getDirectoryTree } from "../../../dirtree/index.js"
+import type { TestDirectory } from "../../../types.js"
+import type { DirectoriesConfig } from "../../../updateTestdirectorySchemaFile.js"
+import { updateTestdirectorySchemaFile } from "../../../updateTestdirectorySchemaFile.js"
 
 export async function createTempDir(config: DirectoriesConfig): Promise<TestDirectory> {
   try {

package/src/server/applications/neovim/neovimRouter.ts

@@ -0,0 +1,90 @@
+import "core-js/proposals/async-explicit-resource-management.js"
+import type { Except } from "type-fest"
+import { z } from "zod"
+import { blockingCommandInputSchema } from "../../blockingCommandInputSchema.js"
+import { trpc } from "../../connection/trpc.js"
+import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
+import { tabIdSchema } from "../../utilities/tabId.js"
+import { timeoutable } from "../../utilities/timeoutable.js"
+import * as neovim from "./api.js"
+
+const luaCodeInputSchema = z.object({ tabId: tabIdSchema, luaCode: z.string() })
+export type LuaCodeClientInput = Except<LuaCodeInput, "tabId">
+export type LuaCodeInput = z.infer<typeof luaCodeInputSchema>
+
+const pollLuaCodeInputSchema = z.object({
+  tabId: tabIdSchema,
+  luaAssertion: z.string(),
+  timeoutMs: z.number().optional().default(10_000),
+})
+export type PollLuaCodeClientInput = Except<z.input<typeof pollLuaCodeInputSchema>, "tabId">
+
+const exCommandInputSchema = z.object({
+  tabId: tabIdSchema,
+  command: z.string(),
+  log: z.boolean().optional(),
+})
+export type ExCommandClientInput = Except<ExCommandInput, "tabId">
+export type ExCommandInput = z.infer<typeof exCommandInputSchema>
+
+// let trpc infer the type as that is what it is designed to do
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export function createNeovimRouter(config: DirectoriesConfig) {
+  return trpc.router({
+    start: trpc.procedure
+      .input(
+        z.object({
+          tabId: tabIdSchema,
+          startNeovimArguments: z.object({
+            filename: z.union([
+              z.string(),
+              z.object({
+                openInVerticalSplits: z.array(z.string()),
+              }),
+            ]),
+            startupScriptModifications: z.array(z.string()).optional(),
+            terminalDimensions: z.object({
+              cols: z.number(),
+              rows: z.number(),
+            }),
+            additionalEnvironmentVariables: z.record(z.string(), z.string()).optional(),
+          }),
+        })
+      )
+      .mutation(options => {
+        return neovim.start(
+          options.input.startNeovimArguments,
+          options.input.startNeovimArguments.terminalDimensions,
+          options.input.tabId,
+          config
+        )
+      }),
+    onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
+      return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
+    }),
+
+    initializeStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
+      return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
+    }),
+    sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
+      return neovim.sendStdin(options.input)
+    }),
+
+    runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async options => {
+      return neovim.runBlockingShellCommand(options.signal, options.input, options.input.allowFailure ?? false)
+    }),
+
+    runLuaCode: trpc.procedure.input(luaCodeInputSchema).mutation(options => {
+      return timeoutable(10_000, neovim.runLuaCode(options.input))
+    }),
+
+    waitForLuaCode: trpc.procedure.input(pollLuaCodeInputSchema).mutation(async options => {
+      const result = await timeoutable(options.input.timeoutMs, neovim.waitForLuaCode(options.input, options.signal))
+      return result
+    }),
+
+    runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(options => {
+      return timeoutable(10_000, neovim.runExCommand(options.input))
+    }),
+  })
+}

package/src/server/{neovim → applications/neovim}/prepareNewTestDirectory.ts

@@ -1,6 +1,6 @@
 import { access, mkdir } from "fs/promises"
-import type { TestDirectory } from "../types.js"
-import type { DirectoriesConfig } from "../updateTestdirectorySchemaFile.js"
+import type { TestDirectory } from "../../types.js"
+import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
 import { createTempDir, removeTestDirectories } from "./environment/createTempDir.js"
 
 export async function prepareNewTestDirectory(config: DirectoriesConfig): Promise<TestDirectory> {

package/src/server/{terminal → applications/terminal}/TerminalTestApplication.ts

@@ -2,10 +2,10 @@ import assert from "assert"
 import { exec } from "child_process"
 import EventEmitter from "events"
 import { join } from "path"
+import type { TestDirectory, TestEnvironmentCommonEnvironmentVariables } from "../../types.js"
+import { DisposableSingleApplication } from "../../utilities/DisposableSingleApplication.js"
+import { TerminalApplication } from "../../utilities/TerminalApplication.js"
 import type { StdoutOrStderrMessage, TerminalDimensions } from "../neovim/NeovimApplication.js"
-import type { TestDirectory, TestEnvironmentCommonEnvironmentVariables } from "../types.js"
-import { DisposableSingleApplication } from "../utilities/DisposableSingleApplication.js"
-import { TerminalApplication } from "../utilities/TerminalApplication.js"
 
 type ResettableState = {
   testDirectory: TestDirectory

package/src/server/{terminal/index.ts → applications/terminal/api.ts}

@@ -1,13 +1,13 @@
 import assert from "assert"
 import "core-js/proposals/async-explicit-resource-management.js"
-import type { BlockingCommandInput } from "../blockingCommandInputSchema.js"
+import type { BlockingCommandInput } from "../../blockingCommandInputSchema.js"
+import type { BlockingShellCommandOutput } from "../../types.js"
+import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
+import { convertEventEmitterToAsyncGenerator } from "../../utilities/generator.js"
+import { Lazy } from "../../utilities/Lazy.js"
+import type { TabId } from "../../utilities/tabId.js"
 import type { TerminalDimensions } from "../neovim/NeovimApplication.js"
 import { prepareNewTestDirectory } from "../neovim/prepareNewTestDirectory.js"
-import type { BlockingShellCommandOutput } from "../types.js"
-import type { DirectoriesConfig } from "../updateTestdirectorySchemaFile.js"
-import { convertEventEmitterToAsyncGenerator } from "../utilities/generator.js"
-import { Lazy } from "../utilities/Lazy.js"
-import type { TabId } from "../utilities/tabId.js"
 import { executeBlockingShellCommand } from "./runBlockingShellCommand.js"
 import TerminalTestApplication from "./TerminalTestApplication.js"
 

package/src/server/{terminal → applications/terminal}/runBlockingShellCommand.ts

@@ -2,8 +2,8 @@ import { exec } from "child_process"
 import "core-js/proposals/async-explicit-resource-management.js"
 import { join } from "path"
 import util from "util"
-import type { BlockingCommandInput } from "../blockingCommandInputSchema.js"
-import type { BlockingShellCommandOutput, TestDirectory } from "../types.js"
+import type { BlockingCommandInput } from "../../blockingCommandInputSchema.js"
+import type { BlockingShellCommandOutput, TestDirectory } from "../../types.js"
 
 export async function executeBlockingShellCommand(
   testDirectory: TestDirectory,

package/src/server/applications/terminal/terminalRouter.ts

@@ -0,0 +1,50 @@
+import "core-js/proposals/async-explicit-resource-management.js"
+import { z } from "zod"
+import { blockingCommandInputSchema } from "../../blockingCommandInputSchema.js"
+import { trpc } from "../../connection/trpc.js"
+import type { DirectoriesConfig } from "../../updateTestdirectorySchemaFile.js"
+import { tabIdSchema } from "../../utilities/tabId.js"
+import * as terminal from "./api.js"
+
+// let trpc infer the type as that is what it is designed to do
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export function createTerminalRouter(config: DirectoriesConfig) {
+  const terminalRouter = trpc.router({
+    onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
+      return terminal.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
+    }),
+
+    start: trpc.procedure
+      .input(
+        z.object({
+          tabId: tabIdSchema,
+          startTerminalArguments: z.object({
+            commandToRun: z.array(z.string()),
+            additionalEnvironmentVariables: z.record(z.string(), z.string()).optional(),
+            terminalDimensions: z.object({
+              cols: z.number(),
+              rows: z.number(),
+            }),
+          }),
+        })
+      )
+      .mutation(options => {
+        return terminal.start(
+          options.input.startTerminalArguments.terminalDimensions,
+          options.input.startTerminalArguments.commandToRun,
+          options.input.tabId,
+          config
+        )
+      }),
+
+    sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
+      return terminal.sendStdin(options.input)
+    }),
+
+    runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async options => {
+      return terminal.runBlockingShellCommand(options.signal, options.input, options.input.allowFailure ?? false)
+    }),
+  })
+
+  return terminalRouter
+}

package/src/server/cypress-support/contents.ts

@@ -14,11 +14,6 @@ import type {
   GenericNeovimBrowserApi,
   GenericTerminalBrowserApi,
 } from "@tui-sandbox/library/dist/src/browser/neovim-client"
-import type {
-  ExCommandClientInput,
-  LuaCodeClientInput,
-  PollLuaCodeClientInput,
-} from "@tui-sandbox/library/dist/src/server/server"
 import type {
   BlockingShellCommandOutput,
   RunExCommandOutput,
@@ -26,8 +21,13 @@ import type {
   StartNeovimGenericArguments,
   TestDirectory,
 } from "@tui-sandbox/library/dist/src/server/types"
+import type {
+  ExCommandClientInput,
+  LuaCodeClientInput,
+  PollLuaCodeClientInput,
+} from "@tui-sandbox/library/src/server/applications/neovim/neovimRouter"
+import type { StartTerminalGenericArguments } from "@tui-sandbox/library/src/server/applications/terminal/TerminalTestApplication"
 import type { BlockingCommandClientInput } from "@tui-sandbox/library/src/server/blockingCommandInputSchema"
-import type { StartTerminalGenericArguments } from "@tui-sandbox/library/src/server/terminal/TerminalTestApplication"
 import type { OverrideProperties } from "type-fest"
 import type { MyTestDirectory, MyTestDirectoryFile } from "../../MyTestDirectory"
 

package/src/server/server.ts

@@ -1,133 +1,18 @@
 import type { inferRouterInputs } from "@trpc/server"
 import "core-js/proposals/async-explicit-resource-management.js"
-import type { Except } from "type-fest"
-import { z } from "zod"
-import { blockingCommandInputSchema } from "./blockingCommandInputSchema.js"
+import { createNeovimRouter } from "./applications/neovim/neovimRouter.js"
+import { createTerminalRouter } from "./applications/terminal/terminalRouter.js"
 import { trpc } from "./connection/trpc.js"
-import * as neovim from "./neovim/index.js"
-import * as terminal from "./terminal/index.js"
 import { TestServer } from "./TestServer.js"
 import type { DirectoriesConfig, TestServerConfig } from "./updateTestdirectorySchemaFile.js"
-import { tabIdSchema } from "./utilities/tabId.js"
-import { timeoutable } from "./utilities/timeoutable.js"
-
-const luaCodeInputSchema = z.object({ tabId: tabIdSchema, luaCode: z.string() })
-export type LuaCodeClientInput = Except<LuaCodeInput, "tabId">
-export type LuaCodeInput = z.infer<typeof luaCodeInputSchema>
-
-const pollLuaCodeInputSchema = z.object({
-  tabId: tabIdSchema,
-  luaAssertion: z.string(),
-  timeoutMs: z.number().optional().default(10_000),
-})
-export type PollLuaCodeClientInput = Except<z.input<typeof pollLuaCodeInputSchema>, "tabId">
-
-const exCommandInputSchema = z.object({
-  tabId: tabIdSchema,
-  command: z.string(),
-  log: z.boolean().optional(),
-})
-export type ExCommandClientInput = Except<ExCommandInput, "tabId">
-export type ExCommandInput = z.infer<typeof exCommandInputSchema>
 
 /** @private */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export async function createAppRouter(config: DirectoriesConfig) {
   const appRouter = trpc.router({
-    terminal: trpc.router({
-      onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
-        return terminal.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
-      }),
-
-      start: trpc.procedure
-        .input(
-          z.object({
-            tabId: tabIdSchema,
-            startTerminalArguments: z.object({
-              commandToRun: z.array(z.string()),
-              additionalEnvironmentVariables: z.record(z.string(), z.string()).optional(),
-              terminalDimensions: z.object({
-                cols: z.number(),
-                rows: z.number(),
-              }),
-            }),
-          })
-        )
-        .mutation(options => {
-          return terminal.start(
-            options.input.startTerminalArguments.terminalDimensions,
-            options.input.startTerminalArguments.commandToRun,
-            options.input.tabId,
-            config
-          )
-        }),
-
-      sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
-        return terminal.sendStdin(options.input)
-      }),
-
-      runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async options => {
-        return terminal.runBlockingShellCommand(options.signal, options.input, options.input.allowFailure ?? false)
-      }),
-    }),
-
-    neovim: trpc.router({
-      start: trpc.procedure
-        .input(
-          z.object({
-            tabId: tabIdSchema,
-            startNeovimArguments: z.object({
-              filename: z.union([
-                z.string(),
-                z.object({
-                  openInVerticalSplits: z.array(z.string()),
-                }),
-              ]),
-              startupScriptModifications: z.array(z.string()).optional(),
-              terminalDimensions: z.object({
-                cols: z.number(),
-                rows: z.number(),
-              }),
-              additionalEnvironmentVariables: z.record(z.string(), z.string()).optional(),
-            }),
-          })
-        )
-        .mutation(options => {
-          return neovim.start(
-            options.input.startNeovimArguments,
-            options.input.startNeovimArguments.terminalDimensions,
-            options.input.tabId,
-            config
-          )
-        }),
-      onStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
-        return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
-      }),
-
-      initializeStdout: trpc.procedure.input(z.object({ client: tabIdSchema })).subscription(options => {
-        return neovim.initializeStdout(options.input, options.signal, config.testEnvironmentPath)
-      }),
-      sendStdin: trpc.procedure.input(z.object({ tabId: tabIdSchema, data: z.string() })).mutation(options => {
-        return neovim.sendStdin(options.input)
-      }),
-
-      runBlockingShellCommand: trpc.procedure.input(blockingCommandInputSchema).mutation(async options => {
-        return neovim.runBlockingShellCommand(options.signal, options.input, options.input.allowFailure ?? false)
-      }),
-
-      runLuaCode: trpc.procedure.input(luaCodeInputSchema).mutation(options => {
-        return timeoutable(10_000, neovim.runLuaCode(options.input))
-      }),
-
-      waitForLuaCode: trpc.procedure.input(pollLuaCodeInputSchema).mutation(async options => {
-        const result = await timeoutable(options.input.timeoutMs, neovim.waitForLuaCode(options.input, options.signal))
-        return result
-      }),
+    terminal: createTerminalRouter(config),
 
-      runExCommand: trpc.procedure.input(exCommandInputSchema).mutation(options => {
-        return timeoutable(10_000, neovim.runExCommand(options.input))
-      }),
-    }),
+    neovim: createNeovimRouter(config),
   })
 
   return appRouter

package/src/server/types.ts

@@ -44,7 +44,7 @@ export type TestEnvironmentCommonEnvironmentVariables = {
   XDG_DATA_HOME: string
 }
 
-export type { StartNeovimGenericArguments } from "../server/neovim/NeovimApplication.js"
+export type { StartNeovimGenericArguments } from "./applications/neovim/NeovimApplication.js"
 
 export type BlockingShellCommandOutput =
   | {