@factorim/monotui 0.1.0 → 0.3.0

package/src/config/validation.ts

@@ -0,0 +1,90 @@
+import { z } from "zod"
+
+import type { Config } from "../types/config.js"
+
+const facetQuickActionSchema = z.object({
+  facetPath: z.string(),
+  name: z.string(),
+  command: z.string(),
+  exec: z.string(),
+  order: z.number().optional(),
+})
+
+const workspaceQuickActionSchema = z.object({
+  workspacePath: z.string(),
+  facets: z.array(facetQuickActionSchema),
+})
+
+const discoverySchema = z
+  .object({
+    maxDepth: z.number().int().nonnegative().optional(),
+    ignore: z.array(z.string()).optional(),
+    folders: z
+      .object({
+        app: z.array(z.string()).optional(),
+        package: z.array(z.string()).optional(),
+        infra: z.array(z.string()).optional(),
+        contract: z.array(z.string()).optional(),
+      })
+      .optional(),
+    scripts: z
+      .object({
+        include: z.array(z.string()).optional(),
+        exclude: z.array(z.string()).optional(),
+      })
+      .optional(),
+    env: z
+      .object({
+        files: z.array(z.string()).optional(),
+        portKeys: z.array(z.string()).optional(),
+      })
+      .optional(),
+    order: z.array(z.string()).optional(),
+    makefile: z
+      .object({
+        showDefault: z.boolean().optional(),
+      })
+      .optional(),
+  })
+  .optional()
+
+const executionSchema = z
+  .object({
+    useTmux: z.boolean().optional(),
+  })
+  .optional()
+
+const loggingSchema = z
+  .object({
+    level: z.enum(["debug", "info", "warn", "error"]).optional(),
+    file: z.boolean().optional(),
+    logDir: z.string().optional(),
+    prettyPrint: z.boolean().optional(),
+    truncateOnStart: z.boolean().optional(),
+  })
+  .optional()
+
+export const configSchema = z.object({
+  discovery: discoverySchema,
+  quickActions: z.array(workspaceQuickActionSchema),
+  execution: executionSchema,
+  logging: loggingSchema,
+  theme: z.literal("dark").optional(),
+})
+
+export function validateConfig(config: unknown): Config {
+  const result = configSchema.safeParse(config)
+
+  if (result.success) {
+    return result.data
+  }
+
+  const details = result.error.issues
+    .map((issue) => {
+      const path = issue.path.length > 0 ? issue.path.join(".") : "root"
+      return `${path}: ${issue.message}`
+    })
+    .join("; ")
+
+  throw new Error(`Invalid monotui config: ${details}`)
+}

package/src/contexts/ProjectGridContext.tsx

@@ -8,8 +8,8 @@ import {
   shouldKeepTuiOpen,
 } from "../services/runtime/command-runner.js"
 import { Page } from "../types/page.js"
-import type { Project } from "../types/project.js"
 import type { ProjectGridGrid } from "../types/project-grid.js"
