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

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

@@ -345,6 +345,228 @@ const runCommandCapture = (spec, okExitCodes, onFailure) => Effect.scoped(
     return new TextDecoder("utf-8").decode(bytes);
   })
 );
+const resolveDockerEnvValue = (key) => {
+  const value = process.env[key]?.trim();
+  return value && value.length > 0 ? value : null;
+};
+const trimDockerPathTrailingSlash = (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 = resolveDockerEnvValue("DOCKER_GIT_PROJECTS_ROOT");
+  if (explicit !== null) {
+    return explicit;
+  }
+  const home = resolveDockerEnvValue("HOME") ?? resolveDockerEnvValue("USERPROFILE");
+  return home === null ? null : `${trimDockerPathTrailingSlash(home)}/.docker-git`;
+};
+const resolveProjectsRootHostOverride = () => resolveDockerEnvValue("DOCKER_GIT_PROJECTS_ROOT_HOST");
+const resolveCurrentContainerId = (cwd) => {
+  const fromEnv = resolveDockerEnvValue("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");
+  if (typeof getUid !== "function" || typeof getGid !== "function") {
+    return null;
+  }
+  const uid = getUid.call(process);
+  const gid = getGid.call(process);
+  if (typeof uid !== "number" || typeof gid !== "number") {
+    return null;
+  }
+  return `${uid}:${gid}`;
+};
+const appendEnvArgs = (base, env) => {
+  if (typeof env === "string") {
+    const trimmed = env.trim();
+    if (trimmed.length > 0) {
+      base.push("-e", trimmed);
+    }
+    return;
+  }
+  for (const entry of env) {
+    const trimmed = entry.trim();
+    if (trimmed.length === 0) {
+      continue;
+    }
+    base.push("-e", trimmed);
+  }
+};
+const buildDockerArgs = (spec) => {
+  const base = ["run", "--rm"];
+  const dockerUser = (spec.user ?? "").trim() || resolveDefaultDockerUser();
+  if (dockerUser !== null) {
+    base.push("--user", dockerUser);
+  }
+  if (spec.interactive) {
+    base.push("-it");
+  }
+  if (spec.entrypoint && spec.entrypoint.length > 0) {
+    base.push("--entrypoint", spec.entrypoint);
+  }
+  base.push("-v", `${spec.volume.hostPath}:${spec.volume.containerPath}`);
+  if (spec.env !== void 0) {
+    appendEnvArgs(base, spec.env);
+  }
+  return [...base, spec.image, ...spec.args];
+};
+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 composeSpec = (cwd, args) => ({
+  cwd,
+  command: "docker",
+  args: ["compose", "--ansi", "never", "--progress", "plain", ...args]
+});
+const resolveProjectsRootCandidate = () => {
+  const explicit = resolveDockerEnvValue("DOCKER_GIT_PROJECTS_ROOT");
+  if (explicit !== null) {
+    return explicit;
+  }
+  const home = resolveDockerEnvValue("HOME") ?? resolveDockerEnvValue("USERPROFILE");
+  return home === null ? null : `${trimDockerPathTrailingSlash(home)}/.docker-git`;
+};
+const resolveDockerComposeEnv = (cwd) => Effect.gen(function* (_) {
+  const projectsRoot = resolveProjectsRootCandidate();
+  if (projectsRoot === null) {
+    return {};
+  }
+  const remappedProjectsRoot = yield* _(resolveDockerVolumeHostPath(cwd, projectsRoot));
+  return remappedProjectsRoot === projectsRoot ? {} : { DOCKER_GIT_PROJECTS_ROOT_HOST: remappedProjectsRoot };
+});
+const parseInspectNetworkEntry = (line) => {
+  const idx = line.indexOf("=");
+  if (idx <= 0) {
+    return [];
+  }
+  const network = line.slice(0, idx).trim();
+  const ip = line.slice(idx + 1).trim();
+  if (network.length === 0 || ip.length === 0) {
+    return [];
+  }
+  const entry = [network, ip];
+  return [entry];
+};
 class FileExistsError extends Data.TaggedError("FileExistsError") {
 }
 class ConfigNotFoundError extends Data.TaggedError("ConfigNotFoundError") {
@@ -513,34 +735,32 @@ const runDockerPsPublishedHostPorts = (cwd) => pipe(
   ),
   Effect.map((output) => parseDockerPublishedHostPorts(output))
 );
