fix(ci): sync controller env and app dedupe

Author: skulidropek

packages/app/src/docker-git/api-auth-menu-client.ts

@@ -0,0 +1,39 @@
+import { Effect } from "effect"
+
+import type { AuthMenuRequestBody, ProjectAuthMenuRequestBody } from "../shared/auth-menu-request.js"
+import { decodeAuthSnapshot, decodeProjectAuthSnapshot } from "./api-auth-codec.js"
+import { request } from "./api-http.js"
+
+const projectPath = (projectId: string, suffix = ""): string => `/projects/${encodeURIComponent(projectId)}${suffix}`
+
+export const loadAuthSnapshot = () =>
+  request("GET", "/auth/menu").pipe(
+    Effect.map((payload) => decodeAuthSnapshot(payload))
+  )
+
+export const runAuthMenuFlow = (requestBody: AuthMenuRequestBody) =>
+  request("POST", "/auth/menu", {
+    flow: requestBody.flow,
+    label: requestBody.label ?? undefined,
+    token: requestBody.token ?? undefined,
+    user: requestBody.user ?? undefined,
+    apiKey: requestBody.apiKey ?? undefined
+  }).pipe(
+    Effect.map((payload) => decodeAuthSnapshot(payload))
+  )
+
+export const loadProjectAuthSnapshot = (projectId: string) =>
+  request("GET", projectPath(projectId, "/auth/menu")).pipe(
+    Effect.map((payload) => decodeProjectAuthSnapshot(payload))
+  )
+
+export const runProjectAuthFlow = (
+  projectId: string,
+  requestBody: ProjectAuthMenuRequestBody
+) =>
+  request("POST", projectPath(projectId, "/auth/menu"), {
+    flow: requestBody.flow,
+    label: requestBody.label ?? undefined
+  }).pipe(
+    Effect.map((payload) => decodeProjectAuthSnapshot(payload))
+  )

packages/app/src/docker-git/api-client-helpers.ts

