@prover-coder-ai/docker-git 1.0.30 → 1.0.32

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

@@ -361,6 +361,8 @@ class DockerAccessError extends Data.TaggedError("DockerAccessError") {
 }
 class CloneFailedError extends Data.TaggedError("CloneFailedError") {
 }
+class AgentFailedError extends Data.TaggedError("AgentFailedError") {
+}
 class PortProbeError extends Data.TaggedError("PortProbeError") {
 }
 class CommandFailedError extends Data.TaggedError("CommandFailedError") {
@@ -777,23 +779,26 @@ const renderDockerAccessActionPlan = (issue) => {
   ];
   return issue === "PermissionDenied" ? permissionDeniedPlan.join("\n") : daemonUnavailablePlan.join("\n");
 };
+const renderDockerCommandError = ({ exitCode }) => [
+  `docker compose failed with exit code ${exitCode}`,
+  "Hint: ensure Docker daemon is running and current user can access /var/run/docker.sock (for example via the docker group).",
+  "Hint: if output above contains 'port is already allocated', retry with a free SSH port via --ssh-port <port> (for example --ssh-port 2235), or stop the conflicting project/container.",
+  "Hint: if output above contains 'all predefined address pools have been fully subnetted', run `docker network prune -f`, configure Docker `default-address-pools`, or use shared network mode (`--network-mode shared`).",
+  "Hint: if output above contains 'lookup auth.docker.io' or 'read udp ... [::1]:53 ... connection refused', fix Docker DNS resolver (set working DNS in host/daemon config) and retry."
+].join("\n");
+const renderDockerAccessError = ({ details, issue }) => [
+  renderDockerAccessHeadline(issue),
+  "Hint: ensure Docker daemon is running and current user can access the docker socket.",
+  "Hint: if you use rootless Docker, set DOCKER_HOST to your user socket (for example unix:///run/user/$UID/docker.sock).",
+  renderDockerAccessActionPlan(issue),
+  `Details: ${details}`
+].join("\n");
 const renderPrimaryError = (error) => Match.value(error).pipe(
   Match.when({ _tag: "FileExistsError" }, ({ path }) => `File already exists: ${path} (use --force to overwrite)`),
-  Match.when({ _tag: "DockerCommandError" }, ({ exitCode }) => [
-    `docker compose failed with exit code ${exitCode}`,
-    "Hint: ensure Docker daemon is running and current user can access /var/run/docker.sock (for example via the docker group).",
-    "Hint: if output above contains 'port is already allocated', retry with a free SSH port via --ssh-port <port> (for example --ssh-port 2235), or stop the conflicting project/container.",
-    "Hint: if output above contains 'all predefined address pools have been fully subnetted', run `docker network prune -f`, configure Docker `default-address-pools`, or use shared network mode (`--network-mode shared`).",
-    "Hint: if output above contains 'lookup auth.docker.io' or 'read udp ... [::1]:53 ... connection refused', fix Docker DNS resolver (set working DNS in host/daemon config) and retry."
-  ].join("\n")),
-  Match.when({ _tag: "DockerAccessError" }, ({ details, issue }) => [
-    renderDockerAccessHeadline(issue),
-    "Hint: ensure Docker daemon is running and current user can access the docker socket.",
-    "Hint: if you use rootless Docker, set DOCKER_HOST to your user socket (for example unix:///run/user/$UID/docker.sock).",
-    renderDockerAccessActionPlan(issue),
-    `Details: ${details}`
-  ].join("\n")),
+  Match.when({ _tag: "DockerCommandError" }, renderDockerCommandError),
+  Match.when({ _tag: "DockerAccessError" }, renderDockerAccessError),
   Match.when({ _tag: "CloneFailedError" }, ({ repoRef, repoUrl, targetDir }) => `Clone failed for ${repoUrl} (${repoRef}) into ${targetDir}`),
+  Match.when({ _tag: "AgentFailedError" }, ({ agentMode, targetDir }) => `Agent (${agentMode}) failed in ${targetDir}`),
   Match.when({ _tag: "PortProbeError" }, ({ message, port }) => `SSH port check failed for ${port}: ${message}`),
   Match.when(
     { _tag: "CommandFailedError" },
@@ -846,6 +851,109 @@ const renderError = (error) => {
   }
   return renderNonParseError(error);
 };
+const resolveEnvValue = (key) => {
+  const value = process.env[key]?.trim();
+  return value && value.length > 0 ? value : null;
+};
+const trimTrailingSlash$1 = (value) => {
+  let end = value.length;
+  while (end > 0) {
+    const char = value[end - 1];
+    if (char !== "/" && char !== "\\") {
+      break;
+    }
+    end -= 1;
+  }
+  return value.slice(0, end);
+};
+const pathStartsWith = (candidate, prefix) => candidate === prefix || candidate.startsWith(`${prefix}/`) || candidate.startsWith(`${prefix}\\`);
+const translatePathPrefix = (candidate, sourcePrefix, targetPrefix) => pathStartsWith(candidate, sourcePrefix) ? `${targetPrefix}${candidate.slice(sourcePrefix.length)}` : null;
+const resolveContainerProjectsRoot = () => {
+  const explicit = resolveEnvValue("DOCKER_GIT_PROJECTS_ROOT");
+  if (explicit !== null) {
+    return explicit;
+  }
+  const home = resolveEnvValue("HOME") ?? resolveEnvValue("USERPROFILE");
+  return home === null ? null : `${trimTrailingSlash$1(home)}/.docker-git`;
+};
+const resolveProjectsRootHostOverride = () => resolveEnvValue("DOCKER_GIT_PROJECTS_ROOT_HOST");
+const resolveCurrentContainerId = (cwd) => {
+  const fromEnv = resolveEnvValue("HOSTNAME");
+  if (fromEnv !== null) {
+    return Effect.succeed(fromEnv);
+  }
+  return runCommandCapture(
+    {
+      cwd,
+      command: "hostname",
+      args: []
+    },
+    [0],
+    () => new Error("hostname failed")
+  ).pipe(
+    Effect.map((value) => value.trim()),
+    Effect.orElseSucceed(() => ""),
+    Effect.map((value) => value.length > 0 ? value : null)
+  );
+};
+const parseDockerInspectMounts = (raw) => raw.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0).flatMap((line) => {
+  const separator = line.indexOf("	");
+  if (separator <= 0 || separator >= line.length - 1) {
+    return [];
+  }
+  const source = line.slice(0, separator).trim();
+  const destination = line.slice(separator + 1).trim();
+  if (source.length === 0 || destination.length === 0) {
+    return [];
+  }
+  return [{ source, destination }];
+});
+const remapDockerBindHostPathFromMounts = (hostPath, mounts) => {
+  let match = null;
+  for (const mount of mounts) {
+    if (!pathStartsWith(hostPath, mount.destination)) {
+      continue;
+    }
+    if (match === null || mount.destination.length > match.destination.length) {
+      match = mount;
+    }
+  }
+  if (match === null) {
+    return hostPath;
+  }
+  return `${match.source}${hostPath.slice(match.destination.length)}`;
+};
+const resolveDockerVolumeHostPath = (cwd, hostPath) => Effect.gen(function* (_) {
+  const containerProjectsRoot = resolveContainerProjectsRoot();
+  const hostProjectsRoot = resolveProjectsRootHostOverride();
+  if (containerProjectsRoot !== null && hostProjectsRoot !== null) {
+    const remapped = translatePathPrefix(hostPath, containerProjectsRoot, hostProjectsRoot);
+    if (remapped !== null) {
+      return remapped;
+    }
+  }
+  const containerId = yield* _(resolveCurrentContainerId(cwd));
+  if (containerId === null) {
+    return hostPath;
+  }
+  const mountsJson = yield* _(
+    runCommandCapture(
+      {
+        cwd,
+        command: "docker",
+        args: [
+          "inspect",
+          containerId,
+          "--format",
+          String.raw`{{range .Mounts}}{{println .Source "\t" .Destination}}{{end}}`
+        ]
+      },
+      [0],
+      () => new Error("docker inspect current container failed")
+    ).pipe(Effect.orElseSucceed(() => ""))
+  );
+  return remapDockerBindHostPathFromMounts(hostPath, parseDockerInspectMounts(mountsJson));
+});
 const resolveDefaultDockerUser = () => {
   const getUid = Reflect.get(process, "getuid");
   const getGid = Reflect.get(process, "getgid");
@@ -893,17 +1001,44 @@ const buildDockerArgs = (spec) => {
   }
   return [...base, spec.image, ...spec.args];
 };
