fix: return created project from realtime events

Author: { "message": "Bad credentials", "documentation_url": "https://docs.github.com/rest", "status": "401"}

packages/api/src/services/projects.ts

@@ -175,15 +175,35 @@ const toProjectDetails = (
   codexHome: project.codexHome
 })
 
+const projectIdAliases = (
+  path: Path.Path,
+  projectId: string
+): ReadonlySet<string> => {
+  const projectsRoot = path.resolve(defaultProjectsRoot(process.cwd()))
+  const normalized = projectId
+    .replaceAll("\\", "/")
+    .replace(/^\.\//u, "")
+  const rooted = normalized === ".docker-git"
+    ? projectsRoot
+    : normalized.startsWith(".docker-git/")
+      ? path.join(projectsRoot, normalized.slice(".docker-git/".length))
+      : projectId
+  const absolute = path.isAbsolute(rooted) ? path.resolve(rooted) : path.resolve(process.cwd(), rooted)
+  return new Set([projectId, rooted, absolute])
+}
+
 const findProjectById = (projectId: string) =>
-  listProjectItems.pipe(
-    Effect.flatMap((projects) => {
-      const project = projects.find((item) => item.projectDir === projectId)
+  Effect.gen(function*(_) {
+    const path = yield* _(Path.Path)
+    const aliases = projectIdAliases(path, projectId)
+    const projects = yield* _(listProjectItems)
+    const project = projects.find((item) => item.projectDir === projectId)
+      ?? projects.find((item) => aliases.has(item.projectDir) || aliases.has(path.resolve(item.projectDir)))
+    if (project) {
       return project
-        ? Effect.succeed(project)
-        : Effect.fail(new ApiNotFoundError({ message: `Project not found: ${projectId}` }))
-    })
-  )
+    }
+    return yield* _(Effect.fail(new ApiNotFoundError({ message: `Project not found: ${projectId}` })))
+  })
 
 export const getProjectItemById = (projectId: string) => findProjectById(projectId)
 
@@ -401,12 +421,14 @@ const emitCreateStatus = (
 
 const emitProjectCreatedEvents = (
   projectId: string,
-  project: ProjectItem
+  project: ProjectItem,
+  details: ProjectDetails
 ) =>
   Effect.sync(() => {
     const payload = {
       projectId: project.projectDir,
-      containerName: project.containerName
+      containerName: project.containerName,
+      project: details
     }
     emitProjectEvent(project.projectDir, "project.created", payload)
     if (project.projectDir !== projectId) {
@@ -449,10 +471,11 @@ const runPreparedCreateProject = (
     )
     const runtimeByProject = yield* _(loadProjectRuntimeByProject([project]))
     const summary = yield* _(withProjectRuntime(project, runtimeForProject(runtimeByProject, project)))
+    const details = toProjectDetails(project, summary)
 
-    yield* _(emitProjectCreatedEvents(projectId, project))
+    yield* _(emitProjectCreatedEvents(projectId, project, details))
 
-    return toProjectDetails(project, summary)
+    return details
   }).pipe(Effect.mapError(toProjectApiError))
 
 const startCreateProjectJob = (

packages/api/tests/projects.test.ts

@@ -245,6 +245,12 @@ describe("projects service", () => {
                   phase: "create",
                   message: "Project creation started"
                 })
+                expect(events.find((event) => event.type === "project.created")?.payload).toMatchObject({
+                  projectId,
+                  project: {
+                    projectDir: projectId
+                  }
+                })
               })
             )
           )

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

@@ -3,6 +3,7 @@ import * as Fiber from "effect/Fiber"
 
 import { request } from "./api-http.js"
 import { asArray, asObject, asString, type JsonValue } from "./api-json.js"
+import { type ApiProjectDetails, decodeProjectDetails } from "./api-project-codec.js"
 import type { ControllerRuntime } from "./controller.js"
 import type { ApiAuthRequiredError, ApiRequestError } from "./host-errors.js"
 import { formatProjectEventLine } from "./project-event-lines.js"
