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

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

@@ -40,13 +40,14 @@ export type MenuKeyInput = {
   readonly downArrow?: boolean
   readonly return?: boolean
   readonly escape?: boolean
+  readonly backspace?: boolean
+  readonly delete?: boolean
 }
 
 export type CreateInputs = {
   readonly repoUrl: string
   readonly repoRef: string
   readonly outDir: string
-  readonly secretsRoot: string
   readonly runUp: boolean
   readonly enableMcpPlaywright: boolean
   readonly force: boolean
@@ -70,12 +71,76 @@ export const createSteps: ReadonlyArray<CreateStep> = [
   "force"
 ]
 
+export type AuthFlow =
+  | "GithubOauth"
+  | "GithubRemove"
+  | "GitSet"
+  | "GitRemove"
+  | "ClaudeOauth"
+  | "ClaudeLogout"
+
+export interface AuthSnapshot {
+  readonly globalEnvPath: string
+  readonly claudeAuthPath: string
+  readonly totalEntries: number
+  readonly githubTokenEntries: number
+  readonly gitTokenEntries: number
+  readonly gitUserEntries: number
+  readonly claudeAuthEntries: number
+}
+
+export type ProjectAuthFlow =
+  | "ProjectGithubConnect"
+  | "ProjectGithubDisconnect"
+  | "ProjectGitConnect"
+  | "ProjectGitDisconnect"
+  | "ProjectClaudeConnect"
+  | "ProjectClaudeDisconnect"
+
+export interface ProjectAuthSnapshot {
+  readonly projectDir: string
+  readonly projectName: string
+  readonly envGlobalPath: string
+  readonly envProjectPath: string
+  readonly claudeAuthPath: string
+  readonly githubTokenEntries: number
+  readonly gitTokenEntries: number
+  readonly claudeAuthEntries: number
+  readonly activeGithubLabel: string | null
+  readonly activeGitLabel: string | null
+  readonly activeClaudeLabel: string | null
+}
+
 export type ViewState =
   | { readonly _tag: "Menu" }
   | { readonly _tag: "Create"; readonly step: number; readonly buffer: string; readonly values: Partial<CreateInputs> }
+  | { readonly _tag: "AuthMenu"; readonly selected: number; readonly snapshot: AuthSnapshot }
+  | {
+    readonly _tag: "AuthPrompt"
+    readonly flow: AuthFlow
+    readonly step: number
+    readonly buffer: string
+    readonly values: Readonly<Record<string, string>>
+    readonly snapshot: AuthSnapshot
+  }
+  | {
+    readonly _tag: "ProjectAuthMenu"
+    readonly selected: number
+    readonly project: ProjectItem
+    readonly snapshot: ProjectAuthSnapshot
+  }
+  | {
+    readonly _tag: "ProjectAuthPrompt"
+    readonly flow: ProjectAuthFlow
+    readonly step: number
+    readonly buffer: string
+    readonly values: Readonly<Record<string, string>>
+    readonly project: ProjectItem
+    readonly snapshot: ProjectAuthSnapshot
+  }
   | {
     readonly _tag: "SelectProject"
-    readonly purpose: "Connect" | "Down" | "Info" | "Delete"
+    readonly purpose: "Connect" | "Down" | "Info" | "Delete" | "Auth"
     readonly items: ReadonlyArray<ProjectItem>
     readonly runtimeByProject: Readonly<Record<string, SelectProjectRuntime>>
     readonly selected: number
@@ -93,6 +158,8 @@ export type SelectProjectRuntime = {
 export const menuItems: ReadonlyArray<{ readonly id: MenuAction; readonly label: string }> = [
   { id: { _tag: "Create" }, label: "Create project" },
   { id: { _tag: "Select" }, label: "Select project" },
+  { id: { _tag: "Auth" }, label: "Auth profiles (keys)" },
+  { id: { _tag: "ProjectAuth" }, label: "Project auth (bind labels)" },
   { id: { _tag: "Info" }, label: "Show connection info" },
   { id: { _tag: "Status" }, label: "docker compose ps" },
   { id: { _tag: "Logs" }, label: "docker compose logs --tail=200" },

package/src/docker-git/menu.ts

@@ -9,7 +9,16 @@ import React, { useEffect, useMemo, useState } from "react"
 
 import { resolveCreateInputs } from "./menu-create.js"
 import { handleUserInput, type InputStage } from "./menu-input-handler.js"
-import { renderCreate, renderMenu, renderSelect, renderStepLabel } from "./menu-render.js"
+import {
+  renderAuthMenu,
+  renderAuthPrompt,
+  renderCreate,
+  renderMenu,
+  renderProjectAuthMenu,
+  renderProjectAuthPrompt,
+  renderSelect,
+  renderStepLabel
+} from "./menu-render.js"
 import { leaveTui, resumeTui } from "./menu-shared.js"
 import { defaultMenuStartupSnapshot, resolveMenuStartupSnapshot } from "./menu-startup.js"
 import { createSteps, type MenuEnv, type MenuState, type ViewState } from "./menu-types.js"
@@ -82,6 +91,22 @@ const renderView = (context: RenderContext) => {
     return renderCreate(label, context.view.buffer, context.message, context.view.step, currentDefaults)
   }
 
+  if (context.view._tag === "AuthMenu") {
+    return renderAuthMenu(context.view.snapshot, context.view.selected, context.message)
+  }
+
+  if (context.view._tag === "AuthPrompt") {
+    return renderAuthPrompt(context.view, context.message)
+  }
+
+  if (context.view._tag === "ProjectAuthMenu") {
+    return renderProjectAuthMenu(context.view.snapshot, context.view.selected, context.message)
+  }
+
+  if (context.view._tag === "ProjectAuthPrompt") {
+    return renderProjectAuthPrompt(context.view, context.message)
+  }
+
   return renderSelect({
     purpose: context.view.purpose,
     items: context.view.items,

package/src/docker-git/program.ts

@@ -1,6 +1,9 @@
 import type { Command, ParseError } from "@effect-template/lib/core/domain"
 import { createProject } from "@effect-template/lib/usecases/actions"
 import {
+  authClaudeLogin,
+  authClaudeLogout,
+  authClaudeStatus,
   authCodexLogin,
   authCodexLogout,
   authCodexStatus,
@@ -85,15 +88,18 @@ const handleNonBaseCommand = (command: NonBaseCommand) =>
       Match.when({ _tag: "AuthCodexLogin" }, (cmd) => authCodexLogin(cmd)),
       Match.when({ _tag: "AuthCodexStatus" }, (cmd) => authCodexStatus(cmd)),
       Match.when({ _tag: "AuthCodexLogout" }, (cmd) => authCodexLogout(cmd)),
+      Match.when({ _tag: "AuthClaudeLogin" }, (cmd) => authClaudeLogin(cmd)),
+      Match.when({ _tag: "AuthClaudeStatus" }, (cmd) => authClaudeStatus(cmd)),
+      Match.when({ _tag: "AuthClaudeLogout" }, (cmd) => authClaudeLogout(cmd)),
       Match.when({ _tag: "Attach" }, (cmd) => attachTmux(cmd)),
       Match.when({ _tag: "Panes" }, (cmd) => listTmuxPanes(cmd)),
       Match.when({ _tag: "SessionsList" }, (cmd) => listTerminalSessions(cmd)),
-      Match.when({ _tag: "SessionsKill" }, (cmd) => killTerminalProcess(cmd)),
-      Match.when({ _tag: "SessionsLogs" }, (cmd) => tailTerminalLogs(cmd)),
-      Match.when({ _tag: "ScrapExport" }, (cmd) => exportScrap(cmd)),
-      Match.when({ _tag: "ScrapImport" }, (cmd) => importScrap(cmd))
+      Match.when({ _tag: "SessionsKill" }, (cmd) => killTerminalProcess(cmd))
     )
     .pipe(
+      Match.when({ _tag: "SessionsLogs" }, (cmd) => tailTerminalLogs(cmd)),
+      Match.when({ _tag: "ScrapExport" }, (cmd) => exportScrap(cmd)),
+      Match.when({ _tag: "ScrapImport" }, (cmd) => importScrap(cmd)),
       Match.when({ _tag: "McpPlaywrightUp" }, (cmd) => mcpPlaywrightUp(cmd)),
       Match.exhaustive
     )

package/tests/docker-git/entrypoint-auth.test.ts

@@ -19,7 +19,7 @@ describe("renderEntrypoint auth bridge", () => {
       expect(entrypoint).toContain("GITHUB_TOKEN=\"${GITHUB_TOKEN:-${GH_TOKEN:-}}\"")
       expect(entrypoint).toContain("if [[ -n \"$GH_TOKEN\" || -n \"$GITHUB_TOKEN\" ]]; then")
       expect(entrypoint).toContain(String.raw`printf "export GITHUB_TOKEN=%q\n" "$EFFECTIVE_GITHUB_TOKEN"`)
-      expect(entrypoint).toContain(String.raw`printf "%s\n" "GITHUB_TOKEN=$EFFECTIVE_GITHUB_TOKEN" >> "$SSH_ENV_PATH"`)
+      expect(entrypoint).toContain("docker_git_upsert_ssh_env \"GITHUB_TOKEN\" \"$EFFECTIVE_GITHUB_TOKEN\"")
       expect(entrypoint).toContain("GIT_CREDENTIAL_HELPER_PATH=\"/usr/local/bin/docker-git-credential-helper\"")
       expect(entrypoint).toContain("token=\"$GITHUB_TOKEN\"")
       expect(entrypoint).toContain("token=\"$GH_TOKEN\"")