@prover-coder-ai/docker-git 1.0.16 → 1.0.17

package/src/docker-git/menu-project-auth.ts

@@ -0,0 +1,271 @@
+import { Effect, Match, pipe } from "effect"
+
+import type { AppError } from "@effect-template/lib/usecases/errors"
+import type { ProjectItem } from "@effect-template/lib/usecases/projects"
+
+import { nextBufferValue } from "./menu-buffer-input.js"
+import { handleMenuNumberInput, submitPromptStep } from "./menu-input-utils.js"
+import {
+  type ProjectAuthMenuAction,
+  projectAuthMenuActionByIndex,
+  projectAuthMenuSize,
+  projectAuthViewSteps,
+  readProjectAuthSnapshot,
+  writeProjectAuthFlow
+} from "./menu-project-auth-data.js"
+import { resetToMenu } from "./menu-shared.js"
+import type {
+  MenuEnv,
+  MenuKeyInput,
+  MenuRunner,
+  MenuViewContext,
+  ProjectAuthFlow,
+  ProjectAuthSnapshot,
+  ViewState
+} from "./menu-types.js"
+
+type ProjectAuthContext = Pick<MenuViewContext, "setView" | "setMessage" | "setActiveDir"> & {
+  readonly runner: MenuRunner
+}
+
+type ProjectAuthContextWithProject = ProjectAuthContext & {
+  readonly project: ProjectItem
+}
+
+const startProjectAuthMenu = (
+  project: ProjectItem,
+  snapshot: ProjectAuthSnapshot,
+  context: Pick<MenuViewContext, "setView" | "setMessage">
+) => {
+  context.setView({ _tag: "ProjectAuthMenu", selected: 0, project, snapshot })
+  context.setMessage(null)
+}
+
+const startProjectAuthPrompt = (
+  project: ProjectItem,
+  snapshot: ProjectAuthSnapshot,
+  flow: ProjectAuthFlow,
+  context: Pick<MenuViewContext, "setView" | "setMessage">
+) => {
+  context.setView({
+    _tag: "ProjectAuthPrompt",
+    flow,
+    step: 0,
+    buffer: "",
+    values: {},
+    project,
+    snapshot
+  })
+  context.setMessage(null)
+}
+
+const loadProjectAuthMenuView = (
+  project: ProjectItem,
+  context: Pick<MenuViewContext, "setView" | "setMessage">
+): Effect.Effect<void, AppError, MenuEnv> =>
+  pipe(
+    readProjectAuthSnapshot(project),
+    Effect.tap((snapshot) =>
+      Effect.sync(() => {
+        startProjectAuthMenu(project, snapshot, context)
+      })
+    ),
+    Effect.asVoid
+  )
+
+const successMessage = (flow: ProjectAuthFlow, label: string): string =>
+  Match.value(flow).pipe(
+    Match.when("ProjectGithubConnect", () => `Connected GitHub label (${label}) to project.`),
+    Match.when("ProjectGithubDisconnect", () => "Disconnected GitHub from project."),
+    Match.when("ProjectGitConnect", () => `Connected Git label (${label}) to project.`),
+    Match.when("ProjectGitDisconnect", () => "Disconnected Git from project."),
+    Match.when("ProjectClaudeConnect", () => `Connected Claude label (${label}) to project.`),
+    Match.when("ProjectClaudeDisconnect", () => "Disconnected Claude from project."),
+    Match.exhaustive
+  )
+
+const runProjectAuthEffect = (
+  project: ProjectItem,
+  flow: ProjectAuthFlow,
+  values: Readonly<Record<string, string>>,
+  label: string,
+  context: ProjectAuthContext
+) => {
+  context.runner.runEffect(
+    pipe(
+      writeProjectAuthFlow(project, flow, values),
+      Effect.zipRight(readProjectAuthSnapshot(project)),
+      Effect.tap((snapshot) =>
+        Effect.sync(() => {
+          startProjectAuthMenu(project, snapshot, context)
+          context.setMessage(successMessage(flow, label))
+        })
+      ),
+      Effect.asVoid
+    )
+  )
+}
+
+const submitProjectAuthPrompt = (
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthPrompt" }>,
+  context: ProjectAuthContext
+) => {
+  const steps = projectAuthViewSteps(view.flow)
+  submitPromptStep(
+    view,
+    steps,
+    context,
+    () => {
+      startProjectAuthMenu(view.project, view.snapshot, context)
+    },
+    (nextValues) => {
+      const rawLabel = (nextValues["label"] ?? "").trim()
+      const label = rawLabel.length > 0 ? rawLabel : "default"
+      runProjectAuthEffect(view.project, view.flow, nextValues, label, context)
+    }
+  )
+}
+
+const runProjectAuthAction = (
+  action: ProjectAuthMenuAction,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  context: ProjectAuthContext
+) => {
+  if (action === "Back") {
+    resetToMenu(context)
+    return
+  }
+  if (action === "Refresh") {
+    context.runner.runEffect(loadProjectAuthMenuView(view.project, context))
+    return
+  }
+
+  if (
+    action === "ProjectGithubDisconnect" || action === "ProjectGitDisconnect" || action === "ProjectClaudeDisconnect"
+  ) {
+    runProjectAuthEffect(view.project, action, {}, "default", context)
+    return
+  }
+
+  startProjectAuthPrompt(view.project, view.snapshot, action, context)
+}
+
+const setProjectAuthMenuSelection = (
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  selected: number,
+  context: Pick<MenuViewContext, "setView">
+) => {
+  context.setView({ ...view, selected })
+}
+
+const shiftProjectAuthMenuSelection = (
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  delta: number,
+  context: Pick<MenuViewContext, "setView">
+) => {
+  const menuSize = projectAuthMenuSize()
+  const selected = (view.selected + delta + menuSize) % menuSize
+  setProjectAuthMenuSelection(view, selected, context)
+}
+
+const runProjectAuthMenuSelection = (
+  selected: number,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  context: ProjectAuthContext
+) => {
+  const action = projectAuthMenuActionByIndex(selected)
+  if (action === null) {
+    return
+  }
+  runProjectAuthAction(action, view, context)
+}
+
+const handleProjectAuthMenuNumberInput = (
+  input: string,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  context: ProjectAuthContext
+) => {
+  handleMenuNumberInput(
+    input,
+    context,
+    projectAuthMenuActionByIndex,
+    (action) => {
+      runProjectAuthAction(action, view, context)
+    }
+  )
+}
+
+const handleProjectAuthMenuInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" }>,
+  context: ProjectAuthContext
+) => {
+  if (key.escape) {
+    resetToMenu(context)
+    return
+  }
+  if (key.upArrow) {
+    shiftProjectAuthMenuSelection(view, -1, context)
+    return
+  }
+  if (key.downArrow) {
+    shiftProjectAuthMenuSelection(view, 1, context)
+    return
+  }
+  if (key.return) {
+    runProjectAuthMenuSelection(view.selected, view, context)
+    return
+  }
+  handleProjectAuthMenuNumberInput(input, view, context)
+}
+
+type SetPromptBufferArgs = {
+  readonly input: string
+  readonly key: MenuKeyInput
+  readonly view: Extract<ViewState, { readonly _tag: "ProjectAuthPrompt" }>
+  readonly context: Pick<MenuViewContext, "setView">
+}
+
+const setProjectAuthPromptBuffer = (args: SetPromptBufferArgs) => {
+  const nextBuffer = nextBufferValue(args.input, args.key, args.view.buffer)
+  if (nextBuffer === null) {
+    return
+  }
+  args.context.setView({ ...args.view, buffer: nextBuffer })
+}
+
+const handleProjectAuthPromptInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthPrompt" }>,
+  context: ProjectAuthContext
+) => {
+  if (key.escape) {
+    startProjectAuthMenu(view.project, view.snapshot, context)
+    return
+  }
+  if (key.return) {
+    submitProjectAuthPrompt(view, context)
+    return
+  }
+  setProjectAuthPromptBuffer({ input, key, view, context })
+}
+
+export const openProjectAuthMenu = (context: ProjectAuthContextWithProject): void => {
+  context.setMessage(`Loading project auth (${context.project.displayName})...`)
+  context.runner.runEffect(loadProjectAuthMenuView(context.project, context))
+}
+
+export const handleProjectAuthInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" | "ProjectAuthPrompt" }>,
+  context: ProjectAuthContext
+) => {
+  if (view._tag === "ProjectAuthMenu") {
+    handleProjectAuthMenuInput(input, key, view, context)
+    return
+  }
+  handleProjectAuthPromptInput(input, key, view, context)
+}

