fix(web): refresh projects after github oauth

Author: skulidropek

packages/api/src/services/auth-github-login-stream.ts

@@ -12,7 +12,7 @@ import { resolvePathFromCwd } from "@effect-template/lib/usecases/path-helpers"
 import { autoSyncState } from "@effect-template/lib/usecases/state-repo"
 import { ensureStateDotDockerGitRepo } from "@effect-template/lib/usecases/state-repo-github"
 import { migrateLegacyOrchLayout } from "@effect-template/lib/usecases/auth-sync"
-import { Effect, Runtime } from "effect"
+import { Effect, Logger, Runtime } from "effect"
 import * as Stream from "effect/Stream"
 import { spawn, type ChildProcess } from "node:child_process"
 
@@ -188,6 +188,20 @@ const finalizeMessage = (status: string): string =>
     ? `\nGitHub login completed.\n${githubLoginStreamSuccessMarker}\n`
     : `\n${githubLoginStreamErrorMarkerPrefix}${status}\n`
 
+const normalizeCapturedLogLines = (lines: ReadonlyArray<string>): ReadonlyArray<string> =>
+  lines
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+
+export const renderGithubPostLoginOutput = (
+  lines: ReadonlyArray<string>,
+  status: string
+): string => {
+  const output = normalizeCapturedLogLines(lines).join("\n")
+  const logBlock = output.length === 0 ? "" : `\n${output}\n`
+  return `${logBlock}${finalizeMessage(status)}`
+}
+
 const toStreamError = (error: unknown): ApiInternalError | ApiBadRequestError =>
   error instanceof ApiBadRequestError || error instanceof ApiInternalError
     ? error
@@ -252,17 +266,25 @@ export const streamGithubAuthLogin = (
             return
           }
 
+          const postLoginLogs: Array<string> = []
+          const logger = Logger.make(({ message }) => {
+            postLoginLogs.push(String(message))
+          })
+
           void runPromiseExit(
             finalizeGithubLogin(prepared).pipe(
+              Effect.provide(Logger.replace(Logger.defaultLogger, logger)),
               Effect.matchEffect({
                 onFailure: (error) =>
                   Effect.sync(() => {
-                    enqueue(`\nGitHub login finished in browser, but post-login sync failed: ${error.message}\n`)
-                    enqueue(finalizeMessage("post-login"))
+                    enqueue(renderGithubPostLoginOutput([
+                      ...postLoginLogs,
+                      `GitHub login finished in browser, but post-login sync failed: ${error.message}`
+                    ], "post-login"))
                   }),
                 onSuccess: () =>
                   Effect.sync(() => {
-                    enqueue(finalizeMessage("ok"))
+                    enqueue(renderGithubPostLoginOutput(postLoginLogs, "ok"))
                   })
               })
             )

packages/api/tests/auth-github-login-stream.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it } from "vitest"
+
+import { renderGithubPostLoginOutput } from "../src/services/auth-github-login-stream.js"
+
+describe("GitHub auth login stream", () => {
+  it("renders post-login state logs before the success marker", () => {
+    const output = renderGithubPostLoginOutput([
+      "Initializing state repository: https://github.com/octocat/.docker-git.git",
+      "State dir ready: /home/dev/.docker-git"
+    ], "ok")
+
+    expect(output).toContain("Initializing state repository")
+    expect(output).toContain("State dir ready")
+    expect(output).toContain("GitHub login completed.")
+    expect(output).toContain("__DOCKER_GIT_GITHUB_LOGIN_STATUS__:ok")
+    expect(output.indexOf("State dir ready")).toBeLessThan(output.indexOf("GitHub login completed."))
+  })
+
+  it("renders post-login failure details before the failure marker", () => {
+    const output = renderGithubPostLoginOutput([
+      "GitHub login finished in browser, but post-login sync failed: git fetch failed"
+    ], "post-login")
+
+    expect(output).toContain("post-login sync failed")
+    expect(output).toContain("__DOCKER_GIT_GITHUB_LOGIN_STATUS__:error:post-login")
+    expect(output.indexOf("post-login sync failed")).toBeLessThan(output.indexOf("__DOCKER_GIT_GITHUB_LOGIN_STATUS__"))
+  })
+})

packages/app/src/web/actions-github-oauth.ts

@@ -50,6 +50,7 @@ export const runGithubOauthMutation = (
         message: `Saved GitHub token (${label}).`,
         snapshot
       })
+      context.reloadDashboard()
     }
   })
 }

packages/app/tests/docker-git/actions-github-oauth.test.ts

