@runuai/host 0.9.1 → 0.9.3

package/scripts/agent/task-down.sh

@@ -2,11 +2,9 @@
 # task-down <taskId> — tear the task stack down. Idempotent (ADR-022).
 #
 # 1. docker compose down -v --rmi local --remove-orphans.
-# 2. For each selected project, git worktree remove --force its worktree
-#    (falls back to rm -rf when git refuses).
-# 3. rm -rf the whole task dir — workspace + ephemeral .uai/ render. The
-#    per-project bare mirrors under projects/<id>/repo.git persist.
-# 4. Persist final state: status=killed (unless already error/shipped).
+# 2. rm -rf the whole task dir — workspace + task-private Git repositories.
+#    Host caches under projects/<id>/host-cache.git persist.
+# 3. Persist final state: status=killed (unless already error/shipped).
 
 set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -30,14 +28,14 @@ if [ "$row_count" -lt 1 ]; then
   log "task row unavailable — tearing down by derived names"
   worktree_path=""
   compose_project="$(compose_project_for_task "$task_id")"
-  projects_json="[]"
 else
   worktree_path=$(jq -r '.[0].worktree_path // ""' <<<"$task_json")
   compose_project=$(jq -r '.[0].compose_project // ""' <<<"$task_json")
-  projects_json=$(db_get_projects_for_task "$task_id" 2>/dev/null) \
-    || projects_json="[]"
 fi
-projects_root="$UAI_WORKSPACE_ROOT/projects"
+# A task-up failure can leave an error row with compose_project=NULL while its
+# conventionally named container still exists. Bookkeeping must never suppress
+# teardown; the compose project is deterministic from the task id.
+[ -n "$compose_project" ] || compose_project=$(compose_project_for_task "$task_id")
 
 # task_dir falls back to the derived path when the row's worktree_path is
 # missing (e.g. crashed before persisting).
@@ -50,58 +48,36 @@ fi
 # 1. Compose stack.
 # -----------------------------------------------------------------------------
 
-if [ -n "$compose_project" ]; then
-  step "COMPOSE_DOWN_FAILED" "docker compose down -v --rmi local"
-  if [ -n "$task_dir" ] && [ -f "$task_dir/.uai/docker-compose.yml" ]; then
-    docker compose -p "$compose_project" -f "$task_dir/.uai/docker-compose.yml" \
-      down -v --rmi local --remove-orphans >/dev/null 2>&1 || true
-  else
-    # Fallback: tear down by project name only.
-    docker compose -p "$compose_project" down -v --rmi local --remove-orphans >/dev/null 2>&1 || true
-  fi
-  # `compose down` is intentionally best-effort because an already-absent
-  # stack can make a config-less fallback fail. Destruction itself is not
-  # best-effort: before deleting the worktree or reporting success, prove that
-  # no container remains under the stable compose project name.
-  remaining_containers=""
-  if ! remaining_containers=$(docker ps -aq \
-    --filter "label=com.docker.compose.project=$compose_project"); then
-    emit_err "COMPOSE_DOWN_FAILED" \
-      "could not verify teardown for compose project $compose_project" \
-      "docker ps after compose down"
-  fi
-  if [ -n "$remaining_containers" ]; then
-    emit_err "COMPOSE_DOWN_FAILED" \
-      "compose project $compose_project still has containers after teardown" \
-      "docker ps after compose down"
-  fi
+step "COMPOSE_DOWN_FAILED" "docker compose down -v --rmi local"
+if [ -n "$task_dir" ] && [ -f "$task_dir/.uai/docker-compose.yml" ]; then
+  docker compose -p "$compose_project" -f "$task_dir/.uai/docker-compose.yml" \
+    down -v --rmi local --remove-orphans >/dev/null 2>&1 || true
+else
+  # Fallback: tear down by project name only.
+  docker compose -p "$compose_project" down -v --rmi local --remove-orphans >/dev/null 2>&1 || true
 fi
-
-# -----------------------------------------------------------------------------
-# 2. Worktrees — one per selected project.
-# -----------------------------------------------------------------------------
-
-if [ -n "$task_dir" ] && [ -d "$task_dir/workspace" ]; then
-  while IFS= read -r project_obj; do
-    [ -n "$project_obj" ] || continue
-    project_id=$(jq -r '.id' <<<"$project_obj")
-    project_slug=$(jq -r '.slug' <<<"$project_obj")
-    mirror_dir="$projects_root/$project_id/repo.git"
-    worktree_target="$task_dir/workspace/$project_slug"
-    [ -d "$worktree_target" ] || continue
-    if [ -d "$mirror_dir" ]; then
-      # `--force` because the worktree may carry uncommitted changes the
-      # user asked us to discard.
-      git -C "$mirror_dir" worktree remove --force "$worktree_target" 2>/dev/null \
-        || rm -rf "$worktree_target"
-    else
-      rm -rf "$worktree_target"
-    fi
-  done < <(jq -c '.[]' <<<"$projects_json")
+# `compose down` is intentionally best-effort because an already-absent
+# stack can make a config-less fallback fail. Destruction itself is not
+# best-effort: before deleting the worktree or reporting success, prove that
+# no container remains under the stable compose project name.
+remaining_containers=""
+if ! remaining_containers=$(docker ps -aq \
+  --filter "label=com.docker.compose.project=$compose_project"); then
+  emit_err "COMPOSE_DOWN_FAILED" \
+    "could not verify teardown for compose project $compose_project" \
+    "docker ps after compose down"
+fi
+if [ -n "$remaining_containers" ]; then
+  emit_err "COMPOSE_DOWN_FAILED" \
+    "compose project $compose_project still has containers after teardown" \
+    "docker ps after compose down"
 fi
 
 # -----------------------------------------------------------------------------
-# 3. Remove the entire task directory (workspace + .uai/).
+# 2. Remove the entire task directory (workspace + task-private Git data).
+# No host Git command reads a repository that the just-removed container could
+# have modified. Legacy shared-mirror worktree metadata may remain stale, but
+# that retired `repo.git` path is never trusted by task-up again.
 # -----------------------------------------------------------------------------
 
 if [ -n "$task_dir" ] && [ -d "$task_dir" ]; then
@@ -110,10 +86,10 @@ if [ -n "$task_dir" ] && [ -d "$task_dir" ]; then
 fi
 
 # -----------------------------------------------------------------------------
-# 4. Persist final state.
+# 3. Persist final state.
 # -----------------------------------------------------------------------------
 
-current_status=$(jq -r '.[0].status' <<<"$task_json")
+current_status=$(jq -r '.[0].status // ""' <<<"$task_json")
 if [ "$current_status" != "shipped" ] && [ "$current_status" != "error" ]; then
   new_status="killed"
 else