-const composeSpec = (cwd, args) => ({
-  cwd,
-  command: "docker",
-  args: ["compose", "--ansi", "never", "--progress", "plain", ...args]
+const runCompose = (cwd, args, okExitCodes) => Effect.gen(function* (_) {
+  const env = yield* _(resolveDockerComposeEnv(cwd));
+  yield* _(
+    runCommandWithExitCodes(
+      {
+        ...composeSpec(cwd, args),
+        ...Object.keys(env).length > 0 ? { env } : {}
+      },
+      okExitCodes,
+      (exitCode) => new DockerCommandError({ exitCode })
+    )
+  );
+});
+const runComposeCapture = (cwd, args, okExitCodes) => Effect.gen(function* (_) {
+  const env = yield* _(resolveDockerComposeEnv(cwd));
+  return yield* _(
+    runCommandCapture(
+      {
+        ...composeSpec(cwd, args),
+        ...Object.keys(env).length > 0 ? { env } : {}
+      },
+      okExitCodes,
+      (exitCode) => new DockerCommandError({ exitCode })
+    )
+  );
 });
-const parseInspectNetworkEntry = (line) => {
-  const idx = line.indexOf("=");
-  if (idx <= 0) {
-    return [];
-  }
-  const network = line.slice(0, idx).trim();
-  const ip = line.slice(idx + 1).trim();
-  if (network.length === 0 || ip.length === 0) {
-    return [];
-  }
-  const entry = [network, ip];
-  return [entry];
-};
-const runCompose = (cwd, args, okExitCodes) => runCommandWithExitCodes(
-  composeSpec(cwd, args),
-  okExitCodes,
-  (exitCode) => new DockerCommandError({ exitCode })
-);
-const runComposeCapture = (cwd, args, okExitCodes) => runCommandCapture(
-  composeSpec(cwd, args),
-  okExitCodes,
-  (exitCode) => new DockerCommandError({ exitCode })
-);
 const dockerComposeUpRetrySchedule = Schedule.addDelay(
   Schedule.recurs(2),
   () => Duration.seconds(2)
@@ -851,194 +1071,6 @@ 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");
-  if (typeof getUid !== "function" || typeof getGid !== "function") {
-    return null;
-  }
-  const uid = getUid.call(process);
-  const gid = getGid.call(process);
-  if (typeof uid !== "number" || typeof gid !== "number") {
-    return null;
-  }
-  return `${uid}:${gid}`;
-};
-const appendEnvArgs = (base, env) => {
-  if (typeof env === "string") {
-    const trimmed = env.trim();
-    if (trimmed.length > 0) {
-      base.push("-e", trimmed);
-    }
-    return;
-  }
-  for (const entry of env) {
-    const trimmed = entry.trim();
-    if (trimmed.length === 0) {
-      continue;
-    }
-    base.push("-e", trimmed);
-  }
-};
-const buildDockerArgs = (spec) => {
-  const base = ["run", "--rm"];
-  const dockerUser = (spec.user ?? "").trim() || resolveDefaultDockerUser();
-  if (dockerUser !== null) {
-    base.push("--user", dockerUser);
-  }
-  if (spec.interactive) {
-    base.push("-it");
-  }
-  if (spec.entrypoint && spec.entrypoint.length > 0) {
-    base.push("--entrypoint", spec.entrypoint);
-  }
-  base.push("-v", `${spec.volume.hostPath}:${spec.volume.containerPath}`);
-  if (spec.env !== void 0) {
-    appendEnvArgs(base, spec.env);
-  }
-  return [...base, spec.image, ...spec.args];
-};
-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) {
@@ -3622,15 +3654,15 @@ if [[ -n "$AGENT_PROMPT" ]]; then
   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 renderAgentPromptCommand = (mode) => mode === "claude" ? String.raw`claude --dangerously-skip-permissions -p \"\$(cat \"$AGENT_PROMPT_FILE\")\"` : String.raw`codex exec \"\$(cat \"$AGENT_PROMPT_FILE\")\"`;
+const renderAgentAutoLaunchCommand = (config, mode) => String.raw`su - ${config.sshUser} -s /bin/bash -c "bash -lc '. /etc/profile 2>/dev/null || true; . \"$AGENT_ENV_FILE\" 2>/dev/null || true; cd \"$TARGET_DIR\" && ${renderAgentPromptCommand(mode)}'"`;
 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
+    if ${renderAgentAutoLaunchCommand(config, mode)}; then
       AGENT_OK=1
     fi
   else
@@ -3961,6 +3993,8 @@ const renderAgentModeEnv = (agentMode) => agentMode !== void 0 && agentMode.leng
 ` : "";
 const renderAgentAutoEnv = (agentAuto) => agentAuto === true ? `      AGENT_AUTO: "1"
 ` : "";
+const renderProjectsRootHostMount = (projectsRoot) => `\${DOCKER_GIT_PROJECTS_ROOT_HOST:-${projectsRoot}}`;
+const renderSharedCodexHostMount = (projectsRoot) => `\${DOCKER_GIT_PROJECTS_ROOT_HOST:-${projectsRoot}}/.orch/auth/codex`;
 const buildPlaywrightFragments = (config, networkName) => {
   if (!config.enableMcpPlaywright) {
     return {
@@ -4052,10 +4086,10 @@ ${fragments.maybePlaywrightEnv}${fragments.maybeDependsOn}    env_file:
       - "127.0.0.1:${config.sshPort}:22"
     volumes:
       - ${config.volumeName}:/home/${config.sshUser}
-      - ${config.dockerGitPath}:/home/${config.sshUser}/.docker-git
+      - ${renderProjectsRootHostMount(config.dockerGitPath)}:/home/${config.sshUser}/.docker-git
       - ${config.authorizedKeysPath}:/authorized_keys:ro
       - ${config.codexAuthPath}:${config.codexHome}
-      - ${config.codexSharedAuthPath}:${config.codexHome}-shared
+      - ${renderSharedCodexHostMount(config.dockerGitPath)}:${config.codexHome}-shared
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
       - ${fragments.networkName}