package/src/docker-git/menu-render-auth.ts

@@ -0,0 +1,65 @@
+import { Box, Text } from "ink"
+import React from "react"
+
+import { authMenuLabels, authViewSteps, authViewTitle } from "./menu-auth-data.js"
+import {
+  renderMenuHelp,
+  renderPromptLayout,
+  renderSelectableMenuList,
+  resolvePromptState
+} from "./menu-render-common.js"
+import { renderLayout } from "./menu-render-layout.js"
+import type { AuthSnapshot, ViewState } from "./menu-types.js"
+
+const renderCountLine = (title: string, count: number): string => `${title}: ${count}`
+
+export const renderAuthMenu = (
+  snapshot: AuthSnapshot,
+  selected: number,
+  message: string | null
+): React.ReactElement => {
+  const el = React.createElement
+  const list = renderSelectableMenuList(authMenuLabels(), selected)
+  return renderLayout(
+    "docker-git / Auth profiles",
+    [
+      el(Text, null, `Global env: ${snapshot.globalEnvPath}`),
+      el(Text, null, `Claude auth: ${snapshot.claudeAuthPath}`),
+      el(Text, { color: "gray" }, renderCountLine("Entries", snapshot.totalEntries)),
+      el(Text, { color: "gray" }, renderCountLine("GitHub tokens", snapshot.githubTokenEntries)),
+      el(Text, { color: "gray" }, renderCountLine("Git tokens", snapshot.gitTokenEntries)),
+      el(Text, { color: "gray" }, renderCountLine("Git users", snapshot.gitUserEntries)),
+      el(Text, { color: "gray" }, renderCountLine("Claude logins", snapshot.claudeAuthEntries)),
+      el(Box, { flexDirection: "column", marginTop: 1 }, ...list),
+      renderMenuHelp("Use arrows + Enter, or type a number.")
+    ],
+    message
+  )
+}
+
+export const renderAuthPrompt = (
+  view: Extract<ViewState, { readonly _tag: "AuthPrompt" }>,
+  message: string | null
+): React.ReactElement => {
+  const el = React.createElement
+  const { prompt, visibleBuffer } = resolvePromptState(authViewSteps(view.flow), view.step, view.buffer)
+  let helpLine = "Enter = next, Esc = cancel."
+  if (view.flow === "GithubOauth" || view.flow === "ClaudeOauth") {
+    helpLine = "Enter = start OAuth, Esc = cancel."
+  } else if (view.flow === "ClaudeLogout") {
+    helpLine = "Enter = logout, Esc = cancel."
+  }
+  return renderPromptLayout({
+    title: `docker-git / Auth / ${authViewTitle(view.flow)}`,
+    header: [
+      el(Text, { color: "gray" }, `Global env: ${view.snapshot.globalEnvPath}`),
+      ...(view.flow === "ClaudeOauth" || view.flow === "ClaudeLogout"
+        ? [el(Text, { color: "gray" }, `Claude auth: ${view.snapshot.claudeAuthPath}`)]
+        : [])
+    ],
+    prompt,
+    visibleBuffer,
+    helpLine,
+    message
+  })
+}

