starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-11-15 18:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sandbox-control): node on terminal PATH (npm agent CLIs like codex failed with env: node), workspace name from the repo URL and lazy default branch (first-boot clone is async)

Browse Source
This commit is contained in:
Neil
2026-11-09 05:04:46 -08:00
parent 1ec420ea77
commit 5c84d9e98a
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cloud/apps/sandbox-control/image/vm-scripts.generated.ts
+1 -1
View File
File diff suppressed because one or more lines are too long
cloud/apps/sandbox-control/image/vm/orca-sandbox-start
+12 -8
View File
@@ -68,20 +68,21 @@ if [ ! -d "$PROJECT" ]; then
fi
fi
workspace_name="$(basename "$(git -C "$PROJECT" remote get-url origin 2>/dev/null || echo "$PROJECT")" .git)"
default_branch="$(git -C "$PROJECT" symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true)"
default_branch="${default_branch#origin/}"
if [ -z "$default_branch" ]; then
default_branch="$(git -C "$PROJECT" branch --show-current 2>/dev/null || true)"
# The clone may still be running here, so the name comes from the URL; the default branch is
# filled in lazily by the session-env shell hook once the clone exists.
if [ -n "${ORCA_REPO_URL:-}" ]; then
workspace_name="$(basename "${ORCA_REPO_URL%/}" .git)"
else
workspace_name="$(basename "$(git -C "$PROJECT" remote get-url origin 2>/dev/null || echo "$PROJECT")" .git)"
fi
# One workspace per VM: its preview ports start at 3000 (Conductor allots CONDUCTOR_PORT..+9).
managed_env=(
ORCA_IS_CLOUD=1
ORCA_ROOT_PATH="$PROJECT" ORCA_WORKTREE_PATH="$PROJECT" ORCA_WORKSPACE_PATH="$PROJECT"
ORCA_WORKSPACE_NAME="$workspace_name" ORCA_DEFAULT_BRANCH="${default_branch:-main}" ORCA_PORT=3000
ORCA_WORKSPACE_NAME="$workspace_name" ORCA_PORT=3000
CONDUCTOR_IS_CLOUD=1
CONDUCTOR_ROOT_PATH="$PROJECT" CONDUCTOR_WORKSPACE_PATH="$PROJECT"
CONDUCTOR_WORKSPACE_NAME="$workspace_name" CONDUCTOR_DEFAULT_BRANCH="${default_branch:-main}" CONDUCTOR_PORT=3000
CONDUCTOR_WORKSPACE_NAME="$workspace_name" CONDUCTOR_PORT=3000
)
agent_env=()
@@ -111,8 +112,11 @@ fi
unset ORCA_SECRET_ENV
node="$(find "$ORCA_HOME/runtime/runtimes" -type f -name node | head -n 1)"
# Agent CLIs installed with the image's npm (codex, gemini, ...) are `#!/usr/bin/env node` scripts:
# terminals need that node on PATH, not only orcad's bundled runtime.
system_node="$(command -v node 2>/dev/null || echo "$node")"
env -i HOME="$HOME" USER="$(id -un)" LANG=C.UTF-8 TERM=xterm-256color \
PATH="$ORCA_HOME/tools/bin:$ORCA_HOME/bin:/usr/local/bin:/usr/bin:/bin" \
PATH="$ORCA_HOME/tools/bin:$ORCA_HOME/bin:$(dirname "$system_node"):/usr/local/bin:/usr/bin:/bin" \
ORCA_USER_DATA="$HOME/.orcad-data" ORCA_SANDBOX_ID="$ORCA_SANDBOX_ID" "${managed_env[@]}" \
NODE_COMPILE_CACHE="$ORCA_HOME/compile-cache" \
ORCA_SESSION_ENV_NAMES="${secret_names[*]}" "${agent_env[@]}" \
cloud/apps/sandbox-control/image/vm/orca-session-env.sh
+8 -1
View File
@@ -17,4 +17,11 @@ if [ -r "$__orca_env_file" ]; then
done <"$__orca_env_file"
export ORCA_SESSION_ENV_NAMES="${__orca_names# }"
fi
unset __orca_env_file __orca_line __orca_n __orca_names
# Default branch of the cloud workspace repo, once its first-boot clone exists (computed once per shell tree).
if [ -n "${ORCA_WORKSPACE_PATH-}" ] && [ -z "${ORCA_DEFAULT_BRANCH-}" ]; then
__orca_branch="$(git -C "$ORCA_WORKSPACE_PATH" symbolic-ref --quiet --short refs/remotes/origin/HEAD 2>/dev/null || true)"
if [ -n "$__orca_branch" ]; then
export ORCA_DEFAULT_BRANCH="${__orca_branch#origin/}" CONDUCTOR_DEFAULT_BRANCH="${__orca_branch#origin/}"
fi
fi
unset __orca_env_file __orca_line __orca_n __orca_names __orca_branch