merge main into Windows support PR

Author: skulidropek

README.md

@@ -25,8 +25,14 @@ bun run docker-git --help
 docker-git auth github login --web
 docker-git auth codex login --web
 docker-git auth claude login --web
+docker-git auth grok login --web
 ```
 
+Grok support uses the official xAI CLI installer from `https://x.ai/cli/install.sh`
+and the CLI device-code login flow. API-key auth can also be stored under the
+selected Grok account label via `GROK_DEPLOYMENT_KEY`, `GROK_API_KEY`, or
+`XAI_API_KEY`.
+
 ## CLI пример
 
 Можно передавать ссылку на репозиторий, ветку (`/tree/...`), issue или PR.
@@ -44,8 +50,8 @@ docker-git clone https://github.com/ProverCoderAI/docker-git/issues/122 --force
 docker-git clone https://github.com/ProverCoderAI/docker-git/issues/122 --force --auto
 ```
 
-- `--auto` сам выбирает Claude или Codex по доступной авторизации. Если доступны оба, выбор случайный.
-- `--auto=claude` или `--auto=codex` принудительно выбирает агента.
+- `--auto` сам выбирает Claude, Codex, Gemini или Grok по доступной авторизации. Если доступно несколько, выбор случайный.
+- `--auto=claude`, `--auto=codex`, `--auto=gemini` или `--auto=grok` принудительно выбирает агента.
 - В auto-режиме агент сам выполняет задачу, создаёт PR и после завершения контейнер очищается.
 
 Применение конфигурации:

bun.lock

@@ -35,13 +35,17 @@ RUN set -eu; \
     libnss3 libpango-1.0-0 libx11-xcb1 libxcb-dri3-0 libxcomposite1 libxdamage1 libxfixes3 \
     libxkbcommon0 libxrandr2 libxshmfence1 \
  && mkdir -p /usr/share/keyrings \
+ && curl -fsSL https://pkg.cloudflare.com/cloudflare-main.gpg \
+    | gpg --dearmor -o /usr/share/keyrings/cloudflare-main.gpg \
+ && echo "deb [signed-by=/usr/share/keyrings/cloudflare-main.gpg] https://pkg.cloudflare.com/cloudflared any main" \
+    > /etc/apt/sources.list.d/cloudflared.list \
  && curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey \
     | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg \
  && curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list \
     | sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' \
     > /etc/apt/sources.list.d/nvidia-container-toolkit.list \
  && apt-get -o Acquire::Retries=3 update \
- && apt-get -o Acquire::Retries=3 install -y --no-install-recommends nvidia-container-toolkit \
+ && apt-get -o Acquire::Retries=3 install -y --no-install-recommends cloudflared nvidia-container-toolkit \
  && nvidia-ctk runtime configure --runtime=docker \
  && rm -rf /var/lib/apt/lists/*
 

packages/api/Dockerfile

@@ -36,14 +36,6 @@ Diagnostic classification + remediation messages live in
 `packages/app/src/docker-git/controller-docker-diagnostics.ts` and are
 covered by `packages/app/tests/docker-git/controller-docker-diagnostics.test.ts`.
 
-## UI wrapper
-
-After API startup open:
-
-- `http://localhost:3334/`
-
-This page is a built-in UI shell for manual API checks without CLI.
-
 ## Run (local)
 
 ```bash

packages/api/README.md

@@ -43,7 +43,7 @@
     "@types/ws": "^8.18.1",
     "@typescript-eslint/eslint-plugin": "^8.59.3",
     "@typescript-eslint/parser": "^8.59.3",
-    "eslint": "^10.3.0",
+    "eslint": "^10.4.0",
     "fast-check": "4.8.0",
     "globals": "^17.6.0",
     "typescript": "^6.0.3",

packages/api/package.json

@@ -1,6 +1,6 @@
 export type ProjectStatus = "running" | "stopped" | "unknown"
 
-export type AgentProvider = "codex" | "opencode" | "claude" | "custom"
+export type AgentProvider = "codex" | "opencode" | "claude" | "grok" | "custom"
 
 export type AgentStatus = "starting" | "running" | "stopping" | "stopped" | "exited" | "failed"
 
@@ -74,6 +74,23 @@ export type ProjectPortForwardRequest = {
   readonly hostPort?: number | undefined
 }
 
+export type PanelCloudflareTunnelStatus = "starting" | "running" | "stopped" | "failed"
+
+export type PanelCloudflareTunnelSession = {
+  readonly error: string | null
+  readonly id: string
+  readonly logTail: ReadonlyArray<string>
+  readonly panelUrl: string
+  readonly publicUrl: string | null
+  readonly startedAt: string
+  readonly status: PanelCloudflareTunnelStatus
+  readonly stoppedAt: string | null
+}
+
+export type StartPanelCloudflareTunnelRequest = {
+  readonly panelUrl: string
+}
+
 export type ProjectBrowserStatus = "running" | "stopped" | "missing" | "unknown"
 
 export type ProjectBrowserSession = {
@@ -183,19 +200,23 @@ export type AuthMenuFlow =
   | "ClaudeLogout"
   | "GeminiApiKey"
   | "GeminiLogout"
+  | "GrokApiKey"
+  | "GrokLogout"
 
-export type AuthTerminalFlow = "ClaudeOauth" | "GeminiOauth"
+export type AuthTerminalFlow = "ClaudeOauth" | "GeminiOauth" | "GrokOauth"
 
 export type AuthSnapshot = {
   readonly globalEnvPath: string
   readonly claudeAuthPath: string
   readonly geminiAuthPath: string
+  readonly grokAuthPath: string
   readonly totalEntries: number
   readonly githubTokenEntries: number
   readonly gitTokenEntries: number
   readonly gitUserEntries: number
   readonly claudeAuthEntries: number
   readonly geminiAuthEntries: number
+  readonly grokAuthEntries: number
 }
 
 export type AuthMenuRequest = {
@@ -249,6 +270,8 @@ export type ProjectAuthFlow =
   | "ProjectClaudeDisconnect"
   | "ProjectGeminiConnect"
   | "ProjectGeminiDisconnect"
+  | "ProjectGrokConnect"
+  | "ProjectGrokDisconnect"
 
 export type ProjectAuthSnapshot = {
   readonly projectDir: string
@@ -257,22 +280,25 @@ export type ProjectAuthSnapshot = {
   readonly envProjectPath: string
   readonly claudeAuthPath: string
   readonly geminiAuthPath: string
+  readonly grokAuthPath: string
   readonly githubTokenEntries: number
   readonly gitTokenEntries: number
   readonly claudeAuthEntries: number
   readonly geminiAuthEntries: number
+  readonly grokAuthEntries: number
   readonly activeGithubLabel: string | null
   readonly activeGitLabel: string | null
   readonly activeClaudeLabel: string | null
   readonly activeGeminiLabel: string | null
+  readonly activeGrokLabel: string | null
 }
 
 export type ProjectAuthRequest = {
   readonly flow: ProjectAuthFlow
   readonly label?: string | null | undefined
 }
 
-export type ProjectPromptKind = "claude" | "codex" | "gemini"
+export type ProjectPromptKind = "claude" | "codex" | "gemini" | "grok"
 
 export type ProjectPromptFile = {
   readonly kind: ProjectPromptKind
@@ -302,6 +328,7 @@ export type ProjectSkillScope =
   | "claude/skills"
   | "codex/skills"
   | "gemini/skills"
+  | "grok/skills"
 
 export type ProjectSkillFile = {
   readonly id: string
@@ -357,6 +384,10 @@ export type UpProjectRequest = {
 }
 
 export type ApplyProjectRequest = {
+  readonly cpuLimit?: string | undefined
+  readonly ramLimit?: string | undefined
+  readonly playwrightCpuLimit?: string | undefined
+  readonly playwrightRamLimit?: string | undefined
   readonly gpu?: "none" | "all" | undefined
 }
 
@@ -385,6 +416,8 @@ export type CreateProjectRequest = {
   readonly codexHome?: string | undefined
   readonly cpuLimit?: string | undefined
   readonly ramLimit?: string | undefined
+  readonly playwrightCpuLimit?: string | undefined
+  readonly playwrightRamLimit?: string | undefined
   readonly gpu?: "none" | "all" | undefined
   readonly dockerNetworkMode?: string | undefined
   readonly dockerSharedNetworkName?: string | undefined
@@ -394,6 +427,8 @@ export type CreateProjectRequest = {
   readonly skipGithubAuth?: boolean | undefined
   readonly codexTokenLabel?: string | undefined
   readonly claudeTokenLabel?: string | undefined
+  readonly geminiTokenLabel?: string | undefined
+  readonly grokTokenLabel?: string | undefined
   readonly agentAutoMode?: string | undefined
   readonly up?: boolean | undefined
   readonly openSsh?: boolean | undefined

packages/api/src/api/contracts.ts

@@ -23,6 +23,8 @@ export const CreateProjectRequestSchema = Schema.Struct({
   codexHome: OptionalString,
   cpuLimit: OptionalString,
   ramLimit: OptionalString,
+  playwrightCpuLimit: OptionalString,
+  playwrightRamLimit: OptionalString,
   gpu: Schema.optional(Schema.Literal("none", "all")),
   dockerNetworkMode: OptionalString,
   dockerSharedNetworkName: OptionalString,
@@ -32,6 +34,8 @@ export const CreateProjectRequestSchema = Schema.Struct({
   skipGithubAuth: OptionalBoolean,
   codexTokenLabel: OptionalString,
   claudeTokenLabel: OptionalString,
+  geminiTokenLabel: OptionalString,
+  grokTokenLabel: OptionalString,
   agentAutoMode: OptionalString,
   up: OptionalBoolean,
   openSsh: OptionalBoolean,
@@ -58,10 +62,12 @@ export const AuthMenuFlowSchema = Schema.Literal(
   "GitRemove",
   "ClaudeLogout",
   "GeminiApiKey",
-  "GeminiLogout"
+  "GeminiLogout",
+  "GrokApiKey",
+  "GrokLogout"
 )
 
-export const AuthTerminalFlowSchema = Schema.Literal("ClaudeOauth", "GeminiOauth")
+export const AuthTerminalFlowSchema = Schema.Literal("ClaudeOauth", "GeminiOauth", "GrokOauth")
 
 export const AuthMenuRequestSchema = Schema.Struct({
   flow: AuthMenuFlowSchema,
@@ -105,15 +111,17 @@ export const ProjectAuthFlowSchema = Schema.Literal(
   "ProjectClaudeConnect",
   "ProjectClaudeDisconnect",
   "ProjectGeminiConnect",
-  "ProjectGeminiDisconnect"
+  "ProjectGeminiDisconnect",
+  "ProjectGrokConnect",
+  "ProjectGrokDisconnect"
 )
 
 export const ProjectAuthRequestSchema = Schema.Struct({
   flow: ProjectAuthFlowSchema,
   label: OptionalNullableString
 })
 
-export const ProjectPromptKindSchema = Schema.Literal("claude", "codex", "gemini")
+export const ProjectPromptKindSchema = Schema.Literal("claude", "codex", "gemini", "grok")
 
 export const ProjectPromptUpdateRequestSchema = Schema.Struct({
   content: Schema.String
@@ -125,7 +133,8 @@ export const ProjectSkillScopeSchema = Schema.Literal(
   "agents/.skills",
   "claude/skills",
   "codex/skills",
-  "gemini/skills"
+  "gemini/skills",
+  "grok/skills"
 )
 
 export const ProjectSkillUpdateRequestSchema = Schema.Struct({
@@ -152,6 +161,10 @@ export const ApplyAllRequestSchema = Schema.Struct({
 })
 
 export const ApplyProjectRequestSchema = Schema.Struct({
+  cpuLimit: OptionalString,
+  ramLimit: OptionalString,
+  playwrightCpuLimit: OptionalString,
+  playwrightRamLimit: OptionalString,
   gpu: Schema.optional(Schema.Literal("none", "all"))
 })
 
@@ -161,14 +174,22 @@ export const UpProjectRequestSchema = Schema.Struct({
 })
 
 export const StartProjectTerminalSessionRequestSchema = Schema.Struct({
-  requestId: Schema.String
+  requestId: Schema.UUID
+})
+
+export const ActiveProjectTerminalSessionRequestSchema = Schema.Struct({
+  sessionId: Schema.String
 })
 
 export const ProjectPortForwardRequestSchema = Schema.Struct({
   hostPort: Schema.optional(Schema.Number),
   targetPort: Schema.Number
 })
 
+export const StartPanelCloudflareTunnelRequestSchema = Schema.Struct({
+  panelUrl: Schema.String
+})
+
 export const ProjectBrowserStatusSchema = Schema.Literal("running", "stopped", "missing", "unknown")
 
 export const ProjectBrowserSessionSchema = Schema.Struct({
@@ -236,7 +257,7 @@ export const ProjectDatabaseForwardSchema = Schema.Struct({
   targetPort: Schema.Number
 })
 
-export const AgentProviderSchema = Schema.Literal("codex", "opencode", "claude", "custom")
+export const AgentProviderSchema = Schema.Literal("codex", "opencode", "claude", "grok", "custom")
 
 export const AgentEnvVarSchema = Schema.Struct({
   key: Schema.String,

packages/api/src/api/schema.ts

@@ -1,11 +1,16 @@
 import { NodeContext, NodeRuntime } from "@effect/platform-node"
-import { authClaudeLogin, authGeminiLoginOauth } from "@effect-template/lib"
+import { authClaudeLogin, authGeminiLoginOauth, authGrokLoginOauth } from "@effect-template/lib"
 import { Effect, Match } from "effect"
 
-type AuthTerminalRunnerFlow = "ClaudeOauth" | "GeminiOauth"
+type AuthTerminalRunnerFlow = "ClaudeOauth" | "GeminiOauth" | "GrokOauth"
 
-const parseFlow = (value: string | undefined): AuthTerminalRunnerFlow =>
-  value === "ClaudeOauth" || value === "GeminiOauth" ? value : "ClaudeOauth"
+const parseFlow = (value: string | undefined): AuthTerminalRunnerFlow => {
+  if (value === "ClaudeOauth" || value === "GeminiOauth" || value === "GrokOauth") {
+    return value
+  }
+  process.stderr.write(`Unsupported auth terminal flow: ${value ?? "<empty>"}\n`)
+  process.exit(2)
+}
 
 const parseLabel = (value: string | undefined): string | null => {
   const trimmed = value?.trim() ?? ""
@@ -29,6 +34,13 @@ const program = Match.value(flow).pipe(
       geminiAuthPath: ".docker-git/.orch/auth/gemini",
       isWeb: false
     })),
+  Match.when("GrokOauth", () =>
+    authGrokLoginOauth({
+      _tag: "AuthGrokLogin",
+      label,
+      grokAuthPath: ".docker-git/.orch/auth/grok",
+      isWeb: false
+    })),
   Match.exhaustive
 )