package/src/docker-git/menu-render-common.ts

@@ -0,0 +1,67 @@
+import { Box, Text } from "ink"
+import React from "react"
+
+import { renderLayout } from "./menu-render-layout.js"
+
+export const renderSelectableMenuList = (
+  labels: ReadonlyArray<string>,
+  selected: number
+): ReadonlyArray<React.ReactElement> => {
+  const el = React.createElement
+  return labels.map((label, index) =>
+    el(
+      Text,
+      { key: `${index}-${label}`, color: index === selected ? "green" : "white" },
+      `${index === selected ? ">" : " "} ${index + 1}) ${label}`
+    )
+  )
+}
+
+export const renderMenuHelp = (primaryLine: string): React.ReactElement => {
+  const el = React.createElement
+  return el(
+    Box,
+    { marginTop: 1, flexDirection: "column" },
+    el(Text, { color: "gray" }, primaryLine),
+    el(Text, { color: "gray" }, "Esc returns to the main menu.")
+  )
+}
+
+type PromptStepLike = {
+  readonly label: string
+  readonly secret: boolean
+}
+
+export const resolvePromptState = (
+  steps: ReadonlyArray<PromptStepLike>,
+  step: number,
+  buffer: string
+): { readonly prompt: string; readonly visibleBuffer: string } => {
+  const current = steps[step]
+  const prompt = current?.label ?? "Value"
+  const isSecret = current?.secret === true
+  const visibleBuffer = isSecret ? "*".repeat(buffer.length) : buffer
+  return { prompt, visibleBuffer }
+}
+
+type RenderPromptArgs = {
+  readonly title: string
+  readonly header: ReadonlyArray<React.ReactElement>
+  readonly prompt: string
+  readonly visibleBuffer: string
+  readonly helpLine: string
+  readonly message: string | null
+}
+
+export const renderPromptLayout = (args: RenderPromptArgs): React.ReactElement => {
+  const el = React.createElement
+  return renderLayout(
+    args.title,
+    [
+      ...args.header,
+      el(Box, { marginTop: 1 }, el(Text, null, `${args.prompt}: `), el(Text, { color: "green" }, args.visibleBuffer)),
+      el(Box, { marginTop: 1, flexDirection: "column" }, el(Text, { color: "gray" }, args.helpLine))
+    ],
+    args.message
+  )
+}