@@ -23,6 +24,11 @@ type ProjectEventPollResponse = {
 
 type ProjectCreationWaitError = ApiAuthRequiredError | ApiRequestError
 
+export type ProjectCreationResult = {
+  readonly projectId: string
+  readonly project: ApiProjectDetails | null
+}
+
 export type ProjectEventPolling = {
   readonly cursorRef: Ref.Ref<number>
   readonly fiber: Fiber.RuntimeFiber<number>
@@ -88,13 +94,19 @@ const readProjectEventPayloadField = (
   return object === null ? null : asString(object[key])
 }
 
-const readCreatedProjectId = (
+const readCreatedProject = (
   event: ProjectEvent,
   fallbackProjectId: string
-): string | null =>
-  event.type === "project.created"
-    ? (readProjectEventPayloadField(event, "projectId") ?? fallbackProjectId)
-    : null
+): ProjectCreationResult | null => {
+  if (event.type !== "project.created") {
+    return null
+  }
+
+  const payload = asObject(event.payload)
+  const projectId = readProjectEventPayloadField(event, "projectId") ?? fallbackProjectId
+  const project = payload === null ? null : decodeProjectDetails(payload["project"] ?? null)
+  return { projectId, project }
+}
 
 const readFailedMessage = (event: ProjectEvent): string | null =>
   event.type === "project.deployment.status" && readProjectEventPayloadField(event, "phase") === "failed"
@@ -137,14 +149,14 @@ const pollProjectEventsOnce = (
     return response
   })
 
-const findCreatedProjectId = (
+const findCreatedProject = (
   projectId: string,
   events: ReadonlyArray<ProjectEvent>
-): string | null => {
+): ProjectCreationResult | null => {
   for (const event of events) {
-    const createdProjectId = readCreatedProjectId(event, projectId)
-    if (createdProjectId !== null) {
-      return createdProjectId
+    const created = readCreatedProject(event, projectId)
+    if (created !== null) {
+      return created
     }
   }
   return null
@@ -165,17 +177,17 @@ const findFailureMessage = (
 const waitForProjectCreationLoop = (
   projectId: string,
   cursorRef: Ref.Ref<number>
-): Effect.Effect<string, ProjectCreationWaitError, ControllerRuntime> =>
+): Effect.Effect<ProjectCreationResult, ProjectCreationWaitError, ControllerRuntime> =>
   Effect.gen(function*(_) {
     const response = yield* _(pollProjectEventsOnce(projectId, cursorRef))
     const failureMessage = findFailureMessage(response.events)
     if (failureMessage !== null) {
       return yield* _(Effect.fail(toProjectCreationError(projectId, failureMessage)))
     }
 
-    const createdProjectId = findCreatedProjectId(projectId, response.events)
-    if (createdProjectId !== null) {
-      return createdProjectId
+    const created = findCreatedProject(projectId, response.events)
+    if (created !== null) {
+      return created
     }
 
     yield* _(Effect.sleep(projectEventPollInterval))

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

@@ -72,8 +72,11 @@ const createProjectAsync = (
       return yield* _(Effect.fail(invalidCreateAcceptedResponse()))
     }
 
-    const createdProjectId = yield* _(waitForProjectCreation(accepted.projectId, accepted.cursor))
-    return yield* _(getProject(createdProjectId))
+    const created = yield* _(waitForProjectCreation(accepted.projectId, accepted.cursor))
+    if (created.project !== null) {
+      return created.project
+    }
+    return yield* _(getProject(created.projectId))
   })
 
 export const listProjects = () =>

packages/app/src/web/actions-project-create.ts

@@ -1,7 +1,11 @@
+import * as ParseResult from "@effect/schema/ParseResult"
+import { Either } from "effect"
+
 import { createProjectDraftFromInputs } from "../docker-git/menu-create-shared.js"
 import type { CreateInputs } from "../docker-git/menu-types.js"
 import { appendOutputLine, appendOutputLineHandler, notifyProjectEventRateLimit } from "./actions-output.js"
 import { type BrowserActionContext, withBusy } from "./actions-shared.js"
+import { ProjectDetailsSchema } from "./api-schema.js"
 import { type ApiEvent, loadProjectDetails, type ProjectDetails, startCreateProject } from "./api.js"
 import { openProjectEventStream } from "./project-events.js"
 import { outputScreen, projectPickerScreen } from "./screen.js"
@@ -21,6 +25,21 @@ const readEventPayloadString = (
 const readCreatedProjectId = (event: ApiEvent): string | null =>
   event.type === "project.created" ? readEventPayloadString(event, "projectId") : null
 
+const readCreatedProject = (event: ApiEvent): ProjectDetails | null => {
+  if (event.type !== "project.created") {
+    return null
+  }
+  const payload = event.payload
+  if (payload === null || typeof payload !== "object" || Array.isArray(payload)) {
+    return null
+  }
+  const project = Object.entries(payload).find(([name]) => name === "project")?.[1]
+  return Either.match(ParseResult.decodeUnknownEither(ProjectDetailsSchema)(project), {
+    onLeft: () => null,
+    onRight: (value) => value
+  })
+}
+
 const readCreateFailureMessage = (event: ApiEvent): string | null =>
   event.type === "project.deployment.status" && readEventPayloadString(event, "phase") === "failed"
     ? (readEventPayloadString(event, "message") ?? "Project creation failed.")
@@ -41,9 +60,14 @@ const applyCreatedProject = (
 
 const finishCreateFromEvent = (
   context: BrowserActionContext,
-  projectId: string
+  projectId: string,
+  project: ProjectDetails | null
 ) => {
   appendOutputLine(context, "[create] Project created")
+  if (project !== null) {
+    applyCreatedProject(context, project)
+    return
+  }
   withBusy({
     context,
     effect: loadProjectDetails(projectId),
@@ -89,7 +113,7 @@ export const submitCreateInputs = (
           const projectId = readCreatedProjectId(event)
           if (projectId !== null) {
             stream?.close()
-            finishCreateFromEvent(context, projectId)
+            finishCreateFromEvent(context, projectId, readCreatedProject(event))
           }
         },
         onLine: appendOutputLineHandler(context),