@prover-coder-ai/docker-git 1.0.34 → 1.0.36

package/dist/src/docker-git/main.js

@@ -1268,7 +1268,12 @@ const findKeyByPriority = (fs, path, cwd, spec) => Effect.gen(function* (_) {
       return fallback;
     }
   }
-  const home = resolveEnvPath("HOME");
+  const dockerGitHomeKey = path.join(defaultProjectsRoot(cwd), spec.devKeyName);
+  const dockerGitHomeExisting = yield* _(findExistingPath(fs, dockerGitHomeKey));
+  if (dockerGitHomeExisting !== null) {
+    return dockerGitHomeExisting;
+  }
+  const home = resolveHomeDir();
   if (home === null) {
     return null;
   }
@@ -1332,7 +1337,7 @@ const ensureDockerImage = (fs, path, cwd, spec) => Effect.gen(function* (_) {
   );
 });
 const ghAuthRoot = ".docker-git/.orch/auth/gh";
-const ghAuthDir = "/root/.config/gh";
+const ghAuthDir = "/gh-auth";
 const ghImageName = "docker-git-auth-gh:latest";
 const ghImageDir = ".docker-git/.orch/auth/gh/.image";
 const renderGhDockerfile = () => String.raw`FROM ubuntu:24.04
@@ -4124,8 +4129,39 @@ if [[ -z "$CDP_ENDPOINT" ]]; then
   CDP_ENDPOINT="http://__SERVICE_NAME__-browser:9223"
 fi
 
+# CHANGE: add retry logic for browser sidecar startup wait
+# WHY: the browser container may take time to initialize, causing MCP server to fail on first attempt
+# QUOTE(issue-123): "Почему MCP сервер лежит с ошибкой?"
+# REF: issue-123
+# SOURCE: n/a
+# FORMAT THEOREM: forall t in [1..max_attempts]: retry(t) -> eventually(cdp_ready) OR timeout_error
+# PURITY: SHELL
+# INVARIANT: script exits only after cdp_ready OR all retries exhausted
+# COMPLEXITY: O(max_attempts * timeout_per_attempt)
+MCP_PLAYWRIGHT_RETRY_ATTEMPTS="\${MCP_PLAYWRIGHT_RETRY_ATTEMPTS:-10}"
+MCP_PLAYWRIGHT_RETRY_DELAY="\${MCP_PLAYWRIGHT_RETRY_DELAY:-2}"
+
+fetch_cdp_version() {
+  curl -sSf --connect-timeout 3 --max-time 10 -H 'Host: 127.0.0.1:9222' "\${CDP_ENDPOINT%/}/json/version" 2>/dev/null
+}
+
+JSON=""
+for attempt in $(seq 1 "$MCP_PLAYWRIGHT_RETRY_ATTEMPTS"); do
+  if JSON="$(fetch_cdp_version)"; then
+    break
+  fi
+  if [[ "$attempt" -lt "$MCP_PLAYWRIGHT_RETRY_ATTEMPTS" ]]; then
+    echo "docker-git-playwright-mcp: waiting for browser sidecar (attempt $attempt/$MCP_PLAYWRIGHT_RETRY_ATTEMPTS)..." >&2
+    sleep "$MCP_PLAYWRIGHT_RETRY_DELAY"
+  fi
+done
+
+if [[ -z "$JSON" ]]; then
+  echo "docker-git-playwright-mcp: failed to connect to CDP endpoint $CDP_ENDPOINT after $MCP_PLAYWRIGHT_RETRY_ATTEMPTS attempts" >&2
+  exit 1
+fi
+
 # kechangdev/browser-vnc binds Chromium CDP on 127.0.0.1:9222; it also host-checks HTTP requests.
-JSON="$(curl -sSf --connect-timeout 3 --max-time 10 -H 'Host: 127.0.0.1:9222' "\${CDP_ENDPOINT%/}/json/version")"
 WS_URL="$(printf "%s" "$JSON" | node -e 'const fs=require("fs"); const j=JSON.parse(fs.readFileSync(0,"utf8")); process.stdout.write(j.webSocketDebuggerUrl || "")')"
 if [[ -z "$WS_URL" ]]; then
   echo "docker-git-playwright-mcp: webSocketDebuggerUrl missing" >&2
@@ -6717,7 +6753,7 @@ const authClaudeLogout = (command) => Effect.gen(function* (_) {
 }).pipe(Effect.asVoid);
 const codexImageName = "docker-git-auth-codex:latest";
 const codexImageDir = ".docker-git/.orch/auth/codex/.image";
-const codexHome = "/root/.codex";
+const codexHome = "/codex-home";
 const ensureCodexOrchLayout = (cwd, codexAuthPath) => migrateLegacyOrchLayout(cwd, {
   envGlobalPath: defaultTemplateConfig.envGlobalPath,
   envProjectPath: defaultTemplateConfig.envProjectPath,
@@ -6873,6 +6909,7 @@ const resolveGithubTokenFromGh = (cwd, accountPath) => runDockerAuthCapture(
     image: ghImageName,
     hostPath: accountPath,
     containerPath: ghAuthDir,
+    env: `GH_CONFIG_DIR=${ghAuthDir}`,
     args: ["auth", "token"],
     interactive: false
   }),
@@ -6891,7 +6928,7 @@ const runGithubLogin = (cwd, accountPath, scopes) => runDockerAuth(
     image: ghImageName,
     hostPath: accountPath,
     containerPath: ghAuthDir,
-    env: "BROWSER=echo",
+    env: ["BROWSER=echo", `GH_CONFIG_DIR=${ghAuthDir}`],
     args: [
       "auth",
       "login",
@@ -8459,6 +8496,8 @@ Container runtime env (set via .orch/env/project.env):
   DOCKER_GIT_ZSH_AUTOSUGGEST_STRATEGY=...  Suggestion sources (default: history completion)
   MCP_PLAYWRIGHT_ISOLATED=1|0           Isolated browser contexts (recommended for many Codex; default: 1)
   MCP_PLAYWRIGHT_CDP_ENDPOINT=http://...  Override CDP endpoint (default: http://dg-<repo>-browser:9223)
+  MCP_PLAYWRIGHT_RETRY_ATTEMPTS=<n>     Retry attempts for browser sidecar startup wait (default: 10)
+  MCP_PLAYWRIGHT_RETRY_DELAY=<seconds>  Delay between retry attempts (default: 2)
 
 Auth providers:
   github, gh         GitHub CLI auth (tokens saved to env file)