package/src/docker-git/menu-render-layout.ts

@@ -0,0 +1,30 @@
+import { Box, Text } from "ink"
+import React from "react"
+
+const renderMessage = (message: string | null): React.ReactElement | null => {
+  if (!message) {
+    return null
+  }
+  return React.createElement(
+    Box,
+    { marginTop: 1 },
+    React.createElement(Text, { color: "magenta" }, message)
+  )
+}
+
+export const renderLayout = (
+  title: string,
+  body: ReadonlyArray<React.ReactElement>,
+  message: string | null
+): React.ReactElement => {
+  const el = React.createElement
+  const messageView = renderMessage(message)
+  const tail = messageView ? [messageView] : []
+  return el(
+    Box,
+    { flexDirection: "column", padding: 1, borderStyle: "round" },
+    el(Text, { color: "cyan", bold: true }, title),
+    ...body,
+    ...tail
+  )
+}

package/src/docker-git/menu-render-project-auth.ts

@@ -0,0 +1,70 @@
+import { Box, Text } from "ink"
+import React from "react"
+
+import { projectAuthMenuLabels, projectAuthViewSteps } from "./menu-project-auth-data.js"
+import {
+  renderMenuHelp,
+  renderPromptLayout,
+  renderSelectableMenuList,
+  resolvePromptState
+} from "./menu-render-common.js"
+import { renderLayout } from "./menu-render-layout.js"
+import type { ProjectAuthSnapshot, ViewState } from "./menu-types.js"
+
+const renderActiveLabel = (value: string | null): string => value ?? "(not set)"
+
+const renderCountLine = (title: string, count: number): string => `${title}: ${count}`
+
+export const renderProjectAuthMenu = (
+  snapshot: ProjectAuthSnapshot,
+  selected: number,
+  message: string | null
+): React.ReactElement => {
+  const el = React.createElement
+  const list = renderSelectableMenuList(projectAuthMenuLabels(), selected)
+
+  return renderLayout(
+    "docker-git / Project auth",
+    [
+      el(Text, null, `Project: ${snapshot.projectName}`),
+      el(Text, { color: "gray" }, `Dir: ${snapshot.projectDir}`),
+      el(Text, { color: "gray" }, `Project env: ${snapshot.envProjectPath}`),
+      el(Text, { color: "gray" }, `Global env: ${snapshot.envGlobalPath}`),
+      el(Text, { color: "gray" }, `Claude auth: ${snapshot.claudeAuthPath}`),
+      el(
+        Box,
+        { marginTop: 1, flexDirection: "column" },
+        el(Text, { color: "gray" }, `GitHub label: ${renderActiveLabel(snapshot.activeGithubLabel)}`),
+        el(Text, { color: "gray" }, renderCountLine("Available GitHub tokens", snapshot.githubTokenEntries)),
+        el(Text, { color: "gray" }, `Git label: ${renderActiveLabel(snapshot.activeGitLabel)}`),
+        el(Text, { color: "gray" }, renderCountLine("Available Git tokens", snapshot.gitTokenEntries)),
+        el(Text, { color: "gray" }, `Claude label: ${renderActiveLabel(snapshot.activeClaudeLabel)}`),
+        el(Text, { color: "gray" }, renderCountLine("Available Claude logins", snapshot.claudeAuthEntries))
+      ),
+      el(Box, { flexDirection: "column", marginTop: 1 }, ...list),
+      renderMenuHelp("Use arrows + Enter, or type a number from the list.")
+    ],
+    message
+  )
+}
+
+export const renderProjectAuthPrompt = (
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthPrompt" }>,
+  message: string | null
+): React.ReactElement => {
+  const el = React.createElement
+  const { prompt, visibleBuffer } = resolvePromptState(projectAuthViewSteps(view.flow), view.step, view.buffer)
+
+  return renderPromptLayout({
+    title: "docker-git / Project auth / Set label",
+    header: [
+      el(Text, { color: "gray" }, `Project: ${view.snapshot.projectName}`),
+      el(Text, { color: "gray" }, `Project env: ${view.snapshot.envProjectPath}`),
+      el(Text, { color: "gray" }, `Global env: ${view.snapshot.envGlobalPath}`)
+    ],
+    prompt,
+    visibleBuffer,
+    helpLine: "Enter = apply, Esc = cancel.",
+    message
+  })
+}