@@ -0,0 +1,114 @@
+import { describe, expect, it } from "@effect/vitest"
+import { Effect } from "effect"
+import { vi } from "vitest"
+
+import { githubLoginStreamMarkers } from "../../src/shared/auth-stream-markers.js"
+import { runGithubOauthMutation } from "../../src/web/actions-github-oauth.js"
+import type { BrowserActionContext } from "../../src/web/actions-shared.js"
+import type { AuthSnapshot, GithubAuthStatus } from "../../src/web/api.js"
+
+const loginGithubStreamMock = vi.hoisted(() => vi.fn())
+const loadAuthSnapshotMock = vi.hoisted(() => vi.fn())
+const loadGithubStatusMock = vi.hoisted(() => vi.fn())
+
+vi.mock("../../src/web/api.js", () => ({
+  loadAuthSnapshot: loadAuthSnapshotMock,
+  loadGithubStatus: loadGithubStatusMock,
+  loginGithubStream: loginGithubStreamMock
+}))
+
+const githubStatus: GithubAuthStatus = {
+  summary: "GitHub tokens (1):",
+  tokens: [
+    {
+      key: "GITHUB_TOKEN",
+      label: "default",
+      login: "octocat",
+      status: "valid"
+    }
+  ]
+}
+
+const authSnapshot: AuthSnapshot = {
+  claudeAuthEntries: 0,
+  claudeAuthPath: "/home/dev/.docker-git/.orch/auth/claude",
+  geminiAuthEntries: 0,
+  geminiAuthPath: "/home/dev/.docker-git/.orch/auth/gemini",
+  gitTokenEntries: 0,
+  gitUserEntries: 0,
+  githubTokenEntries: 1,
+  globalEnvPath: "/home/dev/.docker-git/.orch/env/global.env",
+  totalEntries: 1
+}
+
+const makeContext = () => {
+  let output = ""
+  const setOutput: BrowserActionContext["setOutput"] = (next) => {
+    output = typeof next === "function" ? next(output) : next
+  }
+  const setMessage: BrowserActionContext["setMessage"] = vi.fn()
+  const reloadDashboard = vi.fn()
+
+  return {
+    context: {
+      githubStatus: null,
+      reloadDashboard,
+      selectedProjectId: null,
+      selectedProjectName: null,
+      setActionPrompt: vi.fn(),
+      setAuthSnapshot: vi.fn(),
+      setBusyLabel: vi.fn(),
+      setGithubStatus: vi.fn(),
+      setMessage,
+      setOutput,
+      setProjectAuthSnapshot: vi.fn(),
+      setSelectedMenuIndex: vi.fn(),
+      setSelectedProject: vi.fn(),
+      setSelectedProjectId: vi.fn(),
+      setTerminalSession: vi.fn()
+    } satisfies BrowserActionContext,
+    output: () => output,
+    reloadDashboard,
+    setMessage
+  }
+}
+
+describe("web GitHub OAuth action", () => {
+  it.effect("refreshes dashboard projects after successful OAuth", () =>
+    Effect.gen(function*(_) {
+      loginGithubStreamMock.mockImplementation((_label: string | null, onChunk: (chunk: string) => void) =>
+        Effect.sync(() => {
+          onChunk("Copy your one-time code: ABCD-1234\n")
+          onChunk("State dir ready: /home/dev/.docker-git\n")
+          onChunk(`${githubLoginStreamMarkers.success}\n`)
+          return [
+            "Copy your one-time code: ABCD-1234",
+            "State dir ready: /home/dev/.docker-git",
+            githubLoginStreamMarkers.success
+          ].join("\n")
+        })
+      )
+      loadAuthSnapshotMock.mockImplementation(() => Effect.succeed(authSnapshot))
+      loadGithubStatusMock.mockImplementation(() => Effect.succeed(githubStatus))
+
+      const { context, output, reloadDashboard, setMessage } = makeContext()
+
+      runGithubOauthMutation({ label: "" }, context)
+
+      yield* _(
+        Effect.tryPromise({
+          catch: (error) => error,
+          try: () =>
+            vi.waitFor(() => {
+              expect(reloadDashboard).toHaveBeenCalledTimes(1)
+            })
+        })
+      )
+
+      expect(output()).toBe("Copy your one-time code: ABCD-1234\nState dir ready: /home/dev/.docker-git\n")
+      expect(context.setActionPrompt).toHaveBeenCalledWith(null)
+      expect(context.setAuthSnapshot).toHaveBeenCalledWith(authSnapshot)
+      expect(context.setGithubStatus).toHaveBeenCalledWith(githubStatus)
+      expect(setMessage).toHaveBeenLastCalledWith("Saved GitHub token (default).")
+    }))
+})