+import type { Project } from "../types/workspace.js"
 import {
   buildProjectGrid,
   getProjectCellByPosition,

package/src/contexts/WorkspaceDiscoveryContext.tsx

@@ -8,11 +8,11 @@ import {
 
 import { useWorkspaceDiscovery } from "../hooks/useWorkspaceDiscovery.js"
 import { useWorkspaceRuntime } from "../hooks/useWorkspaceRuntime.js"
-import type { Project } from "../types/project.js"
+import type { Project, Workspace } from "../types/workspace.js"
 import type { WorkspaceRuntimeState } from "../types/workspace-runtime.js"
 
 interface WorkspaceDiscoveryContextType {
-  projects: Project[]
+  workspace: Workspace | null
   workspaceRuntimes: WorkspaceRuntimeState[]
   project: Project | null
   setProject: (project: Project | null) => void
@@ -35,11 +35,11 @@ export function WorkspaceDiscoveryProvider({
 }) {
   const [project, setProject] = useState<Project | null>(null)
   const rootPath = useMemo(() => process.cwd(), [])
-  const { projects } = useWorkspaceDiscovery(rootPath)
-  const workspaceRuntimes = useWorkspaceRuntime(projects)
+  const { workspace } = useWorkspaceDiscovery(rootPath)
+  const workspaceRuntimes = useWorkspaceRuntime(workspace?.projects || [])
 
   return (
-    <Provider value={{ projects, workspaceRuntimes, project, setProject }}>
+    <Provider value={{ workspace, workspaceRuntimes, project, setProject }}>
       {children}
     </Provider>
   )

package/src/contexts/WorkspaceGridContext.tsx

@@ -6,7 +6,7 @@ import {
   shouldKeepTuiOpen,
 } from "../services/runtime/command-runner.js"
 import { Page } from "../types/page.js"
-import type { Project } from "../types/project.js"
+import type { Project } from "../types/workspace.js"
 import type { CursorPosition } from "../types/workspace-grid.js"
 import type { WorkspaceQuickAction } from "../types/workspace-quick-actions.js"
 import type { WorkspaceRuntimeState } from "../types/workspace-runtime.js"
@@ -81,7 +81,7 @@ export function WorkspacesNavigationProvider({
 
       if (selectedCell?.type === "workspace") {
         setPage(Page.Project)
-        setProject(selectedCell.workspace)
+        setProject(selectedCell.project)
       } else if (selectedCell?.type === "quickAction") {
         const workspace = projects[newRow]
         const command = selectedCell.action.command

package/src/hooks/useWorkspaceDiscovery.ts

@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react"
 
-import { discoverWorkspaces } from "../services/discovery/workspace-discovery.js"
-import type { Project } from "../types/project.js"
+import { workspaceDiscovery } from "../services/discovery/workspace-discovery.js"
+import type { Workspace } from "../types/workspace.js"
 import { logger } from "../utils/logging/logger.js"
 
 interface UseWorkspaceDiscoveryOptions {
@@ -10,12 +10,15 @@ interface UseWorkspaceDiscoveryOptions {
 
 export function useWorkspaceDiscovery(
   rootPath: string,
-  options?: UseWorkspaceDiscoveryOptions,
-) {
+  _options?: UseWorkspaceDiscoveryOptions,
+): {
+  loading: boolean
+  workspace: Workspace | null
+  error: Error | null
+} {
   const [loading, setLoading] = useState(true)
-  const [projects, setProjects] = useState<Project[]>([])
+  const [workspace, setWorkspace] = useState<Workspace | null>(null)
   const [error, setError] = useState<Error | null>(null)
-  const refreshIntervalMs = options?.refreshIntervalMs ?? 0
 
   useEffect(() => {
     let cancelled = false
@@ -30,11 +33,13 @@ export function useWorkspaceDiscovery(
       setLoading(true)
       setError(null)
       try {
-        const result = await discoverWorkspaces(rootPath)
+        const workspace = await workspaceDiscovery(rootPath)
         logger.debug(rootPath, "discovered workspaces")
         if (!cancelled) {
-          setProjects(result)
-          logger.debug(`Workspace discovery result count: ${result.length}`)
+          setWorkspace(workspace)
+          logger.debug(
+            `Workspace discovery result count: ${workspace.projects.length}`,
+          )
         }
       } catch (err) {
         if (!cancelled) setError(err as Error)
@@ -46,16 +51,10 @@ export function useWorkspaceDiscovery(
 
     load()
 
-    const intervalId =
-      refreshIntervalMs > 0 ? setInterval(load, refreshIntervalMs) : null
-
     return () => {
       cancelled = true
-      if (intervalId) {
-        clearInterval(intervalId)
-      }
     }
-  }, [rootPath, refreshIntervalMs])
+  }, [rootPath])
 
-  return { loading, projects, error }
+  return { loading, workspace, error }
 }

package/src/hooks/useWorkspaceQuickActions.ts

@@ -1,4 +1,4 @@
-import type { Project } from "../types/project.js"
+import type { Project } from "../types/workspace.js"
 import type {
   FacetQuickAction,
   WorkspaceQuickAction,

package/src/hooks/useWorkspaceRuntime.ts

@@ -3,7 +3,7 @@ import { useEffect, useState } from "react"
 import { getDockerRunStates } from "../services/runtime/docker-runtime.js"
 import { getNodeRunStates } from "../services/runtime/node-runtime.js"
 import { resolveRuntimeConflicts } from "../services/runtime/resolve-runtime.js"
-import type { Project } from "../types/project.js"
+import type { Project } from "../types/workspace.js"
 import type { WorkspaceRuntimeState } from "../types/workspace-runtime.js"
 import { logger } from "../utils/logging/logger.js"
 
@@ -39,6 +39,50 @@ function mergeTransientStatuses(
   }))
 }
 
+function areRuntimeStatesEqual(
+  left: WorkspaceRuntimeState[],
+  right: WorkspaceRuntimeState[],
+): boolean {
+  if (left.length !== right.length) {
+    return false
+  }
+
+  for (
+    let workspaceIndex = 0;
+    workspaceIndex < left.length;
+    workspaceIndex += 1
+  ) {
+    const leftWorkspace = left[workspaceIndex]
+    const rightWorkspace = right[workspaceIndex]
+
+    if (leftWorkspace.workspacePath !== rightWorkspace.workspacePath) {
+      return false
+    }
+
+    if (leftWorkspace.runStates.length !== rightWorkspace.runStates.length) {
+      return false
+    }
+
+    for (
+      let stateIndex = 0;
+      stateIndex < leftWorkspace.runStates.length;
+      stateIndex += 1
+    ) {
+      const leftState = leftWorkspace.runStates[stateIndex]
+      const rightState = rightWorkspace.runStates[stateIndex]
+
+      if (
+        leftState.id !== rightState.id ||
+        leftState.status !== rightState.status
+      ) {
+        return false
+      }
+    }
+  }
+
+  return true
+}
+
 export function useWorkspaceRuntime(projects: Project[]) {
   const [runtimeStates, setRuntimeStates] = useState<WorkspaceRuntimeState[]>(
     [],
@@ -52,11 +96,6 @@ export function useWorkspaceRuntime(projects: Project[]) {
         const scripts = project.facets.packageJson?.scripts ?? []
         const services = project.facets.compose?.services ?? []
 
-        // const [nodeStates, dockerStates] = await Promise.all([
-        //   getNodeRunStates(project.absolutePath, project.path, scripts),
-        //   getDockerRunStates(project.path, services),
-        // ])
-
         const nodeStates = await getNodeRunStates(
           project.absolutePath,
           project.path,
@@ -73,17 +112,18 @@ export function useWorkspaceRuntime(projects: Project[]) {
           runStates: [...resolvedNodeStates, ...resolvedDockerStates],
         })
       }
-      if (!cancelled) {
-        setRuntimeStates((previous) =>
-          mergeTransientStatuses(previous, results),
-        )
+      if (cancelled) {
+        return
       }
+
+      setRuntimeStates((previous) => {
+        const merged = mergeTransientStatuses(previous, results)
+        return areRuntimeStatesEqual(previous, merged) ? previous : merged
+      })
     }
     fetchStatus()
-    const interval = setInterval(fetchStatus, 5000)
     return () => {
       cancelled = true
-      clearInterval(interval)
     }
   }, [projects])
 

package/src/services/discovery/facets/compose-parser.ts

@@ -2,7 +2,7 @@ import { readFile } from "node:fs/promises"
 import { dirname, join, relative } from "node:path"
 import { parse as parseYaml } from "yaml"
 
-import type { ComposeFacet } from "../../../types/project.js"
+import type { ComposeFacet } from "../../../types/workspace.js"
 import { fileExists } from "../../../utils/fs/file.js"
 import { logger } from "../../../utils/logging/logger.js"
 

package/src/services/discovery/facets/makefile-parser.ts

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises"
 import { dirname, join, relative, resolve } from "node:path"
 
-import type { MakefileFacet } from "../../../types/project.js"
+import type { MakefileFacet } from "../../../types/workspace.js"
 import { fileExists } from "../../../utils/fs/file.js"
 import { logger } from "../../../utils/logging/logger.js"
 
@@ -74,7 +74,7 @@ export async function parseMakefile(
 }
 
 import { getConfig } from "../../../config/config.js"
-import type { MakefileCommand } from "../../../types/project.js"
+import type { MakefileCommand } from "../../../types/workspace.js"
 
 async function parseSingleMakefile(
   makefilePath: string,

package/src/services/discovery/facets/package-json-parser.ts

@@ -6,7 +6,7 @@ import type {
   PackageJsonFacet,
   PackageJsonScript,
   PackageManager,
-} from "../../../types/project.js"
+} from "../../../types/workspace.js"
 import { getPackageJson } from "../../../utils/fs/file.js"
 import { detectFramework } from "../../../utils/workspace/framework-detector.js"
 

package/src/services/discovery/workspace-discovery.ts

@@ -1,22 +1,23 @@
 import { basename } from "node:path"
 
 import { getConfig } from "../../config/config.js"
-import type { Project, ProjectType } from "../../types/project"
+import type { Project, ProjectType, Workspace } from "../../types/workspace.js"
 import { scanDirectories } from "../../utils/fs/directories.js"
 import { logger } from "../../utils/logging/logger.js"
 import { parseDockerCompose } from "./facets/compose-parser.js"
 import { parseMakefile } from "./facets/makefile-parser.js"
 import { parsePackageJson } from "./facets/package-json-parser.js"
 
-export async function discoverWorkspaces(rootPath: string): Promise<Project[]> {
+export async function workspaceDiscovery(rootPath: string): Promise<Workspace> {
   const config = getConfig()
   const directories = await scanDirectories(rootPath, {
     maxDepth: 4,
     ignore: config.discovery?.ignore || [],
   })
+
   logger.debug(directories, "Scanned Directories")
 
-  const workspaces: Project[] = []
+  const projects: Project[] = []
   for (const dir of directories) {
     const packageFacet = await parsePackageJson(dir)
 
@@ -24,12 +25,16 @@ export async function discoverWorkspaces(rootPath: string): Promise<Project[]> {
 
     const makefileFacet = await parseMakefile(dir)
 
+    // packageFacet?.name || composeFacet?.name || makefileFacet?.name || ""
+    const name = packageFacet?.name || basename(dir)
+
     if (packageFacet || composeFacet || makefileFacet) {
       const relPath = dir.startsWith(rootPath)
         ? dir.slice(rootPath.length).replace(/^\/+/, "")
         : dir
       const type = await determineProjectType(relPath)
-      const workspace: Project = {
+      const project: Project = {
+        name,
         type,
         folder: basename(dir),
         path: relPath || ".",
@@ -40,16 +45,21 @@ export async function discoverWorkspaces(rootPath: string): Promise<Project[]> {
           makefile: makefileFacet || undefined,
         },
       }
-      workspaces.push(workspace)
+      projects.push(project)
     }
   }
 
-  const orderedWorkspaces = orderWorkspaces(
-    workspaces,
-    config.discovery?.order || [],
-  )
+  const orderedProjects = orderProjects(projects, config.discovery?.order || [])
+  const rootPackageName = projects.find((project) => project.path === ".")
+    ?.facets.packageJson?.name
+
+  const workspace: Workspace = {
+    name: rootPackageName || basename(rootPath),
+    absolutePath: rootPath,
+    projects: orderedProjects,
+  }
 
-  return orderedWorkspaces
+  return workspace
 }
 
 /**
@@ -91,7 +101,7 @@ async function determineProjectType(dir: string): Promise<ProjectType> {
   return "app"
 }
 
-export function orderWorkspaces(
+export function orderProjects(
   workspaces: Project[],
   order: string[],
 ): Project[] {

package/src/services/runtime/docker-runtime.ts

@@ -1,7 +1,7 @@
 import { execFile } from "node:child_process"
 import { promisify } from "node:util"
 
-import type { ComposeService } from "../../types/project"
+import type { ComposeService } from "../../types/workspace.js"
 import type { RunState, RuntimeStatus } from "../../types/workspace-runtime"
 import { logger } from "../../utils/logging/logger.js"
 import { isPortInUse } from "../../utils/runtime/port.js"

package/src/services/runtime/node-runtime.ts

@@ -1,8 +1,8 @@
 import { execFile } from "node:child_process"
 import { promisify } from "node:util"
 
-import type { PackageJsonScript } from "../../types/project"
-import type { RunState } from "../../types/workspace-runtime"
+import type { PackageJsonScript } from "../../types/workspace.js"
+import type { RunState } from "../../types/workspace-runtime.js"
 
 const execFileAsync = promisify(execFile)
 

package/src/theme/theme.ts

@@ -22,7 +22,7 @@ const gridTheme = {
       color: "white",
     }),
     info: (): TextProps => ({
-      color: "cyan",
+      color: "white",
     }),
     workspaceName: (): TextProps => ({
       color: "white",

package/src/types/project-grid.ts

@@ -2,7 +2,7 @@ import type {
   ComposeService,
   MakefileCommand,
   PackageJsonScript,
-} from "./project.js"
+} from "./workspace.js"
 
 export type ProjectGridGrid = {
   packageJsonCells: PackageJsonCell[]

package/src/types/workspace-grid.ts

@@ -1,4 +1,4 @@
-import type { Project } from "./project.js"
+import type { Project } from "./workspace.js"
 import type { FacetQuickAction } from "./workspace-quick-actions.js"
 import type { RunState } from "./workspace-runtime.js"
 
@@ -23,7 +23,7 @@ export interface WorkspaceCell {
   type: "workspace"
   row: number
   col: number
-  workspace: Project
+  project: Project
 }
 
 export interface WorkspaceQuickActionCell {

package/src/types/{project.ts → workspace.ts}

@@ -5,9 +5,16 @@ export interface EnvFile {
   filepath: string // e.g. "/home/user/project-name/.env"
 }
 
+export interface Workspace {
+  name: string // e.g. "my-monorepo"
+  absolutePath: string // e.g. "/home/user/my-monorepo"
+  projects: Project[]
+}
+
 export interface Project {
-  path: string // e.g. "project-name/app"
-  absolutePath: string // e.g. "/home/user/project-name/"
+  name: string // e.g. "myapp"
+  path: string // e.g. "project-name/myapp"
+  absolutePath: string // e.g. "/home/user/project-name/myapp"
   type: ProjectType // e.g. "app"
   folder: string // e.g. "project-name"
   envFile?: EnvFile

package/src/utils/logging/logger.ts

@@ -16,10 +16,10 @@ export function initLogger(config: Config): Logger {
   const truncateOnStart = loggingConfig.truncateOnStart !== false
   const logDir = loggingConfig.logDir
     ? loggingConfig.logDir.replace(/^~/, homedir())
-    : join(homedir(), ".workspace-cli", "logs")
+    : join(homedir(), ".monotui", "logs")
 
   if (enableFile) {
-    const logFilePath = join(logDir, "workspace-cli.log")
+    const logFilePath = join(logDir, "monotui.log")
 
     // Truncate log file if configured
     if (truncateOnStart) {