@@ -0,0 +1,47 @@
+import * as Path from "@effect/platform/Path"
+import { Effect } from "effect"
+
+import { asObject, asString, type JsonValue } from "./api-json.js"
+import { defaultTemplateConfig } from "./frontend-lib/core/domain.js"
+import type { CreateCommand } from "./frontend-lib/core/domain.js"
+import { resolvePathFromCwd } from "./frontend-lib/usecases/path-helpers.js"
+
+export const readProjectOutput = (payload: JsonValue): string => {
+  const object = asObject(payload)
+  return asString(object?.["output"]) ?? ""
+}
+
+const normalizeRelativePath = (value: string): string =>
+  value
+    .replaceAll("\\", "/")
+    .replace(/^\.\//, "")
+    .trim()
+
+const isManagedCreatePath = (value: string): boolean => {
+  const normalized = normalizeRelativePath(value)
+  return normalized === ".docker-git" ||
+    normalized === ".orch" ||
+    normalized.startsWith(".docker-git/") ||
+    normalized.startsWith(".orch/")
+}
+
+const resolveClientCreatePath = (
+  path: Path.Path,
+  cwd: string,
+  targetPath: string
+): string =>
+  path.isAbsolute(targetPath) || isManagedCreatePath(targetPath)
+    ? targetPath
+    : resolvePathFromCwd(path, cwd, targetPath)
+
+export const resolveCreateRequestPaths = (command: CreateCommand) =>
+  Effect.gen(function*(_) {
+    const path = yield* _(Path.Path)
+    const cwd = process.cwd()
+
+    return {
+      authorizedKeysPath: command.config.authorizedKeysPath === defaultTemplateConfig.authorizedKeysPath
+        ? command.config.authorizedKeysPath
+        : resolveClientCreatePath(path, cwd, command.config.authorizedKeysPath)
+    }
+  })

packages/app/src/docker-git/api-client.ts

@@ -2,9 +2,9 @@ import * as FileSystem from "@effect/platform/FileSystem"
 import * as Path from "@effect/platform/Path"
 import { Effect } from "effect"
 
-import { decodeAuthSnapshot, decodeProjectAuthSnapshot } from "./api-auth-codec.js"
+import { readProjectOutput, resolveCreateRequestPaths } from "./api-client-helpers.js"
 import { request, requestTextStream, requestVoid } from "./api-http.js"
-import { asArray, asObject, asString, type JsonRequest, type JsonValue } from "./api-json.js"
+import { asArray, asObject, type JsonRequest } from "./api-json.js"
 import { decodeProjectDetails, decodeProjectSummary } from "./api-project-codec.js"
 import { decodeTerminalSession } from "./api-terminal-codec.js"
 import type {
@@ -66,11 +66,6 @@ const codexLoginFailureMessage = (output: string, exitCode: string | null): stri
     : `Codex login failed (${exitCode}).`
 }
 
-const readProjectOutput = (payload: JsonValue): string => {
-  const object = asObject(payload)
-  return asString(object?.["output"]) ?? ""
-}
-
 export const listProjects = () =>
   request("GET", "/projects").pipe(
     Effect.map((payload) => {
@@ -93,6 +88,7 @@ export const getProject = (projectId: string) =>
 export const createProject = (command: CreateCommand) =>
   Effect.gen(function*(_) {
     const config = command.config
+    const resolvedPaths = yield* _(resolveCreateRequestPaths(command))
     const body = {
       repoUrl: config.repoUrl,
       repoRef: config.repoRef,
@@ -102,6 +98,11 @@ export const createProject = (command: CreateCommand) =>
       containerName: config.containerName,
       serviceName: config.serviceName,
       volumeName: config.volumeName,
+      authorizedKeysPath: resolvedPaths.authorizedKeysPath,
+      envGlobalPath: config.envGlobalPath,
+      envProjectPath: config.envProjectPath,
+      codexAuthPath: config.codexAuthPath,
+      codexHome: config.codexHome,
       cpuLimit: config.cpuLimit,
       ramLimit: config.ramLimit,
       dockerNetworkMode: config.dockerNetworkMode,
@@ -166,44 +167,6 @@ export const createAuthTerminalSession = (
 
 export const deleteTerminalSessionByPath = (path: string) => requestVoid("DELETE", path)
 
-export const loadAuthSnapshot = () =>
-  request("GET", "/auth/menu").pipe(
-    Effect.map((payload) => decodeAuthSnapshot(payload))
-  )
-
-export const runAuthMenuFlow = (requestBody: {
-  readonly flow: string
-  readonly label?: string | null
-  readonly token?: string | null
-  readonly user?: string | null
-  readonly apiKey?: string | null
-}) =>
-  request("POST", "/auth/menu", {
-    flow: requestBody.flow,
-    label: requestBody.label ?? undefined,
-    token: requestBody.token ?? undefined,
-    user: requestBody.user ?? undefined,
-    apiKey: requestBody.apiKey ?? undefined
-  }).pipe(
-    Effect.map((payload) => decodeAuthSnapshot(payload))
-  )
-
-export const loadProjectAuthSnapshot = (projectId: string) =>
-  request("GET", projectPath(projectId, "/auth/menu")).pipe(
-    Effect.map((payload) => decodeProjectAuthSnapshot(payload))
-  )
-
-export const runProjectAuthFlow = (
-  projectId: string,
-  requestBody: { readonly flow: string; readonly label?: string | null }
-) =>
-  request("POST", projectPath(projectId, "/auth/menu"), {
-    flow: requestBody.flow,
-    label: requestBody.label ?? undefined
-  }).pipe(
-    Effect.map((payload) => decodeProjectAuthSnapshot(payload))
-  )
-
 export const applyAllProjects = (activeOnly: boolean) => requestVoid("POST", "/projects/apply-all", { activeOnly })
 
 export const downAllProjects = () => requestVoid("POST", "/projects/down-all")

packages/app/src/docker-git/api-terminal-codec.ts

@@ -1,16 +1,7 @@
+import type { TerminalSession } from "../shared/terminal-session-schema.js"
 import { asObject, asString, type JsonValue } from "./api-json.js"
 
-export type ApiTerminalSession = {
-  readonly id: string
-  readonly projectId: string
-  readonly sshCommand: string
-  readonly status: "ready" | "attached" | "exited" | "failed"
-  readonly createdAt: string
-  readonly startedAt?: string | undefined
-  readonly closedAt?: string | undefined
-  readonly exitCode?: number | undefined
-  readonly signal?: number | undefined
-}
+export type ApiTerminalSession = TerminalSession
 
 type RawTerminalSession = {
   readonly id: string | null

packages/app/src/docker-git/cli/parser-auth.ts

@@ -1,5 +1,6 @@
 import { Either, Match } from "effect"
 
+import { normalizeOptionalText } from "../../shared/optional-text.js"
 import type { RawOptions } from "../frontend-lib/core/command-options.js"
 import { type AuthCommand, type Command, type ParseError } from "../frontend-lib/core/domain.js"
 
@@ -27,11 +28,6 @@ const invalidArgument = (name: string, reason: string): ParseError => ({
   reason
 })
 
-const normalizeLabel = (value: string | undefined): string | null => {
-  const trimmed = value?.trim() ?? ""
-  return trimmed.length === 0 ? null : trimmed
-}
-
 const defaultEnvGlobalPath = ".docker-git/.orch/env/global.env"
 const defaultCodexAuthPath = ".docker-git/.orch/auth/codex"
 const defaultClaudeAuthPath = ".docker-git/.orch/auth/claude"
@@ -42,9 +38,9 @@ const resolveAuthOptions = (raw: RawOptions): AuthOptions => ({
   codexAuthPath: raw.codexAuthPath ?? defaultCodexAuthPath,
   claudeAuthPath: defaultClaudeAuthPath,
   geminiAuthPath: defaultGeminiAuthPath,
-  label: normalizeLabel(raw.label),
-  token: normalizeLabel(raw.token),
-  scopes: normalizeLabel(raw.scopes),
+  label: normalizeOptionalText(raw.label),
+  token: normalizeOptionalText(raw.token),
+  scopes: normalizeOptionalText(raw.scopes),
   authWeb: raw.authWeb === true
 })
 

packages/app/src/docker-git/controller-docker.ts

@@ -57,6 +57,11 @@ const mapComposePathError = (error: PlatformError): ControllerBootstrapError =>
 const mapControllerRevisionError = (error: PlatformError): ControllerBootstrapError =>
   controllerBootstrapError(`Failed to compute docker-git controller revision.\nDetails: ${String(error)}`)
 
+const currentProcessEnv = (): Readonly<Record<string, string>> =>
+  Object.fromEntries(
+    Object.entries(process.env).filter((entry): entry is [string, string] => entry[1] !== undefined)
+  )
+
 const renderDockerAccessDeniedMessage = (): string =>
   [
     "docker-git host CLI cannot access Docker from the client process.",
@@ -166,7 +171,18 @@ export const runCompose = (
       composePath,
       ...args
     ])
-    const exitCode = yield* _(runExitCode(invocation.command, invocation.args))
+    const exitCode = yield* _(
+      runCommandExitCode({
+        cwd: process.cwd(),
+        command: invocation.command,
+        args: invocation.args,
+        env: currentProcessEnv()
+      }).pipe(
+        Effect.mapError((error) =>
+          controllerBootstrapError(`Failed to start docker-git controller.\nDetails: ${String(error)}`)
+        )
+      )
+    )
 
     if (exitCode === 0) {
       return

packages/app/src/docker-git/host-ssh.ts

@@ -1,5 +1,6 @@
 import { Effect } from "effect"
 
+import { shouldAutoOpenSsh } from "../shared/auto-open-ssh.js"
 import { createProjectTerminalSession } from "./api-client.js"
 import type { ApiProjectDetails } from "./api-project-codec.js"
 import { projectItemFromApiDetails } from "./project-item.js"
@@ -16,30 +17,6 @@ const renderKnownError = (error: RenderableError): string => error.message
 
 const shouldOpenSsh = (command: AutoOpenSshCommand): boolean => command.openSsh
 
-const isInteractiveTty = (): boolean => process.stdin.isTTY && process.stdout.isTTY
-
-const shouldAutoOpenSsh = ({
-  runUp,
-  shouldOpen
-}: {
-  readonly shouldOpen: boolean
-  readonly runUp: boolean
-}): Effect.Effect<boolean> =>
-  Effect.gen(function*(_) {
-    if (!shouldOpen) {
-      return false
-    }
-    if (!runUp) {
-      yield* _(Effect.logWarning("Skipping SSH auto-open: docker compose up disabled (--no-up)."))
-      return false
-    }
-    if (!isInteractiveTty()) {
-      yield* _(Effect.logWarning("Skipping SSH auto-open: not running in an interactive TTY."))
-      return false
-    }
-    return true
-  })
-
 export const autoOpenProjectSsh = (
   command: AutoOpenSshCommand,
   project: ApiProjectDetails | null

packages/app/src/docker-git/menu-auth-data.ts

@@ -1,6 +1,7 @@
 import { Effect } from "effect"
 
-import { loadAuthSnapshot, runAuthMenuFlow as submitAuthMenuFlow } from "./api-client.js"
+import { normalizeOptionalText } from "../shared/optional-text.js"
+import { loadAuthSnapshot, runAuthMenuFlow as submitAuthMenuFlow } from "./api-auth-menu-client.js"
 import type { AuthEnvFlow } from "./menu-auth-shared.js"
 import type { MenuError } from "./menu-errors.js"
 import type { AuthSnapshot, MenuEnv } from "./menu-types.js"
@@ -15,11 +16,6 @@ export {
 } from "./menu-auth-shared.js"
 export type { AuthEnvFlow, AuthMenuAction, AuthPromptStep } from "./menu-auth-shared.js"
 
-const defaultValue = (value: string | undefined): string | null => {
-  const trimmed = value?.trim() ?? ""
-  return trimmed.length === 0 ? null : trimmed
-}
-
 const decodeSnapshot = (snapshot: AuthSnapshot | null): Effect.Effect<AuthSnapshot, MenuError, MenuEnv> =>
   snapshot === null
     ? Effect.fail({
@@ -42,10 +38,10 @@ export const writeAuthFlow = (
 ): Effect.Effect<void, MenuError, MenuEnv> =>
   submitAuthMenuFlow({
     flow,
-    label: defaultValue(values["label"]),
-    token: defaultValue(values["token"]),
-    user: defaultValue(values["user"]),
-    apiKey: defaultValue(values["apiKey"])
+    label: normalizeOptionalText(values["label"]),
+    token: normalizeOptionalText(values["token"]),
+    user: normalizeOptionalText(values["user"]),
+    apiKey: normalizeOptionalText(values["apiKey"])
   }).pipe(
     Effect.flatMap((snapshot) => decodeSnapshot(snapshot)),
     Effect.asVoid

packages/app/src/docker-git/menu-project-auth-data.ts

@@ -1,6 +1,7 @@
 import { Effect } from "effect"
 
-import { loadProjectAuthSnapshot, runProjectAuthFlow as submitProjectAuthFlow } from "./api-client.js"
+import { normalizeOptionalText } from "../shared/optional-text.js"
+import { loadProjectAuthSnapshot, runProjectAuthFlow as submitProjectAuthFlow } from "./api-auth-menu-client.js"
 import type { MenuError } from "./menu-errors.js"
 import type { MenuEnv, ProjectAuthFlow, ProjectAuthSnapshot } from "./menu-types.js"
 import type { ProjectItem } from "./project-item.js"
@@ -14,11 +15,6 @@ export {
 } from "./menu-project-auth-shared.js"
 export type { ProjectAuthMenuAction, ProjectAuthPromptStep } from "./menu-project-auth-shared.js"
 
-const defaultValue = (value: string | undefined): string | null => {
-  const trimmed = value?.trim() ?? ""
-  return trimmed.length === 0 ? null : trimmed
-}
-
 const decodeSnapshot = (
   projectId: string,
   snapshot: ProjectAuthSnapshot | null
@@ -46,7 +42,7 @@ export const writeProjectAuthFlow = (
 ): Effect.Effect<void, MenuError, MenuEnv> =>
   submitProjectAuthFlow(project.projectDir, {
     flow,
-    label: defaultValue(values["label"])
+    label: normalizeOptionalText(values["label"])
   }).pipe(
     Effect.flatMap((snapshot) => decodeSnapshot(project.projectDir, snapshot)),
     Effect.asVoid