fix(backup): default backup source to state dir (#13)

Dockerfile

@@ -92,7 +92,7 @@ ENV OPENCLAW_LLM_PROVIDER=thirdparty
 ENV OPENCLAW_LLM_API=openai-completions
 ENV OPENCLAW_BACKUP_ENABLED=true
 ENV OPENCLAW_BACKUP_CRON="*/30 * * * *"
-ENV OPENCLAW_BACKUP_SOURCE_DIR=/root
+ENV OPENCLAW_BACKUP_SOURCE_DIR=/root/.openclaw
 ENV OPENCLAW_SSHX_AUTO_START=false
 ENV OPENCLAW_BACKUP_PRIVATE=true
 ENV OPENCLAW_BACKUP_PATH_PREFIX=backups

README.md

@@ -66,7 +66,7 @@ In that case, you can still configure from inside the container (for example via
 - `OPENCLAW_CONFIG_PATH` (default: `/root/.openclaw/openclaw.json`)
 - `OPENCLAW_WORKSPACE_DIR` (default: `/root/.openclaw/workspace`)
 - `OPENCLAW_BACKUP_CRON` (default: `*/30 * * * *`, backup every 30 minutes)
-- `OPENCLAW_BACKUP_SOURCE_DIR` (default: `/root`, backup/restore base directory)
+- `OPENCLAW_BACKUP_SOURCE_DIR` (default: `/root/.openclaw`, backup/restore base directory)
 - `OPENCLAW_BACKUP_PATH_PREFIX` (default: `backups`)
 - `OPENCLAW_BACKUP_LATEST_NAME` (default: `latest-backup.tar.gz`)
 - `OPENCLAW_BACKUP_KEEP_COUNT` (default: `48`, keep newest N timestamped backup archives; older ones are auto-deleted)
@@ -291,7 +291,7 @@ For this project, if you need stable dashboard access without cold starts, use p
 
 ## Backup/Restore Flow
 
-- Startup restore: on container startup, it tries to fetch `latest-backup.tar.gz` from the Dataset and restore it to `OPENCLAW_BACKUP_SOURCE_DIR` (default `/root`)
+- Startup restore: on container startup, it tries to fetch `latest-backup.tar.gz` from the Dataset and restore it to `OPENCLAW_BACKUP_SOURCE_DIR` (default `/root/.openclaw`)
 - Scheduled backup: cron runs based on `OPENCLAW_BACKUP_CRON`
 - Shutdown backup: when the container receives a stop signal, one final backup is uploaded before exit
 - Each backup upload includes:

openclaw_hf/backup.py

@@ -57,7 +57,11 @@ class BackupConfig:
             raise ValueError("OPENCLAW_BACKUP_DATASET_REPO is not set")
 
         state_dir = Path(os.getenv("OPENCLAW_STATE_DIR", "/root/.openclaw")).resolve()
-        backup_source_dir = Path(os.getenv("OPENCLAW_BACKUP_SOURCE_DIR", "/root")).resolve()
+        backup_source_raw = (os.getenv("OPENCLAW_BACKUP_SOURCE_DIR") or "").strip()
+        if backup_source_raw:
+            backup_source_dir = Path(backup_source_raw).resolve()
+        else:
+            backup_source_dir = state_dir
         work_dir = Path(os.getenv("OPENCLAW_BACKUP_WORK_DIR", "/tmp/openclaw-backup")).resolve()
         repo_type = (os.getenv("OPENCLAW_BACKUP_REPO_TYPE") or "dataset").strip() or "dataset"
         path_prefix = (os.getenv("OPENCLAW_BACKUP_PATH_PREFIX") or "backups").strip("/")

scripts/openclaw-entrypoint.sh

@@ -18,7 +18,7 @@ OPENCLAW_LLM_BASE_URL_ENV="${OPENCLAW_LLM_BASE_URL_ENV:-OPENCLAW_LLM_BASE_URL}"
 OPENCLAW_LLM_API_KEY_ENV="${OPENCLAW_LLM_API_KEY_ENV:-OPENCLAW_LLM_API_KEY}"
 OPENCLAW_BACKUP_ENABLED="${OPENCLAW_BACKUP_ENABLED:-true}"
 OPENCLAW_BACKUP_CRON="${OPENCLAW_BACKUP_CRON:-*/30 * * * *}"
-OPENCLAW_BACKUP_SOURCE_DIR="${OPENCLAW_BACKUP_SOURCE_DIR:-/root}"
+OPENCLAW_BACKUP_SOURCE_DIR="${OPENCLAW_BACKUP_SOURCE_DIR:-${OPENCLAW_STATE_DIR}}"
 OPENCLAW_BACKUP_ENV_FILE_PATH="${OPENCLAW_BACKUP_ENV_FILE_PATH:-/etc/openclaw-backup.env}"
 OPENCLAW_STDOUT_LOG_PATH="${OPENCLAW_STDOUT_LOG_PATH:-/var/log/openclaw/gateway.stdout.log}"
 OPENCLAW_STDERR_LOG_PATH="${OPENCLAW_STDERR_LOG_PATH:-/var/log/openclaw/gateway.stderr.log}"

tests/test_backup.py

@@ -30,7 +30,7 @@ class FakeApi:
 
 
 class BackupTests(unittest.TestCase):
-    def test_from_env_defaults_to_root_paths(self):
+    def test_from_env_defaults_backup_source_to_state_dir(self):
         env = {
             "OPENCLAW_BACKUP_DATASET_REPO": "user/demo-backup",
         }
@@ -38,9 +38,25 @@ class BackupTests(unittest.TestCase):
             config = BackupConfig.from_env()
 
         self.assertEqual(config.state_dir, Path("/root/.openclaw").resolve())
-        self.assertEqual(config.backup_source_dir, Path("/root").resolve())
+        self.assertEqual(config.backup_source_dir, config.state_dir)
         self.assertEqual(config.keep_count, 48)
 
+    def test_from_env_defaults_backup_source_to_explicit_state_dir_when_unset(self):
+        with tempfile.TemporaryDirectory() as tmp:
+            tmp_path = Path(tmp)
+            state_dir = tmp_path / "state"
+            state_dir.mkdir(parents=True)
+
+            env = {
+                "OPENCLAW_BACKUP_DATASET_REPO": "user/demo-backup",
+                "OPENCLAW_STATE_DIR": str(state_dir),
+            }
+            with mock.patch.dict("os.environ", env, clear=True):
+                config = BackupConfig.from_env()
+
+            self.assertEqual(config.state_dir, state_dir.resolve())
+            self.assertEqual(config.backup_source_dir, state_dir.resolve())
+
     def test_from_env_uses_explicit_backup_source_dir(self):
         with tempfile.TemporaryDirectory() as tmp:
             tmp_path = Path(tmp)

tests/test_runtime_user_defaults.py

@@ -24,6 +24,7 @@ class RuntimeUserDefaultsTests(unittest.TestCase):
         self.assertIn("ENV OPENCLAW_HOME=/root", dockerfile)
         self.assertIn("ENV OPENCLAW_USER=root", dockerfile)
         self.assertIn("ENV OPENCLAW_GROUP=root", dockerfile)
+        self.assertIn("ENV OPENCLAW_BACKUP_SOURCE_DIR=/root/.openclaw", dockerfile)
         self.assertIn('OPENCLAW_BIN="$(command -v openclaw || true)"', dockerfile)
         self.assertIn('if [[ -z "$OPENCLAW_BIN" ]] && [[ -x /root/.npm-global/bin/openclaw ]]; then', dockerfile)
         self.assertIn('elif [[ -z "$OPENCLAW_BIN" ]] && [[ -x /root/.local/bin/openclaw ]]; then', dockerfile)
@@ -42,6 +43,7 @@ class RuntimeUserDefaultsTests(unittest.TestCase):
         self.assertIn('OPENCLAW_USER="${OPENCLAW_USER:-root}"', entrypoint)
         self.assertIn('OPENCLAW_GROUP="${OPENCLAW_GROUP:-root}"', entrypoint)
         self.assertIn('OPENCLAW_HOME="${OPENCLAW_HOME:-/root}"', entrypoint)
+        self.assertIn('OPENCLAW_BACKUP_SOURCE_DIR="${OPENCLAW_BACKUP_SOURCE_DIR:-${OPENCLAW_STATE_DIR}}"', entrypoint)
 
     def test_backup_cron_uses_openclaw_user(self):
         entrypoint = self._entrypoint_path().read_text(encoding="utf-8")