-const runDockerAuth = (spec, okExitCodes, onFailure) => runCommandWithExitCodes(
-  { cwd: spec.cwd, command: "docker", args: buildDockerArgs(spec) },
-  okExitCodes,
-  onFailure
-);
-const runDockerAuthCapture = (spec, okExitCodes, onFailure) => runCommandCapture(
-  { cwd: spec.cwd, command: "docker", args: buildDockerArgs(spec) },
-  okExitCodes,
-  onFailure
-);
-const runDockerAuthExitCode = (spec) => runCommandExitCode({ cwd: spec.cwd, command: "docker", args: buildDockerArgs(spec) });
+const runDockerAuth = (spec, okExitCodes, onFailure) => Effect.gen(function* (_) {
+  const hostPath = yield* _(resolveDockerVolumeHostPath(spec.cwd, spec.volume.hostPath));
+  yield* _(
+    runCommandWithExitCodes(
+      {
+        cwd: spec.cwd,
+        command: "docker",
+        args: buildDockerArgs({ ...spec, volume: { ...spec.volume, hostPath } })
+      },
+      okExitCodes,
+      onFailure
+    )
+  );
+});
+const runDockerAuthCapture = (spec, okExitCodes, onFailure) => Effect.gen(function* (_) {
+  const hostPath = yield* _(resolveDockerVolumeHostPath(spec.cwd, spec.volume.hostPath));
+  return yield* _(
+    runCommandCapture(
+      {
+        cwd: spec.cwd,
+        command: "docker",
+        args: buildDockerArgs({ ...spec, volume: { ...spec.volume, hostPath } })
+      },
+      okExitCodes,
+      onFailure
+    )
+  );
+});
+const runDockerAuthExitCode = (spec) => Effect.gen(function* (_) {
+  const hostPath = yield* _(resolveDockerVolumeHostPath(spec.cwd, spec.volume.hostPath));
+  return yield* _(
+    runCommandExitCode({
+      cwd: spec.cwd,
+      command: "docker",
+      args: buildDockerArgs({ ...spec, volume: { ...spec.volume, hostPath } })
+    })
+  );
+});
 const normalizeAccountLabel = (value, fallback) => {
   const trimmed = value?.trim() ?? "";
   if (trimmed.length === 0) {
@@ -2119,6 +2254,8 @@ GITHUB_TOKEN="\${GITHUB_TOKEN:-\${GH_TOKEN:-}}"
 GIT_USER_NAME="\${GIT_USER_NAME:-}"
 GIT_USER_EMAIL="\${GIT_USER_EMAIL:-}"
 CODEX_AUTO_UPDATE="\${CODEX_AUTO_UPDATE:-1}"
+AGENT_MODE="\${AGENT_MODE:-}"
+AGENT_AUTO="\${AGENT_AUTO:-}"
 MCP_PLAYWRIGHT_ENABLE="\${MCP_PLAYWRIGHT_ENABLE:-${config.enableMcpPlaywright ? "1" : "0"}}"
 MCP_PLAYWRIGHT_CDP_ENDPOINT="\${MCP_PLAYWRIGHT_CDP_ENDPOINT:-}"
 MCP_PLAYWRIGHT_ISOLATED="\${MCP_PLAYWRIGHT_ISOLATED:-1}"
@@ -2243,6 +2380,113 @@ EOF
 chmod 0644 "$DOCKER_GIT_SSHD_CONF" || true`;
 const renderEntrypointSshd = () => `# 5) Run sshd in foreground
 exec /usr/sbin/sshd -D`;
+const entrypointClaudeGlobalPromptTemplate = String.raw`# Claude Code: managed global memory (CLAUDE.md is auto-loaded by Claude Code)
+CLAUDE_GLOBAL_PROMPT_FILE="/home/__SSH_USER__/.claude/CLAUDE.md"
+CLAUDE_AUTO_SYSTEM_PROMPT="${"$"}{CLAUDE_AUTO_SYSTEM_PROMPT:-1}"
+CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: repository"
+REPO_REF_VALUE="${"$"}{REPO_REF:-__REPO_REF_DEFAULT__}"
+REPO_URL_VALUE="${"$"}{REPO_URL:-__REPO_URL_DEFAULT__}"
+
+if [[ "$REPO_REF_VALUE" == issue-* ]]; then
+  ISSUE_ID_VALUE="$(printf "%s" "$REPO_REF_VALUE" | sed -E 's#^issue-##')"
+  ISSUE_URL_VALUE=""
+  if [[ "$REPO_URL_VALUE" == https://github.com/* ]]; then
+    ISSUE_REPO_VALUE="$(printf "%s" "$REPO_URL_VALUE" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
+    if [[ -n "$ISSUE_REPO_VALUE" ]]; then
+      ISSUE_URL_VALUE="https://github.com/$ISSUE_REPO_VALUE/issues/$ISSUE_ID_VALUE"
+    fi
+  fi
+  if [[ -n "$ISSUE_URL_VALUE" ]]; then
+    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: issue #$ISSUE_ID_VALUE ($ISSUE_URL_VALUE)"
+  else
+    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: issue #$ISSUE_ID_VALUE"
+  fi
+elif [[ "$REPO_REF_VALUE" == refs/pull/*/head ]]; then
+  PR_ID_VALUE="$(printf "%s" "$REPO_REF_VALUE" | sed -nE 's#^refs/pull/([0-9]+)/head$#\1#p')"
+  PR_URL_VALUE=""
+  if [[ "$REPO_URL_VALUE" == https://github.com/* && -n "$PR_ID_VALUE" ]]; then
+    PR_REPO_VALUE="$(printf "%s" "$REPO_URL_VALUE" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
+    if [[ -n "$PR_REPO_VALUE" ]]; then
+      PR_URL_VALUE="https://github.com/$PR_REPO_VALUE/pull/$PR_ID_VALUE"
+    fi
+  fi
+  if [[ -n "$PR_ID_VALUE" && -n "$PR_URL_VALUE" ]]; then
+    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: PR #$PR_ID_VALUE ($PR_URL_VALUE)"
+  elif [[ -n "$PR_ID_VALUE" ]]; then
+    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: PR #$PR_ID_VALUE"
+  else
+    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: pull request ($REPO_REF_VALUE)"
+  fi
+fi
+
+if [[ "$CLAUDE_AUTO_SYSTEM_PROMPT" == "1" ]]; then
+  mkdir -p "$(dirname "$CLAUDE_GLOBAL_PROMPT_FILE")"
+  chown 1000:1000 "$(dirname "$CLAUDE_GLOBAL_PROMPT_FILE")" 2>/dev/null || true
+  if [[ ! -f "$CLAUDE_GLOBAL_PROMPT_FILE" ]] || grep -q "^<!-- docker-git-managed:claude-md -->$" "$CLAUDE_GLOBAL_PROMPT_FILE"; then
+    cat <<EOF > "$CLAUDE_GLOBAL_PROMPT_FILE"
+<!-- docker-git-managed:claude-md -->
+Ты автономный агент, который имеет полностью все права управления контейнером. У тебя есть доступ к командам sudo, gh, codex, opencode, oh-my-opencode, claude, git, node, pnpm и всем остальным другим. Проекты с которыми идёт работа лежат по пути ~
+Рабочая папка проекта (git clone): __TARGET_DIR__
+Доступные workspace пути: __TARGET_DIR__
+$CLAUDE_WORKSPACE_CONTEXT
+Фокус задачи: работай только в workspace, который запрашивает пользователь. Текущий workspace: __TARGET_DIR__
+Доступ к интернету: есть. Если чего-то не знаешь — ищи в интернете или по кодовой базе.
+Если ты видишь файлы AGENTS.md или CLAUDE.md внутри проекта, ты обязан их читать и соблюдать инструкции.
+<!-- /docker-git-managed:claude-md -->
+EOF
+    chmod 0644 "$CLAUDE_GLOBAL_PROMPT_FILE" || true
+    chown 1000:1000 "$CLAUDE_GLOBAL_PROMPT_FILE" || true
+  fi
+fi
+
+export CLAUDE_AUTO_SYSTEM_PROMPT`;
+const escapeForDoubleQuotes$1 = (value) => {
+  const backslash = String.fromCodePoint(92);
+  const quote = String.fromCodePoint(34);
+  const escapedBackslash = `${backslash}${backslash}`;
+  const escapedQuote = `${backslash}${quote}`;
+  return value.replaceAll(backslash, escapedBackslash).replaceAll(quote, escapedQuote);
+};
+const renderClaudeGlobalPromptSetup = (config) => entrypointClaudeGlobalPromptTemplate.replaceAll("__TARGET_DIR__", config.targetDir).replaceAll("__SSH_USER__", config.sshUser).replaceAll("__REPO_REF_DEFAULT__", escapeForDoubleQuotes$1(config.repoRef)).replaceAll("__REPO_URL_DEFAULT__", escapeForDoubleQuotes$1(config.repoUrl));
+const renderClaudeWrapperSetup = () => String.raw`CLAUDE_WRAPPER_BIN="/usr/local/bin/claude"
+if command -v claude >/dev/null 2>&1; then
+  CURRENT_CLAUDE_BIN="$(command -v claude)"
+  CLAUDE_REAL_DIR="$(dirname "$CURRENT_CLAUDE_BIN")"
+  CLAUDE_REAL_BIN="$CLAUDE_REAL_DIR/.docker-git-claude-real"
+
+  # If a wrapper already exists but points to a missing real binary, recover from /usr/bin.
+  if [[ "$CURRENT_CLAUDE_BIN" == "$CLAUDE_WRAPPER_BIN" && ! -e "$CLAUDE_REAL_BIN" && -x "/usr/bin/claude" ]]; then
+    CURRENT_CLAUDE_BIN="/usr/bin/claude"
+    CLAUDE_REAL_DIR="/usr/bin"
+    CLAUDE_REAL_BIN="$CLAUDE_REAL_DIR/.docker-git-claude-real"
+  fi
+
+  # Keep the "real" binary in the same directory as the original command to preserve relative symlinks.
+  if [[ "$CURRENT_CLAUDE_BIN" != "$CLAUDE_REAL_BIN" && ! -e "$CLAUDE_REAL_BIN" ]]; then
+    mv "$CURRENT_CLAUDE_BIN" "$CLAUDE_REAL_BIN"
+  fi
+  if [[ -e "$CLAUDE_REAL_BIN" ]]; then
+    cat <<'EOF' > "$CLAUDE_WRAPPER_BIN"
+#!/usr/bin/env bash
+set -euo pipefail
+
+CLAUDE_REAL_BIN="__CLAUDE_REAL_BIN__"
+CLAUDE_CONFIG_DIR="${"$"}{CLAUDE_CONFIG_DIR:-$HOME/.claude}"
+CLAUDE_TOKEN_FILE="$CLAUDE_CONFIG_DIR/.oauth-token"
+
+if [[ -f "$CLAUDE_TOKEN_FILE" ]]; then
+  CLAUDE_CODE_OAUTH_TOKEN="$(tr -d '\r\n' < "$CLAUDE_TOKEN_FILE")"
+  export CLAUDE_CODE_OAUTH_TOKEN
+else
+  unset CLAUDE_CODE_OAUTH_TOKEN || true
+fi
+
+exec "$CLAUDE_REAL_BIN" "$@"
+EOF
+    sed -i "s#__CLAUDE_REAL_BIN__#$CLAUDE_REAL_BIN#g" "$CLAUDE_WRAPPER_BIN" || true
+    chmod 0755 "$CLAUDE_WRAPPER_BIN" || true
+  fi
+fi`;
 const claudeAuthRootContainerPath = (sshUser) => `/home/${sshUser}/.docker-git/.orch/auth/claude`;
 const claudeAuthConfigTemplate = String.raw`# Claude Code: expose CLAUDE_CONFIG_DIR for SSH sessions (OAuth cache lives under ~/.docker-git/.orch/auth/claude)
 CLAUDE_LABEL_RAW="$CLAUDE_AUTH_LABEL"
@@ -2275,6 +2519,17 @@ mkdir -p "$CLAUDE_CONFIG_DIR" || true
 CLAUDE_HOME_DIR="__CLAUDE_HOME_DIR__"
 CLAUDE_HOME_JSON="__CLAUDE_HOME_JSON__"
 mkdir -p "$CLAUDE_HOME_DIR" || true
+CLAUDE_TOKEN_FILE="$CLAUDE_CONFIG_DIR/.oauth-token"
+CLAUDE_CREDENTIALS_FILE="$CLAUDE_CONFIG_DIR/.credentials.json"
+CLAUDE_NESTED_CREDENTIALS_FILE="$CLAUDE_CONFIG_DIR/.claude/.credentials.json"
+
+docker_git_prepare_claude_auth_mode() {
+  if [[ -s "$CLAUDE_TOKEN_FILE" ]]; then
+    rm -f "$CLAUDE_CREDENTIALS_FILE" "$CLAUDE_NESTED_CREDENTIALS_FILE" "$CLAUDE_HOME_DIR/.credentials.json" || true
+  fi
+}
+
+docker_git_prepare_claude_auth_mode
 
 docker_git_link_claude_file() {
   local source_path="$1"
@@ -2302,17 +2557,13 @@ docker_git_link_claude_home_file() {
 docker_git_link_claude_home_file ".oauth-token"
 docker_git_link_claude_home_file ".config.json"
 docker_git_link_claude_home_file ".claude.json"
-docker_git_link_claude_home_file ".credentials.json"
+if [[ ! -s "$CLAUDE_TOKEN_FILE" ]]; then
+  docker_git_link_claude_home_file ".credentials.json"
+fi
 docker_git_link_claude_file "$CLAUDE_CONFIG_DIR/.claude.json" "$CLAUDE_HOME_JSON"
 
-CLAUDE_TOKEN_FILE="$CLAUDE_CONFIG_DIR/.oauth-token"
-CLAUDE_CREDENTIALS_FILE="$CLAUDE_CONFIG_DIR/.credentials.json"
 docker_git_refresh_claude_oauth_token() {
   local token=""
-  if [[ -s "$CLAUDE_CREDENTIALS_FILE" ]]; then
-    unset CLAUDE_CODE_OAUTH_TOKEN || true
-    return 0
-  fi
   if [[ -f "$CLAUDE_TOKEN_FILE" ]]; then
     token="$(tr -d '\r\n' < "$CLAUDE_TOKEN_FILE")"
   fi
@@ -2366,6 +2617,51 @@ EOF
 }
 
 docker_git_ensure_claude_cli`;
+const renderClaudePermissionSettingsConfig = () => String.raw`# Claude Code: keep permission settings in sync with docker-git defaults
+CLAUDE_PERMISSION_SETTINGS_FILE="$CLAUDE_CONFIG_DIR/settings.json"
+docker_git_sync_claude_permissions() {
+  CLAUDE_PERMISSION_SETTINGS_FILE="$CLAUDE_PERMISSION_SETTINGS_FILE" node - <<'NODE'
+const fs = require("node:fs")
+const path = require("node:path")
+
+const settingsPath = process.env.CLAUDE_PERMISSION_SETTINGS_FILE
+if (typeof settingsPath !== "string" || settingsPath.length === 0) {
+  process.exit(0)
+}
+
+const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value)
+
+let settings = {}
+try {
+  const raw = fs.readFileSync(settingsPath, "utf8")
+  const parsed = JSON.parse(raw)
+  settings = isRecord(parsed) ? parsed : {}
+} catch {
+  settings = {}
+}
+
+const currentPermissions = isRecord(settings.permissions) ? settings.permissions : {}
+const nextPermissions = {
+  ...currentPermissions,
+  defaultMode: "bypassPermissions"
+}
+const nextSettings = {
+  ...settings,
+  permissions: nextPermissions
+}
+
+if (JSON.stringify(settings) === JSON.stringify(nextSettings)) {
+  process.exit(0)
+}
+
+fs.mkdirSync(path.dirname(settingsPath), { recursive: true })
+fs.writeFileSync(settingsPath, JSON.stringify(nextSettings, null, 2) + "\n", { mode: 0o600 })
+NODE
+}
+
+docker_git_sync_claude_permissions
+chmod 0600 "$CLAUDE_PERMISSION_SETTINGS_FILE" 2>/dev/null || true
+chown 1000:1000 "$CLAUDE_PERMISSION_SETTINGS_FILE" 2>/dev/null || true`;
 const renderClaudeMcpPlaywrightConfig = () => String.raw`# Claude Code: keep Playwright MCP config in sync with container settings
 CLAUDE_SETTINGS_FILE="${"$"}{CLAUDE_HOME_JSON:-$CLAUDE_CONFIG_DIR/.claude.json}"
 docker_git_sync_claude_playwright_mcp() {
@@ -2417,130 +2713,17 @@ if (JSON.stringify(settings) === JSON.stringify(nextSettings)) {
 fs.mkdirSync(path.dirname(settingsPath), { recursive: true })
 fs.writeFileSync(settingsPath, JSON.stringify(nextSettings, null, 2) + "\n", { mode: 0o600 })
 NODE
-}
-
-docker_git_sync_claude_playwright_mcp
-chown 1000:1000 "$CLAUDE_SETTINGS_FILE" 2>/dev/null || true`;
-const entrypointClaudeGlobalPromptTemplate = String.raw`# Claude Code: managed global memory (CLAUDE.md is auto-loaded by Claude Code)
-CLAUDE_GLOBAL_PROMPT_FILE="/home/__SSH_USER__/.claude/CLAUDE.md"
-CLAUDE_AUTO_SYSTEM_PROMPT="${"$"}{CLAUDE_AUTO_SYSTEM_PROMPT:-1}"
-CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: repository"
-REPO_REF_VALUE="${"$"}{REPO_REF:-__REPO_REF_DEFAULT__}"
-REPO_URL_VALUE="${"$"}{REPO_URL:-__REPO_URL_DEFAULT__}"
-
-if [[ "$REPO_REF_VALUE" == issue-* ]]; then
-  ISSUE_ID_VALUE="$(printf "%s" "$REPO_REF_VALUE" | sed -E 's#^issue-##')"
-  ISSUE_URL_VALUE=""
-  if [[ "$REPO_URL_VALUE" == https://github.com/* ]]; then
-    ISSUE_REPO_VALUE="$(printf "%s" "$REPO_URL_VALUE" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
-    if [[ -n "$ISSUE_REPO_VALUE" ]]; then
-      ISSUE_URL_VALUE="https://github.com/$ISSUE_REPO_VALUE/issues/$ISSUE_ID_VALUE"
-    fi
-  fi
-  if [[ -n "$ISSUE_URL_VALUE" ]]; then
-    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: issue #$ISSUE_ID_VALUE ($ISSUE_URL_VALUE)"
-  else
-    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: issue #$ISSUE_ID_VALUE"
-  fi
-elif [[ "$REPO_REF_VALUE" == refs/pull/*/head ]]; then
-  PR_ID_VALUE="$(printf "%s" "$REPO_REF_VALUE" | sed -nE 's#^refs/pull/([0-9]+)/head$#\1#p')"
-  PR_URL_VALUE=""
-  if [[ "$REPO_URL_VALUE" == https://github.com/* && -n "$PR_ID_VALUE" ]]; then
-    PR_REPO_VALUE="$(printf "%s" "$REPO_URL_VALUE" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
-    if [[ -n "$PR_REPO_VALUE" ]]; then
-      PR_URL_VALUE="https://github.com/$PR_REPO_VALUE/pull/$PR_ID_VALUE"
-    fi
-  fi
-  if [[ -n "$PR_ID_VALUE" && -n "$PR_URL_VALUE" ]]; then
-    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: PR #$PR_ID_VALUE ($PR_URL_VALUE)"
-  elif [[ -n "$PR_ID_VALUE" ]]; then
-    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: PR #$PR_ID_VALUE"
-  else
-    CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: pull request ($REPO_REF_VALUE)"
-  fi
-fi
-
-if [[ "$CLAUDE_AUTO_SYSTEM_PROMPT" == "1" ]]; then
-  mkdir -p "$(dirname "$CLAUDE_GLOBAL_PROMPT_FILE")"
-  chown 1000:1000 "$(dirname "$CLAUDE_GLOBAL_PROMPT_FILE")" 2>/dev/null || true
-  if [[ ! -f "$CLAUDE_GLOBAL_PROMPT_FILE" ]] || grep -q "^<!-- docker-git-managed:claude-md -->$" "$CLAUDE_GLOBAL_PROMPT_FILE"; then
-    cat <<EOF > "$CLAUDE_GLOBAL_PROMPT_FILE"
-<!-- docker-git-managed:claude-md -->
-Ты автономный агент, который имеет полностью все права управления контейнером. У тебя есть доступ к командам sudo, gh, codex, opencode, oh-my-opencode, claude, git, node, pnpm и всем остальным другим. Проекты с которыми идёт работа лежат по пути ~
-Рабочая папка проекта (git clone): __TARGET_DIR__
-Доступные workspace пути: __TARGET_DIR__
-$CLAUDE_WORKSPACE_CONTEXT
-Фокус задачи: работай только в workspace, который запрашивает пользователь. Текущий workspace: __TARGET_DIR__
-Доступ к интернету: есть. Если чего-то не знаешь — ищи в интернете или по кодовой базе.
-Если ты видишь файлы AGENTS.md или CLAUDE.md внутри проекта, ты обязан их читать и соблюдать инструкции.
-<!-- /docker-git-managed:claude-md -->
-EOF
-    chmod 0644 "$CLAUDE_GLOBAL_PROMPT_FILE" || true
-    chown 1000:1000 "$CLAUDE_GLOBAL_PROMPT_FILE" || true
-  fi
-fi
-
-export CLAUDE_AUTO_SYSTEM_PROMPT`;
-const escapeForDoubleQuotes$1 = (value) => {
-  const backslash = String.fromCodePoint(92);
-  const quote = String.fromCodePoint(34);
-  const escapedBackslash = `${backslash}${backslash}`;
-  const escapedQuote = `${backslash}${quote}`;
-  return value.replaceAll(backslash, escapedBackslash).replaceAll(quote, escapedQuote);
-};
-const renderClaudeGlobalPromptSetup = (config) => entrypointClaudeGlobalPromptTemplate.replaceAll("__TARGET_DIR__", config.targetDir).replaceAll("__SSH_USER__", config.sshUser).replaceAll("__REPO_REF_DEFAULT__", escapeForDoubleQuotes$1(config.repoRef)).replaceAll("__REPO_URL_DEFAULT__", escapeForDoubleQuotes$1(config.repoUrl));
-const renderClaudeWrapperSetup = () => String.raw`CLAUDE_WRAPPER_BIN="/usr/local/bin/claude"
-if command -v claude >/dev/null 2>&1; then
-  CURRENT_CLAUDE_BIN="$(command -v claude)"
-  CLAUDE_REAL_DIR="$(dirname "$CURRENT_CLAUDE_BIN")"
-  CLAUDE_REAL_BIN="$CLAUDE_REAL_DIR/.docker-git-claude-real"
-
-  # If a wrapper already exists but points to a missing real binary, recover from /usr/bin.
-  if [[ "$CURRENT_CLAUDE_BIN" == "$CLAUDE_WRAPPER_BIN" && ! -e "$CLAUDE_REAL_BIN" && -x "/usr/bin/claude" ]]; then
-    CURRENT_CLAUDE_BIN="/usr/bin/claude"
-    CLAUDE_REAL_DIR="/usr/bin"
-    CLAUDE_REAL_BIN="$CLAUDE_REAL_DIR/.docker-git-claude-real"
-  fi
-
-  # Keep the "real" binary in the same directory as the original command to preserve relative symlinks.
-  if [[ "$CURRENT_CLAUDE_BIN" != "$CLAUDE_REAL_BIN" && ! -e "$CLAUDE_REAL_BIN" ]]; then
-    mv "$CURRENT_CLAUDE_BIN" "$CLAUDE_REAL_BIN"
-  fi
-  if [[ -e "$CLAUDE_REAL_BIN" ]]; then
-    cat <<'EOF' > "$CLAUDE_WRAPPER_BIN"
-#!/usr/bin/env bash
-set -euo pipefail
-
-CLAUDE_REAL_BIN="__CLAUDE_REAL_BIN__"
-CLAUDE_CONFIG_DIR="${"$"}{CLAUDE_CONFIG_DIR:-$HOME/.claude}"
-CLAUDE_TOKEN_FILE="$CLAUDE_CONFIG_DIR/.oauth-token"
-CLAUDE_CREDENTIALS_FILE="$CLAUDE_CONFIG_DIR/.credentials.json"
-
-if [[ -s "$CLAUDE_CREDENTIALS_FILE" ]]; then
-  unset CLAUDE_CODE_OAUTH_TOKEN || true
-elif [[ -f "$CLAUDE_TOKEN_FILE" ]]; then
-  CLAUDE_CODE_OAUTH_TOKEN="$(tr -d '\r\n' < "$CLAUDE_TOKEN_FILE")"
-  export CLAUDE_CODE_OAUTH_TOKEN
-else
-  unset CLAUDE_CODE_OAUTH_TOKEN || true
-fi
+}
 
-exec "$CLAUDE_REAL_BIN" "$@"
-EOF
-    sed -i "s#__CLAUDE_REAL_BIN__#$CLAUDE_REAL_BIN#g" "$CLAUDE_WRAPPER_BIN" || true
-    chmod 0755 "$CLAUDE_WRAPPER_BIN" || true
-  fi
-fi`;
+docker_git_sync_claude_playwright_mcp
+chown 1000:1000 "$CLAUDE_SETTINGS_FILE" 2>/dev/null || true`;
 const renderClaudeProfileSetup = () => String.raw`CLAUDE_PROFILE="/etc/profile.d/claude-config.sh"
 printf "export CLAUDE_AUTH_LABEL=%q\n" "$CLAUDE_AUTH_LABEL" > "$CLAUDE_PROFILE"
 printf "export CLAUDE_CONFIG_DIR=%q\n" "$CLAUDE_CONFIG_DIR" >> "$CLAUDE_PROFILE"
 printf "export CLAUDE_AUTO_SYSTEM_PROMPT=%q\n" "$CLAUDE_AUTO_SYSTEM_PROMPT" >> "$CLAUDE_PROFILE"
 cat <<'EOF' >> "$CLAUDE_PROFILE"
 CLAUDE_TOKEN_FILE="${"$"}{CLAUDE_CONFIG_DIR:-$HOME/.claude}/.oauth-token"
-CLAUDE_CREDENTIALS_FILE="${"$"}{CLAUDE_CONFIG_DIR:-$HOME/.claude}/.credentials.json"
-if [[ -s "$CLAUDE_CREDENTIALS_FILE" ]]; then
-  unset CLAUDE_CODE_OAUTH_TOKEN || true
-elif [[ -f "$CLAUDE_TOKEN_FILE" ]]; then
+if [[ -f "$CLAUDE_TOKEN_FILE" ]]; then
   export CLAUDE_CODE_OAUTH_TOKEN="$(tr -d '\r\n' < "$CLAUDE_TOKEN_FILE")"
 else
   unset CLAUDE_CODE_OAUTH_TOKEN || true
@@ -2555,6 +2738,7 @@ docker_git_upsert_ssh_env "CLAUDE_AUTO_SYSTEM_PROMPT" "$CLAUDE_AUTO_SYSTEM_PROMP
 const renderEntrypointClaudeConfig = (config) => [
   renderClaudeAuthConfig(config),
   renderClaudeCliInstall(),
+  renderClaudePermissionSettingsConfig(),
   renderClaudeMcpPlaywrightConfig(),
   renderClaudeGlobalPromptSetup(config),
   renderClaudeWrapperSetup(),
@@ -3391,6 +3575,164 @@ EOF
   chown 1000:1000 "$OPENCODE_CONFIG_JSON" || true
 fi`;
 const renderEntrypointOpenCodeConfig = (config) => entrypointOpenCodeTemplate.replaceAll("__SSH_USER__", config.sshUser).replaceAll("__CODEX_HOME__", config.codexHome);
+const indentBlock = (block, size = 2) => {
+  const prefix = " ".repeat(size);
+  return block.split("\n").map((line) => `${prefix}${line}`).join("\n");
+};
+const renderAgentPrompt = () => String.raw`AGENT_PROMPT=""
+ISSUE_NUM=""
+if [[ "$REPO_REF" =~ ^issue-([0-9]+)$ ]]; then
+  ISSUE_NUM="${"${"}BASH_REMATCH[1]}"
+fi
+
+if [[ "$AGENT_AUTO" == "1" ]]; then
+  if [[ -n "$ISSUE_NUM" ]]; then
+    AGENT_PROMPT="Read GitHub issue #$ISSUE_NUM for this repository (use gh issue view $ISSUE_NUM). Implement the requested changes, commit them, create a PR that closes #$ISSUE_NUM, and push it."
+  else
+    AGENT_PROMPT="Analyze this repository, implement any pending tasks, commit changes, create a PR, and push it."
+  fi
+fi`;
+const renderAgentSetup = () => [
+  String.raw`AGENT_DONE_PATH="/run/docker-git/agent.done"
+AGENT_FAIL_PATH="/run/docker-git/agent.failed"
+AGENT_PROMPT_FILE="/run/docker-git/agent-prompt.txt"
+rm -f "$AGENT_DONE_PATH" "$AGENT_FAIL_PATH" "$AGENT_PROMPT_FILE"`,
+  String.raw`# Collect tokens for agent environment (su - dev does not always inherit profile.d)
+AGENT_ENV_FILE="/run/docker-git/agent-env.sh"
+{
+  [[ -f /etc/profile.d/gh-token.sh ]] && cat /etc/profile.d/gh-token.sh
+  [[ -f /etc/profile.d/claude-config.sh ]] && cat /etc/profile.d/claude-config.sh
+} > "$AGENT_ENV_FILE" 2>/dev/null || true
+chmod 644 "$AGENT_ENV_FILE"`,
+  renderAgentPrompt(),
+  String.raw`AGENT_OK=0
+if [[ -n "$AGENT_PROMPT" ]]; then
+  printf "%s" "$AGENT_PROMPT" > "$AGENT_PROMPT_FILE"
+  chmod 644 "$AGENT_PROMPT_FILE"
+fi`
+].join("\n\n");
+const renderAgentPromptCommand = (mode) => mode === "claude" ? String.raw`claude --dangerously-skip-permissions -p \"\$(cat $AGENT_PROMPT_FILE)\"` : String.raw`codex --approval-mode full-auto \"\$(cat $AGENT_PROMPT_FILE)\"`;
+const renderAgentModeBlock = (config, mode) => {
+  const startMessage = `[agent] starting ${mode}...`;
+  const interactiveMessage = `[agent] ${mode} started in interactive mode (use SSH to connect)`;
+  return String.raw`"${mode}")
+  echo "${startMessage}"
+  if [[ -n "$AGENT_PROMPT" ]]; then
+    if su - ${config.sshUser} \
+      -c ". /run/docker-git/agent-env.sh 2>/dev/null; cd '$TARGET_DIR' && ${renderAgentPromptCommand(mode)}"; then
+      AGENT_OK=1
+    fi
+  else
+    echo "${interactiveMessage}"
+    AGENT_OK=1
+  fi
+  ;;`;
+};
+const renderAgentModeCase = (config) => [
+  String.raw`case "$AGENT_MODE" in`,
+  indentBlock(renderAgentModeBlock(config, "claude")),
+  indentBlock(renderAgentModeBlock(config, "codex")),
+  indentBlock(
+    String.raw`*)
+  echo "[agent] unknown agent mode: $AGENT_MODE"
+  ;;`
+  ),
+  "esac"
+].join("\n");
+const renderAgentIssueComment = (config) => String.raw`echo "[agent] posting review comment to issue #$ISSUE_NUM..."
+
+PR_BODY=""
+PR_BODY=$(su - ${config.sshUser} -c ". /run/docker-git/agent-env.sh 2>/dev/null; cd '$TARGET_DIR' && gh pr list --head '$REPO_REF' --json body --jq '.[0].body'" 2>/dev/null) || true
+
+if [[ -z "$PR_BODY" ]]; then
+  PR_BODY=$(su - ${config.sshUser} -c ". /run/docker-git/agent-env.sh 2>/dev/null; cd '$TARGET_DIR' && git log --format='%B' -1" 2>/dev/null) || true
+fi
+
+if [[ -n "$PR_BODY" ]]; then
+  COMMENT_FILE="/run/docker-git/agent-comment.txt"
+  printf "%s" "$PR_BODY" > "$COMMENT_FILE"
+  chmod 644 "$COMMENT_FILE"
+  su - ${config.sshUser} -c ". /run/docker-git/agent-env.sh 2>/dev/null; cd '$TARGET_DIR' && gh issue comment '$ISSUE_NUM' --body-file '$COMMENT_FILE'" || echo "[agent] failed to comment on issue #$ISSUE_NUM"
+else
+  echo "[agent] no PR body or commit message found, skipping comment"
+fi`;
+const renderProjectMoveScript = () => String.raw`#!/bin/bash
+. /run/docker-git/agent-env.sh 2>/dev/null || true
+cd "$1" || exit 1
+ISSUE_NUM="$2"
+
+ISSUE_NODE_ID=$(gh issue view "$ISSUE_NUM" --json id --jq '.id' 2>/dev/null) || true
+if [[ -z "$ISSUE_NODE_ID" ]]; then
+  echo "[agent] could not get issue node ID, skipping move"
+  exit 0
+fi
+
+GQL_QUERY='query($nodeId: ID!) { node(id: $nodeId) { ... on Issue { projectItems(first: 1) { nodes { id project { id field(name: "Status") { ... on ProjectV2SingleSelectField { id options { id name } } } } } } } } }'
+ALL_IDS=$(gh api graphql -F nodeId="$ISSUE_NODE_ID" -f query="$GQL_QUERY" \
+  --jq '(.data.node.projectItems.nodes // [])[0] // empty | [.id, .project.id, .project.field.id, ([.project.field.options[] | select(.name | test("review"; "i"))][0].id)] | @tsv' 2>/dev/null) || true
+
+if [[ -z "$ALL_IDS" ]]; then
+  echo "[agent] issue #$ISSUE_NUM is not in a project board, skipping move"
+  exit 0
+fi
+
+ITEM_ID=$(printf "%s" "$ALL_IDS" | cut -f1)
+PROJECT_ID=$(printf "%s" "$ALL_IDS" | cut -f2)
+STATUS_FIELD_ID=$(printf "%s" "$ALL_IDS" | cut -f3)
+REVIEW_OPTION_ID=$(printf "%s" "$ALL_IDS" | cut -f4)
+if [[ -z "$STATUS_FIELD_ID" || -z "$REVIEW_OPTION_ID" || "$STATUS_FIELD_ID" == "null" || "$REVIEW_OPTION_ID" == "null" ]]; then
+  echo "[agent] review status not found in project board, skipping move"
+  exit 0
+fi
+
+MUTATION='mutation($projectId: ID!, $itemId: ID!, $fieldId: ID!, $optionId: String!) { updateProjectV2ItemFieldValue(input: { projectId: $projectId, itemId: $itemId, fieldId: $fieldId, value: { singleSelectOptionId: $optionId } }) { projectV2Item { id } } }'
+MOVE_RESULT=$(gh api graphql \
+  -F projectId="$PROJECT_ID" \
+  -F itemId="$ITEM_ID" \
+  -F fieldId="$STATUS_FIELD_ID" \
+  -F optionId="$REVIEW_OPTION_ID" \
+  -f query="$MUTATION" 2>&1) || true
+
+if [[ "$MOVE_RESULT" == *"projectV2Item"* ]]; then
+  echo "[agent] issue #$ISSUE_NUM moved to review"
+else
+  echo "[agent] failed to move issue #$ISSUE_NUM in project board"
+fi`;
+const renderAgentIssueMove = (config) => [
+  String.raw`echo "[agent] moving issue #$ISSUE_NUM to review..."
+MOVE_SCRIPT="/run/docker-git/project-move.sh"`,
+  String.raw`cat > "$MOVE_SCRIPT" << 'EOFMOVE'
+${renderProjectMoveScript()}
+EOFMOVE`,
+  String.raw`chmod +x "$MOVE_SCRIPT"
+su - ${config.sshUser} -c "$MOVE_SCRIPT '$TARGET_DIR' '$ISSUE_NUM'" || true`
+].join("\n");
+const renderAgentIssueReview = (config) => [
+  String.raw`if [[ "$AGENT_OK" -eq 1 && "$AGENT_AUTO" == "1" && -n "$ISSUE_NUM" ]]; then`,
+  indentBlock(renderAgentIssueComment(config)),
+  "",
+  renderAgentIssueMove(config),
+  "fi"
+].join("\n");
+const renderAgentFinalize = () => String.raw`if [[ "$AGENT_OK" -eq 1 ]]; then
+  echo "[agent] done"
+  touch "$AGENT_DONE_PATH"
+else
+  echo "[agent] failed"
+  touch "$AGENT_FAIL_PATH"
+fi`;
+const renderAgentLaunch = (config) => [
+  String.raw`# 3) Auto-launch agent if AGENT_MODE is set
+if [[ "$CLONE_OK" -eq 1 && -n "$AGENT_MODE" ]]; then`,
+  indentBlock(renderAgentSetup()),
+  "",
+  indentBlock(renderAgentModeCase(config)),
+  "",
+  renderAgentIssueReview(config),
+  "",
+  indentBlock(renderAgentFinalize()),
+  "fi"
+].join("\n");
 const renderEntrypointAutoUpdate = () => `# 1) Keep Codex CLI up to date if requested (bun only)
 if [[ "$CODEX_AUTO_UPDATE" == "1" ]]; then
   if command -v bun >/dev/null 2>&1; then
@@ -3567,6 +3909,8 @@ const renderEntrypointBackgroundTasks = (config) => `# 4) Start background tasks
 ${renderEntrypointAutoUpdate()}
 
 ${renderEntrypointClone(config)}
+
+${renderAgentLaunch(config)}
 ) &`;
 const renderEntrypoint = (config) => [
   renderEntrypointHeader(config),
@@ -3602,6 +3946,10 @@ const renderCodexAuthLabelEnv = (codexAuthLabel) => codexAuthLabel.length > 0 ?
 ` : "";
 const renderClaudeAuthLabelEnv = (claudeAuthLabel) => claudeAuthLabel.length > 0 ? `      CLAUDE_AUTH_LABEL: "${claudeAuthLabel}"
 ` : "";
+const renderAgentModeEnv = (agentMode) => agentMode !== void 0 && agentMode.length > 0 ? `      AGENT_MODE: "${agentMode}"
+` : "";
+const renderAgentAutoEnv = (agentAuto) => agentAuto === true ? `      AGENT_AUTO: "1"
+` : "";
 const buildPlaywrightFragments = (config, networkName) => {
   if (!config.enableMcpPlaywright) {
     return {
@@ -3654,6 +4002,8 @@ const buildComposeFragments = (config) => {
   const maybeGitTokenLabelEnv = renderGitTokenLabelEnv(gitTokenLabel);
   const maybeCodexAuthLabelEnv = renderCodexAuthLabelEnv(codexAuthLabel);
   const maybeClaudeAuthLabelEnv = renderClaudeAuthLabelEnv(claudeAuthLabel);
+  const maybeAgentModeEnv = renderAgentModeEnv(config.agentMode);
+  const maybeAgentAutoEnv = renderAgentAutoEnv(config.agentAuto);
   const playwright = buildPlaywrightFragments(config, networkName);
   return {
     networkMode,
@@ -3661,6 +4011,8 @@ const buildComposeFragments = (config) => {
     maybeGitTokenLabelEnv,
     maybeCodexAuthLabelEnv,
     maybeClaudeAuthLabelEnv,
+    maybeAgentModeEnv,
+    maybeAgentAutoEnv,
     maybeDependsOn: playwright.maybeDependsOn,
     maybePlaywrightEnv: playwright.maybePlaywrightEnv,
     maybeBrowserService: playwright.maybeBrowserService,
@@ -3679,7 +4031,7 @@ const renderComposeServices = (config, fragments) => `services:
       FORK_REPO_URL: "${fragments.forkRepoUrl}"
 ${fragments.maybeGitTokenLabelEnv}      # Optional token label selector (maps to GITHUB_TOKEN__<LABEL>/GIT_AUTH_TOKEN__<LABEL>)
 ${fragments.maybeCodexAuthLabelEnv}      # Optional Codex account label selector (maps to CODEX_AUTH_LABEL)
-${fragments.maybeClaudeAuthLabelEnv}      # Optional Claude account label selector (maps to CLAUDE_AUTH_LABEL)
+${fragments.maybeClaudeAuthLabelEnv}${fragments.maybeAgentModeEnv}${fragments.maybeAgentAutoEnv}      # Optional Claude account label selector (maps to CLAUDE_AUTH_LABEL)
       TARGET_DIR: "${config.targetDir}"
       CODEX_HOME: "${config.codexHome}"
 ${fragments.maybePlaywrightEnv}${fragments.maybeDependsOn}    env_file:
@@ -4668,70 +5020,6 @@ const parseJsonRecord = (text) => Either.match(ParseResult.decodeUnknownEither(J
 const hasClaudeOauthAccount = (record) => record !== null && typeof record["oauthAccount"] === "object" && record["oauthAccount"] !== null;
 const hasClaudeCredentials = (record) => record !== null && typeof record["claudeAiOauth"] === "object" && record["claudeAiOauth"] !== null;
 const isGithubTokenKey = (key) => key === "GITHUB_TOKEN" || key === "GH_TOKEN" || key.startsWith("GITHUB_TOKEN__");
-const syncGithubAuthKeys = (sourceText, targetText) => {
-  const sourceTokenEntries = parseEnvEntries(sourceText).filter((entry) => isGithubTokenKey(entry.key));
-  if (sourceTokenEntries.length === 0) {
-    return targetText;
-  }
-  const targetTokenKeys = parseEnvEntries(targetText).filter((entry) => isGithubTokenKey(entry.key)).map((entry) => entry.key);
-  let next = targetText;
-  for (const key of targetTokenKeys) {
-    next = removeEnvKey(next, key);
-  }
-  for (const entry of sourceTokenEntries) {
-    next = upsertEnvKey(next, entry.key, entry.value);
-  }
-  return next;
-};
-const syncGithubTokenKeysInFile = (sourcePath, targetPath) => withFsPathContext(
-  ({ fs }) => Effect.gen(function* (_) {
-    const sourceExists = yield* _(fs.exists(sourcePath));
-    if (!sourceExists) {
-      return;
-    }
-    const targetExists = yield* _(fs.exists(targetPath));
-    if (!targetExists) {
-      return;
-    }
-    const sourceInfo = yield* _(fs.stat(sourcePath));
-    const targetInfo = yield* _(fs.stat(targetPath));
-    if (sourceInfo.type !== "File" || targetInfo.type !== "File") {
-      return;
-    }
-    const sourceText = yield* _(fs.readFileString(sourcePath));
-    const targetText = yield* _(fs.readFileString(targetPath));
-    const mergedText = syncGithubAuthKeys(sourceText, targetText);
-    if (mergedText !== targetText) {
-      yield* _(fs.writeFileString(targetPath, mergedText));
-      yield* _(Effect.log(`Synced GitHub auth keys from ${sourcePath} to ${targetPath}`));
-    }
-  })
-);
-const copyFileIfNeeded = (sourcePath, targetPath) => withFsPathContext(
-  ({ fs, path }) => Effect.gen(function* (_) {
-    const sourceExists = yield* _(fs.exists(sourcePath));
-    if (!sourceExists) {
-      return;
-    }
-    const sourceInfo = yield* _(fs.stat(sourcePath));
-    if (sourceInfo.type !== "File") {
-      return;
-    }
-    yield* _(fs.makeDirectory(path.dirname(targetPath), { recursive: true }));
-    const targetExists = yield* _(fs.exists(targetPath));
-    if (!targetExists) {
-      yield* _(fs.copyFile(sourcePath, targetPath));
-      yield* _(Effect.log(`Copied env file from ${sourcePath} to ${targetPath}`));
-      return;
-    }
-    const sourceText = yield* _(fs.readFileString(sourcePath));
-    const targetText = yield* _(fs.readFileString(targetPath));
-    if (shouldCopyEnv(sourceText, targetText) === "copy") {
-      yield* _(fs.writeFileString(targetPath, sourceText));
-      yield* _(Effect.log(`Synced env file from ${sourcePath} to ${targetPath}`));
-    }
-  })
-);
 const syncClaudeJsonFile = (fs, path, spec) => Effect.gen(function* (_) {
   const sourceExists = yield* _(fs.exists(spec.sourcePath));
   if (!sourceExists) {
@@ -4782,6 +5070,18 @@ const syncClaudeCredentialsJson = (fs, path, sourcePath, targetPath) => syncClau
   seedLabel: "Claude credentials",
   updateLabel: "Claude credentials"
 });
+const hasNonEmptyFile = (fs, filePath) => Effect.gen(function* (_) {
+  const exists = yield* _(fs.exists(filePath));
+  if (!exists) {
+    return false;
+  }
+  const info = yield* _(fs.stat(filePath));
+  if (info.type !== "File") {
+    return false;
+  }
+  const text = yield* _(fs.readFileString(filePath), Effect.orElseSucceed(() => ""));
+  return text.trim().length > 0;
+});
 const ensureClaudeAuthSeedFromHome = (baseDir, claudeAuthPath) => withFsPathContext(
   ({ fs, path }) => Effect.gen(function* (_) {
     const homeDir = (process.env["HOME"] ?? "").trim();
@@ -4793,10 +5093,78 @@ const ensureClaudeAuthSeedFromHome = (baseDir, claudeAuthPath) => withFsPathCont
     const claudeRoot = resolvePathFromBase$1(path, baseDir, claudeAuthPath);
     const targetAccountDir = path.join(claudeRoot, "default");
     const targetClaudeJson = path.join(targetAccountDir, ".claude.json");
+    const targetOauthToken = path.join(targetAccountDir, ".oauth-token");
     const targetCredentials = path.join(targetAccountDir, ".credentials.json");
+    const hasTargetOauthToken = yield* _(hasNonEmptyFile(fs, targetOauthToken));
     yield* _(fs.makeDirectory(targetAccountDir, { recursive: true }));
     yield* _(syncClaudeHomeJson(fs, path, sourceClaudeJson, targetClaudeJson));
-    yield* _(syncClaudeCredentialsJson(fs, path, sourceCredentials, targetCredentials));
+    if (!hasTargetOauthToken) {
+      yield* _(syncClaudeCredentialsJson(fs, path, sourceCredentials, targetCredentials));
+    }
+  })
+);
+const syncGithubAuthKeys = (sourceText, targetText) => {
+  const sourceTokenEntries = parseEnvEntries(sourceText).filter((entry) => isGithubTokenKey(entry.key));
+  if (sourceTokenEntries.length === 0) {
+    return targetText;
+  }
+  const targetTokenKeys = parseEnvEntries(targetText).filter((entry) => isGithubTokenKey(entry.key)).map((entry) => entry.key);
+  let next = targetText;
+  for (const key of targetTokenKeys) {
+    next = removeEnvKey(next, key);
+  }
+  for (const entry of sourceTokenEntries) {
+    next = upsertEnvKey(next, entry.key, entry.value);
+  }
+  return next;
+};
+const syncGithubTokenKeysInFile = (sourcePath, targetPath) => withFsPathContext(
+  ({ fs }) => Effect.gen(function* (_) {
+    const sourceExists = yield* _(fs.exists(sourcePath));
+    if (!sourceExists) {
+      return;
+    }
+    const targetExists = yield* _(fs.exists(targetPath));
+    if (!targetExists) {
+      return;
+    }
+    const sourceInfo = yield* _(fs.stat(sourcePath));
+    const targetInfo = yield* _(fs.stat(targetPath));
+    if (sourceInfo.type !== "File" || targetInfo.type !== "File") {
+      return;
+    }
+    const sourceText = yield* _(fs.readFileString(sourcePath));
+    const targetText = yield* _(fs.readFileString(targetPath));
+    const mergedText = syncGithubAuthKeys(sourceText, targetText);
+    if (mergedText !== targetText) {
+      yield* _(fs.writeFileString(targetPath, mergedText));
+      yield* _(Effect.log(`Synced GitHub auth keys from ${sourcePath} to ${targetPath}`));
+    }
+  })
+);
+const copyFileIfNeeded = (sourcePath, targetPath) => withFsPathContext(
+  ({ fs, path }) => Effect.gen(function* (_) {
+    const sourceExists = yield* _(fs.exists(sourcePath));
+    if (!sourceExists) {
+      return;
+    }
+    const sourceInfo = yield* _(fs.stat(sourcePath));
+    if (sourceInfo.type !== "File") {
+      return;
+    }
+    yield* _(fs.makeDirectory(path.dirname(targetPath), { recursive: true }));
+    const targetExists = yield* _(fs.exists(targetPath));
+    if (!targetExists) {
+      yield* _(fs.copyFile(sourcePath, targetPath));
+      yield* _(Effect.log(`Copied env file from ${sourcePath} to ${targetPath}`));
+      return;
+    }
+    const sourceText = yield* _(fs.readFileString(sourcePath));
+    const targetText = yield* _(fs.readFileString(targetPath));
+    if (shouldCopyEnv(sourceText, targetText) === "copy") {
+      yield* _(fs.writeFileString(targetPath, sourceText));
+      yield* _(Effect.log(`Synced env file from ${sourcePath} to ${targetPath}`));
+    }
   })
 );
 const ensureCodexConfigFile = (baseDir, codexAuthPath) => withFsPathContext(
@@ -5214,8 +5582,11 @@ const listProjectStatus = Effect.asVoid(
   )
 );
 const clonePollInterval = Duration.seconds(1);
+const agentPollInterval = Duration.seconds(2);
 const cloneDonePath = "/run/docker-git/clone.done";
 const cloneFailPath = "/run/docker-git/clone.failed";
+const agentDonePath = "/run/docker-git/agent.done";
+const agentFailPath = "/run/docker-git/agent.failed";
 const logSshAccess = (baseDir, config) => Effect.gen(function* (_) {
   const fs = yield* _(FileSystem.FileSystem);
   const path = yield* _(Path.Path);
@@ -5274,6 +5645,47 @@ const waitForCloneCompletion = (cwd, config) => Effect.gen(function* (_) {
     );
   }
 });
+const checkAgentState = (cwd, containerName) => Effect.gen(function* (_) {
+  const failed = yield* _(runDockerExecExitCode(cwd, containerName, ["test", "-f", agentFailPath]));
+  if (failed === 0) {
+    return "failed";
+  }
+  const done = yield* _(runDockerExecExitCode(cwd, containerName, ["test", "-f", agentDonePath]));
+  return done === 0 ? "done" : "pending";
+});
+const waitForAgentCompletion = (cwd, config) => Effect.gen(function* (_) {
+  const logsFiber = yield* _(
+    runDockerComposeLogsFollow(cwd).pipe(
+      Effect.tapError(
+        (error) => Effect.logWarning(
+          `docker compose logs --follow failed: ${error instanceof Error ? error.message : String(error)}`
+        )
+      ),
+      Effect.fork
+    )
+  );
+  const result = yield* _(
+    checkAgentState(cwd, config.containerName).pipe(
+      Effect.repeat(
+        Schedule.addDelay(
+          Schedule.recurUntil((state) => state !== "pending"),
+          () => agentPollInterval
+        )
+      )
+    )
+  );
+  yield* _(Fiber$1.interrupt(logsFiber));
+  if (result === "failed") {
+    return yield* _(
+      Effect.fail(
+        new AgentFailedError({
+          agentMode: config.agentMode ?? "unknown",
+          targetDir: config.targetDir
+        })
+      )
+    );
+  }
+});
 const runDockerComposeUpByMode = (resolvedOutDir, projectConfig, force, forceEnv) => Effect.gen(function* (_) {
   yield* _(ensureComposeNetworkReady(resolvedOutDir, projectConfig));
   if (force) {
@@ -5318,9 +5730,16 @@ const runDockerUpIfNeeded = (resolvedOutDir, projectConfig, options) => Effect.g
     yield* _(Effect.log("Streaming container logs until clone completes..."));
     yield* _(waitForCloneCompletion(resolvedOutDir, projectConfig));
   }
+  if (options.waitForAgent) {
+    yield* _(Effect.log("Waiting for agent to complete..."));
+    yield* _(waitForAgentCompletion(resolvedOutDir, projectConfig));
+  }
   yield* _(Effect.log("Docker environment is up"));
   yield* _(logSshAccess(resolvedOutDir, projectConfig));
 });
+const runDockerDownCleanup = (resolvedOutDir) => runDockerComposeDownVolumes(resolvedOutDir).pipe(
+  Effect.tap(() => Effect.log("Container and volumes removed."))
+);
 const resolvePathFromBase = (path, baseDir, targetPath) => path.isAbsolute(targetPath) ? targetPath : path.resolve(baseDir, targetPath);
 const toPosixPath = (value) => value.replaceAll("\\", "/");
 const resolveDockerGitRootRelativePath = (path, projectsRoot, inputPath) => {
@@ -5519,7 +5938,7 @@ const formatStateSyncLabel = (repoUrl) => {
   return repoPath.length > 0 ? repoPath : repoUrl;
 };
 const isInteractiveTty = () => process.stdin.isTTY && process.stdout.isTTY;
-const buildSshArgs = (config, sshKeyPath) => {
+const buildSshArgs = (config, sshKeyPath, remoteCommand) => {
   const args = [];
   if (sshKeyPath !== null) {
     args.push("-i", sshKeyPath);
@@ -5537,21 +5956,25 @@ const buildSshArgs = (config, sshKeyPath) => {
     String(config.sshPort),
     `${config.sshUser}@localhost`
   );
+  if (remoteCommand !== void 0) {
+    args.push(remoteCommand);
+  }
   return args;
 };
-const openSshBestEffort = (template) => Effect.gen(function* (_) {
+const openSshBestEffort = (template, remoteCommand) => Effect.gen(function* (_) {
   const fs = yield* _(FileSystem.FileSystem);
   const path = yield* _(Path.Path);
   const sshKey = yield* _(findSshPrivateKey(fs, path, process.cwd()));
   const sshCommand = buildSshCommand(template, sshKey);
-  yield* _(Effect.log(`Opening SSH: ${sshCommand}`));
+  const remoteCommandLabel = remoteCommand === void 0 ? "" : ` (${remoteCommand})`;
+  yield* _(Effect.log(`Opening SSH: ${sshCommand}${remoteCommandLabel}`));
   yield* _(ensureTerminalCursorVisible());
   yield* _(
     runCommandWithExitCodes(
       {
         cwd: process.cwd(),
         command: "ssh",
-        args: buildSshArgs(template, sshKey)
+        args: buildSshArgs(template, sshKey, remoteCommand)
       },
       [0, 130],
       (exitCode) => new CommandFailedError({ command: "ssh", exitCode })
@@ -5564,6 +5987,23 @@ const openSshBestEffort = (template) => Effect.gen(function* (_) {
     onSuccess: () => Effect.void
   })
 );
+const resolveInteractiveRemoteCommand = (projectConfig, interactiveAgent) => interactiveAgent && projectConfig.agentMode !== void 0 ? `cd '${projectConfig.targetDir}' && ${projectConfig.agentMode}` : void 0;
+const maybeOpenSsh = (command, hasAgent, waitForAgent, projectConfig) => Effect.gen(function* (_) {
+  const interactiveAgent = hasAgent && !waitForAgent;
+  if (!command.openSsh || hasAgent && !interactiveAgent) {
+    return;
+  }
+  if (!command.runUp) {
+    yield* _(Effect.logWarning("Skipping SSH auto-open: docker compose up disabled (--no-up)."));
+    return;
+  }
+  if (!isInteractiveTty()) {
+    yield* _(Effect.logWarning("Skipping SSH auto-open: not running in an interactive TTY."));
+    return;
+  }
+  const remoteCommand = resolveInteractiveRemoteCommand(projectConfig, interactiveAgent);
+  yield* _(openSshBestEffort(projectConfig, remoteCommand));
+}).pipe(Effect.asVoid);
 const runCreateProject = (path, command) => Effect.gen(function* (_) {
   if (command.runUp) {
     yield* _(ensureDockerDaemonAccess(process.cwd()));
@@ -5580,10 +6020,13 @@ const runCreateProject = (path, command) => Effect.gen(function* (_) {
     })
   );
   yield* _(logCreatedProject(resolvedOutDir, createdFiles));
+  const hasAgent = resolvedConfig.agentMode !== void 0;
+  const waitForAgent = hasAgent && (resolvedConfig.agentAuto ?? false);
   yield* _(
     runDockerUpIfNeeded(resolvedOutDir, projectConfig, {
       runUp: command.runUp,
       waitForClone: command.waitForClone,
+      waitForAgent,
       force: command.force,
       forceEnv: command.forceEnv
     })
@@ -5591,16 +6034,12 @@ const runCreateProject = (path, command) => Effect.gen(function* (_) {
   if (command.runUp) {
     yield* _(logDockerAccessInfo(resolvedOutDir, projectConfig));
   }
-  yield* _(autoSyncState(`chore(state): update ${formatStateSyncLabel(projectConfig.repoUrl)}`));
-  if (command.openSsh) {
-    if (!command.runUp) {
-      yield* _(Effect.logWarning("Skipping SSH auto-open: docker compose up disabled (--no-up)."));
-    } else if (isInteractiveTty()) {
-      yield* _(openSshBestEffort(projectConfig));
-    } else {
-      yield* _(Effect.logWarning("Skipping SSH auto-open: not running in an interactive TTY."));
-    }
+  if (waitForAgent) {
+    yield* _(Effect.log("Agent finished. Cleaning up container..."));
+    yield* _(runDockerDownCleanup(resolvedOutDir));
   }
+  yield* _(autoSyncState(`chore(state): update ${formatStateSyncLabel(projectConfig.repoUrl)}`));
+  yield* _(maybeOpenSsh(command, hasAgent, waitForAgent, projectConfig));
 }).pipe(Effect.asVoid);
 const createProject = (command) => Path.Path.pipe(Effect.flatMap((path) => runCreateProject(path, command)));
 const trimEdgeUnderscores = (value) => {
@@ -6057,7 +6496,8 @@ const runClaudeOauthLoginWithPrompt = (cwd, accountPath, options) => {
   return Effect.scoped(
     Effect.gen(function* (_) {
       const executor = yield* _(CommandExecutor.CommandExecutor);
-      const spec = buildDockerSetupTokenSpec(cwd, accountPath, options.image, options.containerPath);
+      const hostPath = yield* _(resolveDockerVolumeHostPath(cwd, accountPath));
+      const spec = buildDockerSetupTokenSpec(cwd, hostPath, options.image, options.containerPath);
       const proc = yield* _(startDockerProcess(executor, spec));
       const tokenBox = { value: null };
       const stdoutFiber = yield* _(Effect.forkScoped(pumpDockerOutput(proc.stdout, 1, tokenBox)));
@@ -6106,6 +6546,10 @@ const syncClaudeCredentialsFile = (fs, accountPath) => Effect.gen(function* (_)
     yield* _(fs.chmod(nestedPath, 384), Effect.orElseSucceed(() => void 0));
   }
 });
+const clearClaudeSessionCredentials = (fs, accountPath) => Effect.gen(function* (_) {
+  yield* _(fs.remove(claudeCredentialsPath(accountPath), { force: true }));
+  yield* _(fs.remove(claudeNestedCredentialsPath(accountPath), { force: true }));
+});
 const hasNonEmptyOauthToken$1 = (fs, accountPath) => Effect.gen(function* (_) {
   const tokenPath = claudeOauthTokenPath(accountPath);
   const hasToken = yield* _(isRegularFile(fs, tokenPath));
@@ -6115,7 +6559,30 @@ const hasNonEmptyOauthToken$1 = (fs, accountPath) => Effect.gen(function* (_) {
   const tokenText = yield* _(fs.readFileString(tokenPath), Effect.orElseSucceed(() => ""));
   return tokenText.trim().length > 0;
 });
-const buildClaudeAuthEnv = (interactive) => interactive ? [`HOME=${claudeContainerHomeDir}`, `CLAUDE_CONFIG_DIR=${claudeContainerHomeDir}`, "BROWSER=echo"] : [`HOME=${claudeContainerHomeDir}`, `CLAUDE_CONFIG_DIR=${claudeContainerHomeDir}`];
+const readOauthToken = (fs, accountPath) => Effect.gen(function* (_) {
+  const tokenPath = claudeOauthTokenPath(accountPath);
+  const hasToken = yield* _(isRegularFile(fs, tokenPath));
+  if (!hasToken) {
+    return null;
+  }
+  const tokenText = yield* _(fs.readFileString(tokenPath), Effect.orElseSucceed(() => ""));
+  const token = tokenText.trim();
+  return token.length > 0 ? token : null;
+});
+const resolveClaudeAuthMethod = (fs, accountPath) => Effect.gen(function* (_) {
+  const hasOauthToken = yield* _(hasNonEmptyOauthToken$1(fs, accountPath));
+  if (hasOauthToken) {
+    yield* _(clearClaudeSessionCredentials(fs, accountPath));
+    return "oauth-token";
+  }
+  yield* _(syncClaudeCredentialsFile(fs, accountPath));
+  const hasCredentials = yield* _(isRegularFile(fs, claudeCredentialsPath(accountPath)));
+  return hasCredentials ? "claude-ai-session" : "none";
+});
+const buildClaudeAuthEnv = (interactive, oauthToken = null) => [
+  ...[`HOME=${claudeContainerHomeDir}`, `CLAUDE_CONFIG_DIR=${claudeContainerHomeDir}`],
+  ...oauthToken === null ? [] : [`CLAUDE_CODE_OAUTH_TOKEN=${oauthToken}`]
+];
 const ensureClaudeOrchLayout = (cwd) => migrateLegacyOrchLayout(cwd, {
   envGlobalPath: defaultTemplateConfig.envGlobalPath,
   envProjectPath: defaultTemplateConfig.envProjectPath,
@@ -6164,7 +6631,7 @@ const runClaudeAuthCommand = (cwd, accountPath, args, commandLabel, interactive)
     image: claudeImageName,
     hostPath: accountPath,
     containerPath: claudeContainerHomeDir,
-    env: buildClaudeAuthEnv(interactive),
+    env: buildClaudeAuthEnv(),
     args,
     interactive
   }),
@@ -6172,13 +6639,13 @@ const runClaudeAuthCommand = (cwd, accountPath, args, commandLabel, interactive)
   (exitCode) => new CommandFailedError({ command: commandLabel, exitCode })
 );
 const runClaudeLogout = (cwd, accountPath) => runClaudeAuthCommand(cwd, accountPath, ["auth", "logout"], "claude auth logout", false);
-const runClaudePingProbeExitCode = (cwd, accountPath) => runDockerAuthExitCode(
+const runClaudePingProbeExitCode = (cwd, accountPath, oauthToken) => runDockerAuthExitCode(
   buildDockerAuthSpec({
     cwd,
     image: claudeImageName,
     hostPath: accountPath,
     containerPath: claudeContainerHomeDir,
-    env: buildClaudeAuthEnv(false),
+    env: buildClaudeAuthEnv(false, oauthToken),
     args: ["-p", "ping"],
     interactive: false
   })
@@ -6195,8 +6662,8 @@ const authClaudeLogin = (command) => {
     yield* _(fs.writeFileString(claudeOauthTokenPath(accountPath), `${token}
 `));
     yield* _(fs.chmod(claudeOauthTokenPath(accountPath), 384), Effect.orElseSucceed(() => void 0));
-    yield* _(syncClaudeCredentialsFile(fs, accountPath));
-    const probeExitCode = yield* _(runClaudePingProbeExitCode(cwd, accountPath));
+    yield* _(resolveClaudeAuthMethod(fs, accountPath));
+    const probeExitCode = yield* _(runClaudePingProbeExitCode(cwd, accountPath, token));
     if (probeExitCode !== 0) {
       yield* _(
         Effect.fail(
@@ -6212,20 +6679,17 @@ const authClaudeLogin = (command) => {
   );
 };
 const authClaudeStatus = (command) => withClaudeAuth(command, ({ accountLabel, accountPath, cwd, fs }) => Effect.gen(function* (_) {
-  yield* _(syncClaudeCredentialsFile(fs, accountPath));
-  const hasOauthToken = yield* _(hasNonEmptyOauthToken$1(fs, accountPath));
-  const hasCredentials = yield* _(isRegularFile(fs, claudeCredentialsPath(accountPath)));
-  if (!hasOauthToken && !hasCredentials) {
+  const method = yield* _(resolveClaudeAuthMethod(fs, accountPath));
+  if (method === "none") {
     yield* _(Effect.log(`Claude not connected (${accountLabel}).`));
     return;
   }
-  const probeExitCode = yield* _(runClaudePingProbeExitCode(cwd, accountPath));
+  const oauthToken = method === "oauth-token" ? yield* _(readOauthToken(fs, accountPath)) : null;
+  const probeExitCode = yield* _(runClaudePingProbeExitCode(cwd, accountPath, oauthToken));
   if (probeExitCode === 0) {
-    const method2 = hasCredentials ? "claude-ai-session" : "oauth-token";
-    yield* _(Effect.log(`Claude connected (${accountLabel}, ${method2}).`));
+    yield* _(Effect.log(`Claude connected (${accountLabel}, ${method}).`));
     return;
   }
-  const method = hasCredentials ? "claude-ai-session" : "oauth-token";
   yield* _(
     Effect.logWarning(
       `Claude session exists but API probe failed (${accountLabel}, ${method}, exit=${probeExitCode}). Run 'docker-git auth claude login'.`
@@ -7244,7 +7708,10 @@ const booleanFlagUpdaters = {
   "--wipe": (raw) => ({ ...raw, wipe: true }),
   "--no-wipe": (raw) => ({ ...raw, wipe: false }),
   "--web": (raw) => ({ ...raw, authWeb: true }),
-  "--include-default": (raw) => ({ ...raw, includeDefault: true })
+  "--include-default": (raw) => ({ ...raw, includeDefault: true }),
+  "--claude": (raw) => ({ ...raw, agentClaude: true }),
+  "--codex": (raw) => ({ ...raw, agentCodex: true }),
+  "--auto": (raw) => ({ ...raw, agentAuto: true })
 };
 const valueFlagUpdaters = {
   repoUrl: (raw, value) => ({ ...raw, repoUrl: value }),
@@ -7590,7 +8057,14 @@ const resolveCreateBehavior = (raw) => ({
   forceEnv: raw.forceEnv ?? false,
   enableMcpPlaywright: raw.enableMcpPlaywright ?? false
 });
+const resolveAgentMode = (raw) => {
+  if (raw.agentClaude) return "claude";
+  if (raw.agentCodex) return "codex";
+  return void 0;
+};
 const buildTemplateConfig = ({
+  agentAuto,
+  agentMode,
   claudeAuthLabel,
   codexAuthLabel,
   dockerNetworkMode,
@@ -7622,7 +8096,9 @@ const buildTemplateConfig = ({
   dockerNetworkMode,
   dockerSharedNetworkName,
   enableMcpPlaywright,
-  pnpmVersion: defaultTemplateConfig.pnpmVersion
+  pnpmVersion: defaultTemplateConfig.pnpmVersion,
+  agentMode,
+  agentAuto
 });
 const buildCreateCommand = (raw) => Either.gen(function* (_) {
   const repo = yield* _(resolveRepoBasics(raw));
@@ -7636,6 +8112,8 @@ const buildCreateCommand = (raw) => Either.gen(function* (_) {
   const dockerSharedNetworkName = yield* _(
     nonEmpty("--shared-network", raw.dockerSharedNetworkName, defaultTemplateConfig.dockerSharedNetworkName)
   );
+  const agentMode = resolveAgentMode(raw);
+  const agentAuto = raw.agentAuto ?? false;
   return {
     _tag: "Create",
     outDir: paths.outDir,
@@ -7653,7 +8131,9 @@ const buildCreateCommand = (raw) => Either.gen(function* (_) {
       gitTokenLabel,
       codexAuthLabel,
       claudeAuthLabel,
-      enableMcpPlaywright: behavior.enableMcpPlaywright
+      enableMcpPlaywright: behavior.enableMcpPlaywright,
+      agentMode,
+      agentAuto
     })
   };
 });
@@ -7957,6 +8437,9 @@ Options:
   --up | --no-up            Run docker compose up after init (default: --up)
   --ssh | --no-ssh          Auto-open SSH after create/clone (default: clone=--ssh, create=--no-ssh)
   --mcp-playwright | --no-mcp-playwright  Enable Playwright MCP + Chromium sidecar (default: --no-mcp-playwright)
+  --claude                  Start Claude Code agent inside container after clone
+  --codex                   Start Codex agent inside container after clone
+  --auto                    Auto-execute: agent completes the task, creates PR and pushes (requires --claude or --codex)
   --force                   Overwrite existing files and wipe compose volumes (docker compose down -v)
   --force-env               Reset project env defaults only (keep workspace volume/data)
   -h, --help                Show this help
@@ -10882,6 +11365,7 @@ const program = pipe(
   Effect.catchTag("DockerAccessError", logWarningAndExit),
   Effect.catchTag("DockerCommandError", logWarningAndExit),
   Effect.catchTag("AuthError", logWarningAndExit),
+  Effect.catchTag("AgentFailedError", logWarningAndExit),
   Effect.catchTag("CommandFailedError", logWarningAndExit),
   Effect.catchTag("ScrapArchiveNotFoundError", logErrorAndExit),
   Effect.catchTag("ScrapTargetDirUnsupportedError", logErrorAndExit),