From ea24efbf24cb0107bd763da8a8216e8e2bec0a37 Mon Sep 17 00:00:00 2001
From: andrew <andrew@collectivelab.io>
Date: Sun, 12 Apr 2026 21:08:04 +0300
Subject: [PATCH] Harden local RustFS bootstrap repo recovery

---
 README.md                         |  4 ++++
 docs/deployment.md                |  5 +++++
 scripts/local-rustfs-bootstrap.sh | 28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/README.md b/README.md
index dad10c0..44c4931 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,10 @@ Docker must be installed and running first.
 The RustFS bootstrap prefers the rolling `edge` binaries and only falls back to
 source builds when release assets are unavailable.
 
+If a previous run left objects under the same repo prefix but did not finish
+initializing the repo, rerun with `RESET_REPO=1` or set `PREFIX` to a new
+value.
+
 ## Good Fit For
 
 - Team knowledge graphs and internal context graphs
diff --git a/docs/deployment.md b/docs/deployment.md
index 1c834f1..42b814d 100644
--- a/docs/deployment.md
+++ b/docs/deployment.md
@@ -61,6 +61,7 @@ Useful overrides:
 - `WORKDIR=/path/to/state`
 - `BUCKET=omnigraph-local`
 - `PREFIX=repos/context`
+- `RESET_REPO=1` to delete an existing partially initialized repo prefix before recreating it
 - `BIND=127.0.0.1:8080`
 - `RUSTFS_CONTAINER_NAME=omnigraph-rustfs-demo`
 
@@ -74,6 +75,10 @@ If `aws` is not installed, the script attempts a user-local AWS CLI install via
 `python3 -m pip`. Docker Desktop or another Docker daemon must already be
 running.
 
+If a previous bootstrap left objects behind under the selected `PREFIX` but did
+not finish initializing the repo, rerun with `RESET_REPO=1` or choose a new
+`PREFIX`.
+
 ## Container Deployment
 
 Build the image:
diff --git a/scripts/local-rustfs-bootstrap.sh b/scripts/local-rustfs-bootstrap.sh
index bb495a2..a314ebd 100755
--- a/scripts/local-rustfs-bootstrap.sh
+++ b/scripts/local-rustfs-bootstrap.sh
@@ -19,6 +19,7 @@ AWS_ENDPOINT_URL_S3="${AWS_ENDPOINT_URL_S3:-$AWS_ENDPOINT_URL}"
 AWS_ALLOW_HTTP="${AWS_ALLOW_HTTP:-true}"
 AWS_S3_FORCE_PATH_STYLE="${AWS_S3_FORCE_PATH_STYLE:-true}"
 FORCE_BUILD="${FORCE_BUILD:-0}"
+RESET_REPO="${RESET_REPO:-0}"
 
 REPO_URI="s3://$BUCKET/$PREFIX"
 SERVER_LOG="$WORKDIR/omnigraph-server.log"
@@ -290,12 +291,39 @@ ensure_bucket() {
     s3api create-bucket --bucket "$BUCKET" >/dev/null 2>&1 || true
 }
 
+repo_prefix_has_objects() {
+  local key_count
+  key_count="$("$AWS_BIN" --endpoint-url "$AWS_ENDPOINT_URL_S3" \
+    s3api list-objects-v2 \
+    --bucket "$BUCKET" \
+    --prefix "$PREFIX/" \
+    --max-keys 1 \
+    --query 'KeyCount' \
+    --output text 2>/dev/null || true)"
+
+  [ -n "$key_count" ] && [ "$key_count" != "None" ] && [ "$key_count" != "0" ]
+}
+
+reset_repo_prefix() {
+  log "Removing existing objects under $REPO_URI"
+  "$AWS_BIN" --endpoint-url "$AWS_ENDPOINT_URL_S3" \
+    s3 rm "s3://$BUCKET/$PREFIX" --recursive >/dev/null
+}
+
 initialize_repo() {
   if "$BIN_DIR/omnigraph" snapshot "$REPO_URI" --json >/dev/null 2>&1; then
     log "Reusing existing repo at $REPO_URI"
     return
   fi
 
+  if repo_prefix_has_objects; then
+    if [ "$RESET_REPO" = "1" ]; then
+      reset_repo_prefix
+    else
+      die "found existing objects under $REPO_URI but could not open an Omnigraph repo there. This usually means a previous bootstrap left a partially initialized prefix. Rerun with RESET_REPO=1 to delete that prefix and recreate it, or set PREFIX to a new value."
+    fi
+  fi
+
   log "Initializing repo at $REPO_URI"
   "$BIN_DIR/omnigraph" init --schema "$FIXTURE_DIR/context.pg" "$REPO_URI"