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

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

@@ -7,6 +7,7 @@ import { Effect, Either, Match, pipe } from "effect"
 import { parseArgs } from "./cli/parser.js"
 import { formatParseError, usageText } from "./cli/usage.js"
 
+import { nextBufferValue } from "./menu-buffer-input.js"
 import { resetToMenu } from "./menu-shared.js"
 import {
   type CreateInputs,
@@ -45,7 +46,7 @@ type CreateReturnContext = CreateContext & {
 }
 
 export const buildCreateArgs = (input: CreateInputs): ReadonlyArray<string> => {
-  const args: Array<string> = ["create", "--repo-url", input.repoUrl, "--secrets-root", input.secretsRoot]
+  const args: Array<string> = ["create", "--repo-url", input.repoUrl]
   if (input.repoRef.length > 0) {
     args.push("--repo-ref", input.repoRef)
   }
@@ -106,14 +107,12 @@ export const resolveCreateInputs = (
 ): CreateInputs => {
   const repoUrl = values.repoUrl ?? ""
   const resolvedRepoRef = repoUrl.length > 0 ? resolveRepoInput(repoUrl).repoRef : undefined
-  const secretsRoot = values.secretsRoot ?? joinPath(defaultProjectsRoot(cwd), "secrets")
   const outDir = values.outDir ?? (repoUrl.length > 0 ? resolveDefaultOutDir(cwd, repoUrl) : "")
 
   return {
     repoUrl,
     repoRef: values.repoRef ?? resolvedRepoRef ?? "main",
     outDir,
-    secretsRoot,
     runUp: values.runUp !== false,
     enableMcpPlaywright: values.enableMcpPlaywright === true,
     force: values.force === true,
@@ -308,13 +307,8 @@ export const handleCreateInput = (
     handleCreateReturn({ ...context, view })
     return
   }
-
-  if (key.backspace || key.delete) {
-    context.setView({ ...view, buffer: view.buffer.slice(0, -1) })
-    return
-  }
-
-  if (input.length > 0) {
-    context.setView({ ...view, buffer: view.buffer + input })
+  const nextBuffer = nextBufferValue(input, key, view.buffer)
+  if (nextBuffer !== null) {
+    context.setView({ ...view, buffer: nextBuffer })
   }
 }

package/src/docker-git/menu-input-handler.ts

@@ -1,5 +1,7 @@
+import { handleAuthInput } from "./menu-auth.js"
 import { handleCreateInput } from "./menu-create.js"
 import { handleMenuInput } from "./menu-menu.js"
+import { handleProjectAuthInput } from "./menu-project-auth.js"
 import { handleSelectInput } from "./menu-select.js"
 import type { MenuKeyInput, MenuRunner, MenuState, MenuViewContext, ViewState } from "./menu-types.js"
 
@@ -20,6 +22,8 @@ export type MenuInputContext = MenuViewContext & {
   readonly exit: () => void
 }
 
+type ActiveView = Exclude<ViewState, { readonly _tag: "Menu" }>
+
 const activateInput = (
   input: string,
   key: Pick<MenuKeyInput, "upArrow" | "downArrow" | "return">,
@@ -59,43 +63,79 @@ const shouldHandleMenuInput = (
   return activation.allowProcessing
 }
 
-export const handleUserInput = (
+const handleMenuViewInput = (
   input: string,
   key: MenuKeyInput,
   context: MenuInputContext
 ) => {
-  if (context.busy || context.sshActive) {
+  if (!shouldHandleMenuInput(input, key, context)) {
     return
   }
+  handleMenuInput(input, key, {
+    selected: context.selected,
+    setSelected: context.setSelected,
+    state: context.state,
+    runner: context.runner,
+    exit: context.exit,
+    setView: context.setView,
+    setMessage: context.setMessage,
+    setActiveDir: context.setActiveDir
+  })
+}
 
-  if (context.view._tag === "Menu") {
-    if (!shouldHandleMenuInput(input, key, context)) {
-      return
-    }
-    handleMenuInput(input, key, {
-      selected: context.selected,
-      setSelected: context.setSelected,
-      state: context.state,
-      runner: context.runner,
-      exit: context.exit,
-      setView: context.setView,
-      setMessage: context.setMessage
-    })
-    return
-  }
+const handleCreateViewInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "Create" }>,
+  context: MenuInputContext
+) => {
+  handleCreateInput(input, key, view, {
+    state: context.state,
+    setView: context.setView,
+    setMessage: context.setMessage,
+    runner: context.runner,
+    setActiveDir: context.setActiveDir
+  })
+}
 
-  if (context.view._tag === "Create") {
-    handleCreateInput(input, key, context.view, {
-      state: context.state,
-      setView: context.setView,
-      setMessage: context.setMessage,
-      runner: context.runner,
-      setActiveDir: context.setActiveDir
-    })
-    return
-  }
+const handleAuthViewInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "AuthMenu" | "AuthPrompt" }>,
+  context: MenuInputContext
+) => {
+  handleAuthInput(input, key, view, {
+    state: context.state,
+    setView: context.setView,
+    setMessage: context.setMessage,
+    setActiveDir: context.setActiveDir,
+    runner: context.runner,
+    setSshActive: context.setSshActive,
+    setSkipInputs: context.setSkipInputs
+  })
+}
 
-  handleSelectInput(input, key, context.view, {
+const handleProjectAuthViewInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "ProjectAuthMenu" | "ProjectAuthPrompt" }>,
+  context: MenuInputContext
+) => {
+  handleProjectAuthInput(input, key, view, {
+    runner: context.runner,
+    setView: context.setView,
+    setMessage: context.setMessage,
+    setActiveDir: context.setActiveDir
+  })
+}
+
+const handleSelectViewInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: Extract<ViewState, { readonly _tag: "SelectProject" }>,
+  context: MenuInputContext
+) => {
+  handleSelectInput(input, key, view, {
     setView: context.setView,
     setMessage: context.setMessage,
     setActiveDir: context.setActiveDir,
@@ -105,3 +145,39 @@ export const handleUserInput = (
     setSkipInputs: context.setSkipInputs
   })
 }
+
+const handleActiveViewInput = (
+  input: string,
+  key: MenuKeyInput,
+  view: ActiveView,
+  context: MenuInputContext
+) => {
+  if (view._tag === "Create") {
+    handleCreateViewInput(input, key, view, context)
+    return
+  }
+  if (view._tag === "AuthMenu" || view._tag === "AuthPrompt") {
+    handleAuthViewInput(input, key, view, context)
+    return
+  }
+  if (view._tag === "ProjectAuthMenu" || view._tag === "ProjectAuthPrompt") {
+    handleProjectAuthViewInput(input, key, view, context)
+    return
+  }
+  handleSelectViewInput(input, key, view, context)
+}
+
+export const handleUserInput = (
+  input: string,
+  key: MenuKeyInput,
+  context: MenuInputContext
+) => {
+  if (context.busy || context.sshActive) {
+    return
+  }
+  if (context.view._tag === "Menu") {
+    handleMenuViewInput(input, key, context)
+    return
+  }
+  handleActiveViewInput(input, key, context.view, context)
+}

package/src/docker-git/menu-input-utils.ts

@@ -0,0 +1,85 @@
+export const parseMenuIndex = (input: string): number | null => {
+  const trimmed = input.trim()
+  if (trimmed.length === 0) {
+    return null
+  }
+  const parsed = Number(trimmed)
+  if (!Number.isInteger(parsed)) {
+    return null
+  }
+  const index = parsed - 1
+  return index >= 0 ? index : null
+}
+
+type PromptStep = {
+  readonly key: string
+  readonly label: string
+  readonly required: boolean
+}
+
+type PromptView = {
+  readonly step: number
+  readonly buffer: string
+  readonly values: Readonly<Record<string, string>>
+}
+
+type PromptContext<V extends PromptView> = {
+  readonly setView: (view: V) => void
+  readonly setMessage: (message: string | null) => void
+}
+
+export const submitPromptStep = <V extends PromptView>(
+  view: V,
+  steps: ReadonlyArray<PromptStep>,
+  context: PromptContext<V>,
+  onCancel: () => void,
+  onSubmit: (values: Readonly<Record<string, string>>) => void
+): void => {
+  const step = steps[view.step]
+  if (!step) {
+    onCancel()
+    return
+  }
+
+  const value = view.buffer.trim()
+  if (step.required && value.length === 0) {
+    context.setMessage(`${step.label} is required.`)
+    return
+  }
+
+  const nextValues: Readonly<Record<string, string>> = { ...view.values, [step.key]: value }
+  const nextStep = view.step + 1
+  if (nextStep < steps.length) {
+    context.setView({ ...view, step: nextStep, buffer: "", values: nextValues })
+    context.setMessage(null)
+    return
+  }
+
+  onSubmit(nextValues)
+}
+
+type MenuNumberInputContext = {
+  readonly setMessage: (message: string | null) => void
+}
+
+export const handleMenuNumberInput = <A>(
+  input: string,
+  context: MenuNumberInputContext,
+  actionByIndex: (index: number) => A | null,
+  runAction: (action: A) => void
+): void => {
+  const index = parseMenuIndex(input)
+  if (index === null) {
+    if (input.trim().length > 0) {
+      context.setMessage("Use arrows + Enter, or type a number from the list.")
+    }
+    return
+  }
+
+  const action = actionByIndex(index)
+  if (action === null) {
+    context.setMessage(`Unknown action: ${input.trim()}`)
+    return
+  }
+  runAction(action)
+}

package/src/docker-git/menu-labeled-env.ts

@@ -0,0 +1,37 @@
+import { parseEnvEntries } from "@effect-template/lib/usecases/env-file"
+
+export const normalizeLabel = (value: string): string => {
+  const trimmed = value.trim()
+  if (trimmed.length === 0) {
+    return ""
+  }
+  const normalized = trimmed
+    .toUpperCase()
+    .replaceAll(/[^A-Z0-9]+/g, "_")
+
+  let start = 0
+  while (start < normalized.length && normalized[start] === "_") {
+    start += 1
+  }
+  let end = normalized.length
+  while (end > start && normalized[end - 1] === "_") {
+    end -= 1
+  }
+  const cleaned = normalized.slice(start, end)
+  return cleaned.length > 0 ? cleaned : ""
+}
+
+export const buildLabeledEnvKey = (baseKey: string, label: string): string => {
+  const normalized = normalizeLabel(label)
+  if (normalized.length === 0 || normalized === "DEFAULT") {
+    return baseKey
+  }
+  return `${baseKey}__${normalized}`
+}
+
+export const countKeyEntries = (envText: string, baseKey: string): number => {
+  const prefix = `${baseKey}__`
+  return parseEnvEntries(envText)
+    .filter((entry) => entry.value.trim().length > 0 && (entry.key === baseKey || entry.key.startsWith(prefix)))
+    .length
+}

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

@@ -0,0 +1,70 @@
+import type { PlatformError } from "@effect/platform/Error"
+import type * as FileSystem from "@effect/platform/FileSystem"
+import { Effect } from "effect"
+
+const oauthTokenFileName = ".oauth-token"
+const legacyConfigFileName = ".config.json"
+
+const hasFileAtPath = (
+  fs: FileSystem.FileSystem,
+  filePath: string
+): Effect.Effect<boolean, PlatformError> =>
+  Effect.gen(function*(_) {
+    const exists = yield* _(fs.exists(filePath))
+    if (!exists) {
+      return false
+    }
+    const info = yield* _(fs.stat(filePath))
+    return info.type === "File"
+  })
+
+const hasNonEmptyOauthToken = (
+  fs: FileSystem.FileSystem,
+  tokenPath: string
+): Effect.Effect<boolean, PlatformError> =>
+  Effect.gen(function*(_) {
+    const hasFile = yield* _(hasFileAtPath(fs, tokenPath))
+    if (!hasFile) {
+      return false
+    }
+    const tokenValue = yield* _(fs.readFileString(tokenPath), Effect.orElseSucceed(() => ""))
+    return tokenValue.trim().length > 0
+  })
+
+const hasLegacyClaudeAuthFile = (
+  fs: FileSystem.FileSystem,
+  accountPath: string
+): Effect.Effect<boolean, PlatformError> =>
+  Effect.gen(function*(_) {
+    const entries = yield* _(fs.readDirectory(accountPath))
+    for (const entry of entries) {
+      if (!entry.startsWith(".claude") || !entry.endsWith(".json")) {
+        continue
+      }
+      const isFile = yield* _(hasFileAtPath(fs, `${accountPath}/${entry}`))
+      if (isFile) {
+        return true
+      }
+    }
+    return false
+  })
+
+export const hasClaudeAccountCredentials = (
+  fs: FileSystem.FileSystem,
+  accountPath: string
+): Effect.Effect<boolean, PlatformError> =>
+  hasFileAtPath(fs, `${accountPath}/${legacyConfigFileName}`).pipe(
+    Effect.flatMap((hasConfig) => {
+      if (hasConfig) {
+        return Effect.succeed(true)
+      }
+      return hasNonEmptyOauthToken(fs, `${accountPath}/${oauthTokenFileName}`).pipe(
+        Effect.flatMap((hasOauthToken) => {
+          if (hasOauthToken) {
+            return Effect.succeed(true)
+          }
+          return hasLegacyClaudeAuthFile(fs, accountPath)
+        })
+      )
+    })
+  )