@rallycry/conveyor-agent 10.2.4 → 10.2.5

package/runtime/entrypoint.sh

@@ -324,6 +324,13 @@ if [ -n "${CONVEYOR_USER_ID}" ] && [ -n "${USER_HOME_PROJECT_ID}" ] && [ -d "${U
   ln -sfn "${USER_HOME_ROOT}/.claude"        /home/conveyor/.claude
   ln -sfn "${USER_HOME_ROOT}/.claude.json"   /home/conveyor/.claude.json
   ln -sfn "${USER_HOME_ROOT}/.config/claude" /home/conveyor/.config/claude
+
+  # OpenCode state (sessions + config) persists the same way as ~/.claude.
+  mkdir -p "${USER_HOME_ROOT}/.local/share/opencode" "${USER_HOME_ROOT}/.config/opencode" 2>/dev/null || true
+  rm -rf /home/conveyor/.local/share/opencode /home/conveyor/.config/opencode 2>/dev/null || true
+  mkdir -p /home/conveyor/.local/share 2>/dev/null || true
+  ln -sfn "${USER_HOME_ROOT}/.local/share/opencode" /home/conveyor/.local/share/opencode
+  ln -sfn "${USER_HOME_ROOT}/.config/opencode"      /home/conveyor/.config/opencode
 else
   echo "[pool] Skipping user-home symlink (userId='${CONVEYOR_USER_ID}', projectId='${USER_HOME_PROJECT_ID}', mount present: $([ -d "${USER_HOME_MOUNT}" ] && echo yes || echo no))"
   # No persistent home — the CLI reads the pod-local config; seed it there so
@@ -331,6 +338,88 @@ else
   seed_claude_json /home/conveyor/.claude.json
 fi
 
+# ── Wire published graphify bundles from the shared user-home mount ──
+# A locally published graph lives in the same GCS-FUSE user-home bucket as
+# Claude state, under users/_shared/graphify/<repo>/latest. Export the path
+# contract before the agent starts, then bind the files into graphify-out after
+# git has prepared the workspace but before the ready marker is released.
+configure_graphify_env() {
+  if [ "${CONVEYOR_GRAPHIFY_DISABLE:-}" = "1" ]; then
+    return 0
+  fi
+
+  local slug="${CONVEYOR_GRAPHIFY_SLUG:-${REPO_NAME:-}}"
+  if [ -z "${slug}" ]; then
+    return 0
+  fi
+
+  local primary_root="${USER_HOME_MOUNT}/users/_shared/graphify"
+  local legacy_root="${USER_HOME_MOUNT}/_shared/graphify"
+  local shared_root="${CONVEYOR_GRAPHIFY_SHARED_ROOT:-}"
+  if [ -z "${shared_root}" ]; then
+    if [ -d "${primary_root}" ] || [ ! -d "${legacy_root}" ]; then
+      shared_root="${primary_root}"
+    else
+      shared_root="${legacy_root}"
+    fi
+  fi
+
+  export CONVEYOR_GRAPHIFY_SLUG="${slug}"
+  export CONVEYOR_GRAPHIFY_SHARED_ROOT="${shared_root}"
+  export CONVEYOR_GRAPHIFY_DIR="${CONVEYOR_GRAPHIFY_DIR:-${shared_root}/${slug}/latest}"
+  export CONVEYOR_GRAPHIFY_GRAPH="${CONVEYOR_GRAPHIFY_GRAPH:-${CONVEYOR_GRAPHIFY_DIR}/graph.json}"
+}
+
+bind_graphify_bundle() {
+  if [ "${CONVEYOR_GRAPHIFY_DISABLE:-}" = "1" ]; then
+    echo "[pool] Graphify bind disabled."
+    return 0
+  fi
+
+  if [ -z "${CONVEYOR_GRAPHIFY_SLUG:-}" ]; then
+    return 0
+  fi
+
+  local workspace="${CONVEYOR_WORKSPACE:-/workspaces/repo}"
+  local source_dir="${CONVEYOR_GRAPHIFY_DIR:-}"
+  local graph_file="${CONVEYOR_GRAPHIFY_GRAPH:-}"
+
+  if [ -z "${source_dir}" ] || [ -z "${graph_file}" ]; then
+    return 0
+  fi
+
+  if [ ! -f "${graph_file}" ]; then
+    echo "[pool] Graphify bundle not found for '${CONVEYOR_GRAPHIFY_SLUG}' at ${source_dir}"
+    return 0
+  fi
+
+  local target_dir="${workspace}/graphify-out"
+  if ! mkdir -p "${target_dir}" 2>/dev/null; then
+    echo "[pool] WARN: unable to create graphify-out at ${target_dir}"
+    return 0
+  fi
+
+  local rel
+  for rel in graph.json GRAPH_REPORT.md manifest.json .graphify_analysis.json .graphify_labels.json publish-manifest.json cost.json; do
+    if [ ! -e "${source_dir}/${rel}" ]; then
+      continue
+    fi
+    if [ -e "${target_dir}/${rel}" ] || [ -L "${target_dir}/${rel}" ]; then
+      continue
+    fi
+    ln -s "${source_dir}/${rel}" "${target_dir}/${rel}" 2>/dev/null || true
+  done
+
+  echo "[pool] Bound graphify bundle '${CONVEYOR_GRAPHIFY_SLUG}' into ${target_dir}"
+}
+
+mark_git_ready() {
+  bind_graphify_bundle
+  : > "$GIT_READY_MARKER"
+}
+
+configure_graphify_env
+
 # ═══════════════════════════════════════════════════════════════════════════
 # WORKSPACE GIT — moved OFF the pre-launch critical path (Claudespace v3).
 #
@@ -489,7 +578,7 @@ prepare_workspace_git() {
     # Task repo is ready HERE — release the gate. The agent (already launched)
     # is polling for this marker before it spawns Claude / runs setup. Reference
     # repos are cloned AFTER this so they never block Claude.
-    : > "$GIT_READY_MARKER"
+    mark_git_ready
   elif [ -d "repo/.git" ] && [ -n "${CONVEYOR_GITHUB_TOKEN}" ]; then
     # Non-image but repo already present (e.g. a baked image running without
     # CONVEYOR_POD_IMAGE set). Must NOT settle for a bare remote-URL refresh —
@@ -501,7 +590,7 @@ prepare_workspace_git() {
     if ! sync_task_branch_to_repo; then
       return 1
     fi
-    : > "$GIT_READY_MARKER"
+    mark_git_ready
   elif [ -n "${CONVEYOR_GITHUB_TOKEN}" ] && [ -n "${REPO_OWNER}" ] && [ -n "${REPO_NAME}" ] && [ -n "${BRANCH}" ]; then
     echo "[pool] Cloning repo post-assignment (pre-clone was missing)..."
     # Guard each clone/fetch/checkout: under `set -e` a bare failing clone would
@@ -543,14 +632,14 @@ prepare_workspace_git() {
         return 1
       fi
     fi
-    : > "$GIT_READY_MARKER"
+    mark_git_ready
   else
     # No git plan (e.g. task-less pod, or no token/repo). Nothing to prepare —
     # the repo dir already exists (created before launch) and the agent's own
     # git-sync fallback (guarded by CONVEYOR_GIT_READY) never runs on this pod
     # path anyway. Signal ready so the agent doesn't wait out the timeout.
     echo "[pool] No git plan to prepare — marking git ready."
-    : > "$GIT_READY_MARKER"
+    mark_git_ready
   fi
 
   # ── Clone reference repos into /workspaces/references (best-effort) ──