fix(ci): inline API create SSH key seeding

Author: skulidropek

packages/api/src/services/projects.ts

@@ -1,6 +1,7 @@
 import {
   type AppError,
   buildCreateCommand,
+  defaultTemplateConfig,
   createProject,
   formatParseError,
   applyAllDockerGitProjects,
@@ -17,6 +18,7 @@ import { CommandFailedError } from "@effect-template/lib/shell/errors"
 import { defaultProjectsRoot, resolvePathFromCwd } from "@effect-template/lib/usecases/path-helpers"
 import { deleteDockerGitProject } from "@effect-template/lib/usecases/projects"
 import type { RawOptions } from "@effect-template/lib/core/command-options"
+import type { CreateCommand as LibCreateCommand } from "@effect-template/lib/core/domain"
 import type { ProjectItem } from "@effect-template/lib/usecases/projects"
 import { Effect, Either } from "effect"
 
@@ -217,6 +219,20 @@ const mergeAuthorizedKeys = (
   return merged.length === 0 ? "" : `${merged.join("\n")}\n`
 }
 
+const withManagedAuthorizedKeysForCreate = (
+  command: LibCreateCommand,
+  authorizedKeysContents: string | undefined
+) =>
+  authorizedKeysContents === undefined
+    ? command
+    : {
+      ...command,
+      config: {
+        ...command.config,
+        authorizedKeysPath: defaultTemplateConfig.authorizedKeysPath
+      }
+    }
+
 export const seedAuthorizedKeysForCreate = (
   outDir: string,
   authorizedKeysContents: string | undefined
@@ -336,18 +352,20 @@ export const createProjectFromRequest = (
       )
     }
 
-    const command = {
+    const parsedCommand = {
       ...parsed.right,
       openSsh: false,
       waitForClone: request.waitForClone ?? parsed.right.waitForClone
     }
 
     const resolvedAuthorizedKeysContents = request.authorizedKeysContents ?? (
       request.useManagedAuthorizedKeys === true
-        ? yield* _(resolveCreateAuthorizedKeysContents(command.outDir, command.config.authorizedKeysPath))
+        ? yield* _(resolveCreateAuthorizedKeysContents(parsedCommand.outDir, parsedCommand.config.authorizedKeysPath))
         : undefined
     )
 
+    const command = withManagedAuthorizedKeysForCreate(parsedCommand, resolvedAuthorizedKeysContents)
+
     yield* _(seedAuthorizedKeysForCreate(command.outDir, resolvedAuthorizedKeysContents))
 
     yield* _(ensureGithubAuthForCreate(command.config))

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

@@ -1,38 +1,14 @@
-import { Effect } from "effect"
-
-import { request } from "./api-http.js"
-import { asObject, type JsonRequest, type JsonValue } from "./api-json.js"
-import { decodeProjectDetails } from "./api-project-codec.js"
-import type { CreateCommand } from "./frontend-lib/core/domain.js"
+import type { JsonRequest } from "./api-json.js"
+import { type CreateCommand, defaultTemplateConfig } from "./frontend-lib/core/domain.js"
 
 type ResolvedCreateRequestPaths = {
   readonly authorizedKeysPath: string
   readonly authorizedKeysContents?: string | undefined
 }
 
-const projectPath = (projectId: string, suffix = ""): string => `/projects/${encodeURIComponent(projectId)}${suffix}`
-
-export const decodeProjectResponse = (payload: JsonValue) => {
-  const object = asObject(payload)
-  return object === null
-    ? decodeProjectDetails(payload)
-    : decodeProjectDetails(object["project"] ?? payload)
-}
-
-export const createProjectRequestNeedsFollowUpUp = (
-  command: CreateCommand,
-  resolvedPaths: ResolvedCreateRequestPaths
-): boolean => command.runUp && resolvedPaths.authorizedKeysContents !== undefined
-
-export const createProjectRequestAllowsImmediateUp = (
-  command: CreateCommand,
-  resolvedPaths: ResolvedCreateRequestPaths
-): boolean => command.runUp && resolvedPaths.authorizedKeysContents === undefined
-
 export const buildCreateProjectRequest = (
   command: CreateCommand,
-  resolvedPaths: ResolvedCreateRequestPaths,
-  shouldRunUpInCreateRequest: boolean
+  resolvedPaths: ResolvedCreateRequestPaths
 ) => {
   const config = command.config
   return {
@@ -44,7 +20,9 @@ export const buildCreateProjectRequest = (
     containerName: config.containerName,
     serviceName: config.serviceName,
     volumeName: config.volumeName,
-    authorizedKeysPath: resolvedPaths.authorizedKeysPath,
+    authorizedKeysPath: resolvedPaths.authorizedKeysContents === undefined
+      ? resolvedPaths.authorizedKeysPath
+      : defaultTemplateConfig.authorizedKeysPath,
     authorizedKeysContents: resolvedPaths.authorizedKeysContents,
     envGlobalPath: config.envGlobalPath,
     envProjectPath: config.envProjectPath,
@@ -62,21 +40,10 @@ export const buildCreateProjectRequest = (
     codexTokenLabel: config.codexAuthLabel,
     claudeTokenLabel: config.claudeAuthLabel,
     agentAutoMode: config.agentAuto ? (config.agentMode ?? "auto") : undefined,
-    up: shouldRunUpInCreateRequest,
+    up: command.runUp,
     openSsh: false,
     force: command.force,
     forceEnv: command.forceEnv,
     waitForClone: command.waitForClone
   } satisfies JsonRequest
 }
-
-export const upCreatedProjectWithAuthorizedKeys = (
-  projectId: string,
-  authorizedKeysContents: string
-) =>
-  request("POST", projectPath(projectId, "/up"), {
-    authorizedKeysContents,
-    useManagedAuthorizedKeys: true
-  }).pipe(
-    Effect.map((payload) => decodeProjectResponse(payload))
-  )

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

@@ -2,16 +2,10 @@ import * as FsPlatform from "@effect/platform/FileSystem"
 import * as PathPlatform from "@effect/platform/Path"
 import { Effect } from "effect"
 
-import {
-  buildCreateProjectRequest,
-  createProjectRequestAllowsImmediateUp,
-  createProjectRequestNeedsFollowUpUp,
-  decodeProjectResponse,
-  upCreatedProjectWithAuthorizedKeys
-} from "./api-client-create.js"
+import { buildCreateProjectRequest } from "./api-client-create.js"
 import { readProjectOutput, resolveCreateRequestPaths } from "./api-client-helpers.js"
 import { request, requestTextStream, requestVoid } from "./api-http.js"
-import { asArray, asObject } from "./api-json.js"
+import { asArray, asObject, type JsonValue } from "./api-json.js"
 import { decodeProjectDetails, decodeProjectSummary } from "./api-project-codec.js"
 import { decodeTerminalSession } from "./api-terminal-codec.js"
 import type {
@@ -44,6 +38,13 @@ const projectPath = (projectId: string, suffix = ""): string => `/projects/${enc
 const codexLoginSuccessMarker = "__DOCKER_GIT_CODEX_LOGIN_STATUS__:ok"
 const codexLoginErrorMarkerPrefix = "__DOCKER_GIT_CODEX_LOGIN_STATUS__:error:"
 
+const decodeProjectResponse = (payload: JsonValue) => {
+  const object = asObject(payload)
+  return object === null
+    ? decodeProjectDetails(payload)
+    : decodeProjectDetails(object["project"] ?? payload)
+}
+
 const codexLoginFailureMessage = (output: string, exitCode: string | null): string => {
   if (output.includes("429 Too Many Requests")) {
     return "Codex device auth is rate-limited by OpenAI (429 Too Many Requests). Wait a few minutes and retry."
@@ -97,24 +98,9 @@ const createProjectWithResolvedPaths = (
   }
 ) =>
   Effect.gen(function*(_) {
-    const createRequest = buildCreateProjectRequest(
-      command,
-      resolvedPaths,
-      createProjectRequestAllowsImmediateUp(command, resolvedPaths)
-    )
+    const createRequest = buildCreateProjectRequest(command, resolvedPaths)
     const payload = yield* _(request("POST", "/projects", createRequest))
-    const createdProject = decodeProjectResponse(payload)
-    if (
-      createdProject === null ||
-      resolvedPaths.authorizedKeysContents === undefined ||
-      !createProjectRequestNeedsFollowUpUp(command, resolvedPaths)
-    ) {
-      return createdProject
-    }
-
-    return yield* _(
-      upCreatedProjectWithAuthorizedKeys(createdProject.id, resolvedPaths.authorizedKeysContents)
-    )
+    return decodeProjectResponse(payload)
   })
 
 export const createProject = (command: CreateCommand) =>