mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-17 15:34:54 +00:00
Our history is just-every's with author emails rewritten, so the graphs are
disjoint and git finds no merge base. Supplied one by hand: d1f1f51a41, the
just-every commit matching our Oct-2025 fork point (22 files apart). 9618
upstream commits, 7004 files, +1.81M/-159k, 37 conflicts.
Resolution:
- Upstream code where our side was the Oct-2025 prototype of a feature they
have since reimplemented 3-5x larger (agent_runs, browser_sessions,
history_cell/{agent,browser}, the vt100 harness and its snapshots).
- Upstream's config.rs module split (builder/defaults/sources/validation)
kept; zen5-coder and the provider-follows-model rule re-applied on top.
- Ours where the file IS the identity: README, package.json, postinstall,
release notes pipeline, integration-zed.
- Hybrid where upstream improved a file we had branded: updates.rs (their
release-repo migration, our hanzoai/dev), release.yml (their fail-fast npm
auth check, our package name), chatwidget.rs (their turn handling, our
HANZO_USER_KEY hint), exec human output (their 237 lines, our banner).
Superseded and dropped deliberately: our resume_command_name() coder-alias
hack — upstream's derive_resume_command_name() reads the invocation basename
generically, which yields "dev" for us.
LLM.md now records the real topology and the sync point; AGENTS.md and
CLAUDE.md are symlinks to it again. Single parent on purpose: adopting
jecode/main as a second parent would re-import 13,742 commits carrying the
upstream author emails a prior rewrite deliberately removed.
Version 0.2.188 -> 0.2.189.
Co-authored-by: Hanzo Dev <[email protected]>
143 lines
4.8 KiB
Bash
Executable File
143 lines
4.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Remote-env setup script for codex-rs integration tests.
|
|
#
|
|
# Usage (source-only):
|
|
# source scripts/test-remote-env.sh
|
|
# cd codex-rs
|
|
# cargo test -p codex-core --test all remote_env_connects_creates_temp_dir_and_runs_sample_script
|
|
# codex_remote_env_cleanup
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
|
|
|
|
is_sourced() {
|
|
[[ "${BASH_SOURCE[0]}" != "$0" ]]
|
|
}
|
|
|
|
setup_remote_env() {
|
|
local container_name
|
|
local codex_binary_path
|
|
local container_ip
|
|
local remote_codex_path
|
|
local remote_exec_server_pid
|
|
local remote_exec_server_port
|
|
local remote_exec_server_stdout_path
|
|
|
|
container_name="${CODEX_TEST_REMOTE_ENV_CONTAINER_NAME:-codex-remote-test-env-local-$(date +%s)-${RANDOM}}"
|
|
codex_binary_path="${CARGO_TARGET_DIR:-${REPO_ROOT}/codex-rs/target}/debug/codex"
|
|
|
|
if ! command -v docker >/dev/null 2>&1; then
|
|
echo "docker is required (Colima or Docker Desktop)" >&2
|
|
return 1
|
|
fi
|
|
|
|
if ! docker info >/dev/null 2>&1; then
|
|
echo "docker daemon is not reachable; for Colima run: colima start" >&2
|
|
return 1
|
|
fi
|
|
|
|
if ! command -v cargo >/dev/null 2>&1; then
|
|
echo "cargo is required to build codex" >&2
|
|
return 1
|
|
fi
|
|
|
|
(
|
|
cd "${REPO_ROOT}/codex-rs"
|
|
cargo build -p codex-cli --bin codex
|
|
)
|
|
|
|
if [[ ! -f "${codex_binary_path}" ]]; then
|
|
echo "codex binary not found at ${codex_binary_path}" >&2
|
|
return 1
|
|
fi
|
|
|
|
docker rm -f "${container_name}" >/dev/null 2>&1 || true
|
|
# bubblewrap needs mount propagation inside the remote test container.
|
|
docker run -d \
|
|
--name "${container_name}" \
|
|
--privileged \
|
|
--security-opt seccomp=unconfined \
|
|
ubuntu:24.04 sleep infinity >/dev/null
|
|
if ! docker exec "${container_name}" sh -lc "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3 zsh"; then
|
|
docker rm -f "${container_name}" >/dev/null 2>&1 || true
|
|
return 1
|
|
fi
|
|
|
|
if [[ -z "${CODEX_TEST_REMOTE_EXEC_SERVER_URL:-}" ]]; then
|
|
remote_codex_path="/tmp/codex-remote-env/codex"
|
|
remote_exec_server_port="31987"
|
|
remote_exec_server_stdout_path="/tmp/codex-remote-env/exec-server.stdout"
|
|
docker exec "${container_name}" sh -lc "mkdir -p /tmp/codex-remote-env"
|
|
docker cp "${codex_binary_path}" "${container_name}:${remote_codex_path}"
|
|
docker exec "${container_name}" chmod +x "${remote_codex_path}"
|
|
remote_exec_server_pid="$(
|
|
docker exec "${container_name}" sh -lc \
|
|
"rm -f ${remote_exec_server_stdout_path}; nohup ${remote_codex_path} exec-server --listen ws://0.0.0.0:${remote_exec_server_port} > ${remote_exec_server_stdout_path} 2>&1 & echo \$!"
|
|
)"
|
|
wait_for_remote_exec_server_port "${container_name}" "${remote_exec_server_port}" "${remote_exec_server_stdout_path}"
|
|
container_ip="$(
|
|
docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "${container_name}"
|
|
)"
|
|
if [[ -z "${container_ip}" ]]; then
|
|
echo "container ${container_name} has no IP address" >&2
|
|
docker rm -f "${container_name}" >/dev/null 2>&1 || true
|
|
return 1
|
|
fi
|
|
export CODEX_TEST_REMOTE_EXEC_SERVER_PID="${remote_exec_server_pid}"
|
|
export CODEX_TEST_REMOTE_EXEC_SERVER_URL="ws://${container_ip}:${remote_exec_server_port}"
|
|
fi
|
|
|
|
export CODEX_TEST_REMOTE_ENV="${container_name}"
|
|
export CODEX_TEST_REMOTE_ENV_CONTAINER_NAME="${container_name}"
|
|
export CODEX_TEST_ENVIRONMENT="docker"
|
|
}
|
|
|
|
wait_for_remote_exec_server_port() {
|
|
local container_name="$1"
|
|
local port="$2"
|
|
local stdout_path="$3"
|
|
local deadline=$((SECONDS + 5))
|
|
|
|
while (( SECONDS < deadline )); do
|
|
if docker exec "${container_name}" python3 -c "import socket; socket.create_connection(('127.0.0.1', ${port}), timeout=0.2).close()" >/dev/null 2>&1; then
|
|
return 0
|
|
fi
|
|
sleep 0.025
|
|
done
|
|
|
|
echo "timed out waiting for remote exec-server on ${container_name}:${port}" >&2
|
|
docker exec "${container_name}" sh -lc "cat ${stdout_path} 2>/dev/null || true" >&2 || true
|
|
return 1
|
|
}
|
|
|
|
codex_remote_env_cleanup() {
|
|
if [[ -n "${CODEX_TEST_REMOTE_ENV:-}" ]]; then
|
|
docker rm -f "${CODEX_TEST_REMOTE_ENV}" >/dev/null 2>&1 || true
|
|
unset CODEX_TEST_REMOTE_ENV
|
|
fi
|
|
unset CODEX_TEST_REMOTE_ENV_CONTAINER_NAME
|
|
unset CODEX_TEST_REMOTE_EXEC_SERVER_PID
|
|
unset CODEX_TEST_REMOTE_EXEC_SERVER_URL
|
|
unset CODEX_TEST_ENVIRONMENT
|
|
}
|
|
|
|
if ! is_sourced; then
|
|
echo "source this script instead of executing it: source scripts/test-remote-env.sh" >&2
|
|
exit 1
|
|
fi
|
|
|
|
old_shell_options="$(set +o)"
|
|
set -euo pipefail
|
|
if setup_remote_env; then
|
|
status=0
|
|
echo "CODEX_TEST_REMOTE_ENV=${CODEX_TEST_REMOTE_ENV}"
|
|
echo "CODEX_TEST_ENVIRONMENT=${CODEX_TEST_ENVIRONMENT}"
|
|
echo "CODEX_TEST_REMOTE_EXEC_SERVER_URL=${CODEX_TEST_REMOTE_EXEC_SERVER_URL}"
|
|
echo "Remote env ready. Run your command, then call: codex_remote_env_cleanup"
|
|
else
|
|
status=$?
|
|
fi
|
|
eval "${old_shell_options}"
|
|
return "${status}"
|