fix(app,lib): satisfy cold-open CI lint checks

Author: skulidropek

packages/app/src/web/actions-projects.ts

@@ -78,10 +78,7 @@ const resolveProjectTerminalKey = (
 }
 
 const createPendingTerminalSessionId = (): string => {
-  const randomUuid = globalThis.crypto?.randomUUID
-  return typeof randomUuid === "function"
-    ? randomUuid.call(globalThis.crypto)
-    : `pending-${Date.now()}-${Math.random().toString(16).slice(2)}`
+  return globalThis.crypto.randomUUID()
 }
 
 export const connectProjectById = (

packages/app/src/web/app-ready-terminal-screen.tsx

@@ -10,7 +10,7 @@ import { TerminalPanel } from "./panel-terminal.js"
 import { type BrowserScreen, projectPickerScreen } from "./screen.js"
 import { shouldShowTerminalTabs } from "./terminal-mobile-layout.js"
 import { terminalSessionId } from "./terminal-state.js"
-import { isPendingActiveTerminalSession, type ActiveTerminalSession } from "./terminal.js"
+import { type ActiveTerminalSession, isPendingActiveTerminalSession } from "./terminal.js"
 
 type TerminalWorkspaceView = "terminal" | "tasks"
 
@@ -369,8 +369,9 @@ const TerminalPane = (
   const browserProjectKey = terminalSession.browserProjectKey
   const canOpenBrowser = canOpenProjectBrowser(projectBrowser, browserProjectId)
   const pendingSession = isPendingActiveTerminalSession(terminalSession)
-  const bodyContent = taskManagerOpen && browserProjectId !== undefined
-    ? (
+  let bodyContent: JSX.Element | undefined
+  if (taskManagerOpen && browserProjectId !== undefined) {
+    bodyContent = (
       <TerminalTaskManagerBody
         onClose={onCloseTaskManager}
         onLoadProjectTaskLogs={onLoadProjectTaskLogs}
@@ -384,9 +385,9 @@ const TerminalPane = (
         selectedProjectSummary={selectedProjectSummary}
       />
     )
-    : pendingSession
-      ? <PendingTerminalBody session={terminalSession} />
-    : undefined
+  } else if (pendingSession) {
+    bodyContent = <PendingTerminalBody session={terminalSession} />
+  }
   const detachTerminalSession = (): void => {
     onTerminalClose(sessionId)
     if (singleSession) {
@@ -404,15 +405,19 @@ const TerminalPane = (
         }}
         onDetach={() => {
           detachTerminalSession()
-          onTerminalMessage(`${pendingSession ? "Closed pending" : "Detached"} SSH terminal: ${terminalSession.session.id}.`)
+          onTerminalMessage(
+            `${pendingSession ? "Closed pending" : "Detached"} SSH terminal: ${terminalSession.session.id}.`
+          )
         }}
         onKill={() => {
           if (!pendingSession) {
             requestTerminalSessionClose(terminalSession.closePath)
             terminalSession.onExit?.()
           }
           detachTerminalSession()
-          onTerminalMessage(`${pendingSession ? "Closed pending" : "Killed"} SSH terminal: ${terminalSession.session.id}.`)
+          onTerminalMessage(
+            `${pendingSession ? "Closed pending" : "Killed"} SSH terminal: ${terminalSession.session.id}.`
+          )
         }}
         onOpenBrowser={browserProjectId === undefined || !canOpenBrowser
           ? undefined

packages/app/src/web/panel-terminal.tsx

@@ -15,7 +15,7 @@ import {
   type TerminalStatus,
   useTerminalSessionLifecycle
 } from "./terminal-panel-runtime.js"
-import { isPendingActiveTerminalSession, type ActiveTerminalSession } from "./terminal.js"
+import { type ActiveTerminalSession, isPendingActiveTerminalSession } from "./terminal.js"
 
 type TerminalPanelProps = {
   readonly keyboardOpen: boolean

packages/app/src/web/terminal-panel-runtime.ts

@@ -69,14 +69,19 @@ const attachGlobalResizeListeners = (sendResize: () => void): void => {
   globalThis.visualViewport?.addEventListener("scroll", sendResize)
 }
 
-const mountTerminalSession = (
-  { connectionRef, hostRef, notifyMessage, onAttachFailure, runtimeRef, session, setStatus }: TerminalLifecycleArgs
-): (() => void) | undefined => {
+const resolveMountHost = (
+  { hostRef, session }: Pick<TerminalLifecycleArgs, "hostRef" | "session">
+): HTMLDivElement | null => {
   if (isPendingActiveTerminalSession(session)) {
-    return undefined
+    return null
   }
+  return hostRef.current
+}
 
-  const host = hostRef.current
+const mountTerminalSession = (
+  { connectionRef, hostRef, notifyMessage, onAttachFailure, runtimeRef, session, setStatus }: TerminalLifecycleArgs
+): (() => void) | undefined => {
+  const host = resolveMountHost({ hostRef, session })
   if (host === null) {
     return undefined
   }

packages/app/src/web/terminal.ts

@@ -82,6 +82,19 @@ export const buildProjectActiveTerminalSession = (
   }
 }
 
+const resolvePendingProjectMessage = (
+  message: string | undefined,
+  phase: PendingTerminalConnection["phase"]
+): string => {
+  const trimmedMessage = message?.trim() ?? ""
+  if (trimmedMessage.length > 0) {
+    return trimmedMessage
+  }
+  return phase === "error"
+    ? "SSH session startup failed."
+    : "Starting project and waiting for SSH..."
+}
+
 export const buildPendingProjectActiveTerminalSession = (
   {
     createdAt,
@@ -96,11 +109,7 @@ export const buildPendingProjectActiveTerminalSession = (
 ): ActiveTerminalSession => {
   const encodedProjectKey = encodeURIComponent(projectKey)
   const encodedSessionId = encodeURIComponent(pendingSessionId)
-  const resolvedMessage = message?.trim().length
-    ? message.trim()
-    : phase === "error"
-      ? "SSH session startup failed."
-      : "Starting project and waiting for SSH..."
+  const resolvedMessage = resolvePendingProjectMessage(message, phase)
   return {
     browserProjectId: projectId,
     browserProjectKey: projectKey,

packages/lib/src/usecases/projects-up.ts

@@ -177,7 +177,7 @@ const runProjectComposeUp = (
   }
 
   return runDockerComposeUp(projectDir, { buildMode: "reuse" }).pipe(
-    Effect.catchAll(() =>
+    Effect.catchTag("DockerCommandError", () =>
       Effect.logWarning(
         `docker compose up -d failed in ${projectDir}; falling back to docker compose up -d --build.`
       ).pipe(