package/src/docker-git/menu-render-select.ts

@@ -5,7 +5,7 @@ import type React from "react"
 import type { ProjectItem } from "@effect-template/lib/usecases/projects"
 import type { SelectProjectRuntime } from "./menu-types.js"
 
-export type SelectPurpose = "Connect" | "Down" | "Info" | "Delete"
+export type SelectPurpose = "Connect" | "Down" | "Info" | "Delete" | "Auth"
 
 const formatRepoRef = (repoRef: string): string => {
   const trimmed = repoRef.trim()
@@ -58,6 +58,7 @@ const renderRuntimeLabel = (runtime: SelectProjectRuntime): string =>
 export const selectTitle = (purpose: SelectPurpose): string =>
   Match.value(purpose).pipe(
     Match.when("Connect", () => "docker-git / Select project"),
+    Match.when("Auth", () => "docker-git / Project auth"),
     Match.when("Down", () => "docker-git / Stop container"),
     Match.when("Info", () => "docker-git / Show connection info"),
     Match.when("Delete", () => "docker-git / Delete project"),
@@ -73,6 +74,7 @@ export const selectHint = (
       "Connect",
       () => `Enter = select + SSH, P = toggle Playwright MCP (${connectEnableMcpPlaywright ? "on" : "off"}), Esc = back`
     ),
+    Match.when("Auth", () => "Enter = open project auth menu, Esc = back"),
     Match.when("Down", () => "Enter = stop container, Esc = back"),
     Match.when("Info", () => "Use arrows to browse details, Enter = set active, Esc = back"),
     Match.when("Delete", () => "Enter = ask/confirm delete, Esc = cancel"),
@@ -196,6 +198,14 @@ export const renderSelectDetails = (
 
   return Match.value(purpose).pipe(
     Match.when("Connect", () => renderConnectDetails(el, context, common, connectEnableMcpPlaywright)),
+    Match.when("Auth", () => [
+      titleRow(el, "Project auth"),
+      ...common,
+      el(Text, { wrap: "wrap" }, `Repo: ${context.item.repoUrl} (${context.refLabel})`),
+      el(Text, { wrap: "wrap" }, `Env global: ${context.item.envGlobalPath}`),
+      el(Text, { wrap: "wrap" }, `Env project: ${context.item.envProjectPath}`),
+      el(Text, { color: "gray", wrap: "wrap" }, "Press Enter to manage labels for this project.")
+    ]),
     Match.when("Info", () => renderInfoDetails(el, context, common)),
     Match.when("Down", () => [
       titleRow(el, "Stop container"),

package/src/docker-git/menu-render.ts

@@ -3,6 +3,7 @@ import { Box, Text } from "ink"
 import React from "react"
 
 import type { ProjectItem } from "@effect-template/lib/usecases/projects"
+import { renderLayout } from "./menu-render-layout.js"
 import {
   buildSelectLabels,
   renderSelectDetails,
@@ -41,34 +42,6 @@ export const renderStepLabel = (step: CreateStep, defaults: CreateInputs): strin
     Match.exhaustive
   )
 
-const renderMessage = (message: string | null): React.ReactElement | null => {
-  if (!message) {
-    return null
-  }
-  return React.createElement(
-    Box,
-    { marginTop: 1 },
-    React.createElement(Text, { color: "magenta" }, message)
-  )
-}
-
-const renderLayout = (
-  title: string,
-  body: ReadonlyArray<React.ReactElement>,
-  message: string | null
-): React.ReactElement => {
-  const el = React.createElement
-  const messageView = renderMessage(message)
-  const tail = messageView ? [messageView] : []
-  return el(
-    Box,
-    { flexDirection: "column", padding: 1, borderStyle: "round" },
-    el(Text, { color: "cyan", bold: true }, title),
-    ...body,
-    ...tail
-  )
-}
-
 const compactElements = (
   items: ReadonlyArray<React.ReactElement | null>
 ): ReadonlyArray<React.ReactElement> => items.filter((item): item is React.ReactElement => item !== null)
@@ -82,7 +55,7 @@ const renderMenuHints = (el: typeof React.createElement): React.ReactElement =>
     el(
       Text,
       { color: "gray" },
-      "  - Aliases: create/c, select/s, info/i, status/ps, logs/l, down/d, down-all/da, delete/del, quit/q"
+      "  - Aliases: create/c, select/s, auth/a, project-auth/pa, info/i, status/ps, logs/l, down/d, down-all/da, delete/del, quit/q"
     ),
     el(Text, { color: "gray" }, "  - Use arrows and Enter to run.")
   )
@@ -181,6 +154,9 @@ export const renderCreate = (
   )
 }
 
+export { renderAuthMenu, renderAuthPrompt } from "./menu-render-auth.js"
+export { renderProjectAuthMenu, renderProjectAuthPrompt } from "./menu-render-project-auth.js"
+
 const computeListWidth = (labels: ReadonlyArray<string>): number => {
   const maxLabelWidth = labels.length > 0 ? Math.max(...labels.map((label) => label.length)) : 24
   return Math.min(Math.max(maxLabelWidth + 2, 28), 54)