amangs commited on
Commit
6f1c0d6
·
1 Parent(s): 188bc44

Isolate all app data under /data/apps/{vscode,hermes,ekko,opencode,dsh}, purge clutter from workspace, and add python-dotenv

Browse files
Dockerfile CHANGED
@@ -154,8 +154,8 @@ ENV REA_UNBLOB_COMMAND="/usr/local/bin/unblob"
154
  ENV REA_FIRMWARE_PRLIMIT_COMMAND="/usr/bin/prlimit"
155
  ENV REA_PWNTOOLS_PYTHON="/usr/bin/python3"
156
 
157
- # Install loguru for data_sync
158
- RUN pip3 install --no-cache-dir --break-system-packages loguru
159
 
160
  # ------------------------------------------
161
  # 8. Hermes Agent Core & Caddy Server
 
154
  ENV REA_FIRMWARE_PRLIMIT_COMMAND="/usr/bin/prlimit"
155
  ENV REA_PWNTOOLS_PYTHON="/usr/bin/python3"
156
 
157
+ # Install loguru and python-dotenv
158
+ RUN pip3 install --no-cache-dir --break-system-packages loguru python-dotenv
159
 
160
  # ------------------------------------------
161
  # 8. Hermes Agent Core & Caddy Server
entrypoint.sh CHANGED
@@ -5,10 +5,10 @@ echo "🚀 Starting REA + Codeman Mission Control Space..."
5
  echo "================================================="
6
 
7
  # 1. Directories:
8
- # - /data (S3 bucket): workspace code, services, opencode config, and /data/apps/ backups
9
  # - /tmp (ephemeral local disk): logs, caches, scratch files
10
  # - /home/appuser (container overlayfs): SQLite databases (hermes-web-ui.db, state.db)
11
- mkdir -p /data/{workspace,code-server,services,config/opencode,apps/hermes,apps/ekko}
12
  mkdir -p /tmp/{logs,.cache,code-server-cache}
13
  mkdir -p /home/appuser/{.hermes,.hermes-web-ui}
14
  chmod -R 755 /data/services /data/apps
@@ -27,11 +27,11 @@ for f in /app/services/*.sh /app/services/*.py; do
27
  chmod +x "$target"
28
  done
29
 
30
- # Ensure opencode global configuration persists on /data
31
  mkdir -p /root/.config
32
- ln -sfn /data/config/opencode /root/.config/opencode 2>/dev/null || true
33
- if [ ! -f /data/config/opencode/opencode.json ]; then
34
- cat << 'OPEOF' > /data/config/opencode/opencode.json
35
  {
36
  "mcp": {
37
  "rea": {
@@ -47,9 +47,8 @@ if [ ! -f /data/config/opencode/opencode.json ]; then
47
  OPEOF
48
  fi
49
 
50
- # Ensure workspace .opencode also inherits persistent settings
51
- mkdir -p /data/workspace/.opencode
52
- ln -sfn /data/config/opencode/opencode.json /data/workspace/.opencode/opencode.json 2>/dev/null || true
53
 
54
  # Clean legacy logs/tmp and active SQLite DBs from FUSE bucket to prevent deadlocks
55
  rm -rf /data/logs /data/tmp /data/.cache /data/openclaw /data/script/codeman /data/.hermes /data/.hermes-web-ui /data/.ekko-studio /data/.ekko 2>/dev/null || true
 
5
  echo "================================================="
6
 
7
  # 1. Directories:
8
+ # - /data (S3 bucket): workspace (user files only), /data/apps/ (isolated application data)
9
  # - /tmp (ephemeral local disk): logs, caches, scratch files
10
  # - /home/appuser (container overlayfs): SQLite databases (hermes-web-ui.db, state.db)
11
+ mkdir -p /data/{workspace,services,apps/vscode,apps/hermes,apps/ekko,apps/opencode,apps/dsh}
12
  mkdir -p /tmp/{logs,.cache,code-server-cache}
13
  mkdir -p /home/appuser/{.hermes,.hermes-web-ui}
14
  chmod -R 755 /data/services /data/apps
 
27
  chmod +x "$target"
28
  done
29
 
30
+ # Ensure opencode global configuration persists under /data/apps/opencode
31
  mkdir -p /root/.config
32
+ ln -sfn /data/apps/opencode /root/.config/opencode 2>/dev/null || true
33
+ if [ ! -f /data/apps/opencode/opencode.json ]; then
34
+ cat << 'OPEOF' > /data/apps/opencode/opencode.json
35
  {
36
  "mcp": {
37
  "rea": {
 
47
  OPEOF
48
  fi
49
 
50
+ # Clean clutter out of user /data/workspace
51
+ rm -rf /data/workspace/.claude /data/workspace/.vscode /data/workspace/.opencode /data/workspace/config.yaml /data/workspace/hook-secret /data/workspace/session-lifecycle.jsonl /data/workspace/state.json* /data/workspace/subagent-window-states.json 2>/dev/null || true
 
52
 
53
  # Clean legacy logs/tmp and active SQLite DBs from FUSE bucket to prevent deadlocks
54
  rm -rf /data/logs /data/tmp /data/.cache /data/openclaw /data/script/codeman /data/.hermes /data/.hermes-web-ui /data/.ekko-studio /data/.ekko 2>/dev/null || true
services/02-setup-rea-agents.sh CHANGED
@@ -31,11 +31,12 @@ for p in ["/home/appuser/.hermes/config.yaml", "/data/apps/hermes/config.yaml"]:
31
  print("Registered REA in Hermes config:", p)
32
  ' >> "$LOG" 2>&1 || true
33
 
34
- # 2. OpenCode CLI MCP registration (/root/.config/opencode/opencode.json & /data/config/opencode/opencode.json)
 
35
  python3 -c '
36
  import json, os
37
 
38
- for p in ["/data/config/opencode/opencode.json", "/data/workspace/.opencode/opencode.json", "/root/.config/opencode/opencode.json"]:
39
  os.makedirs(os.path.dirname(p), exist_ok=True)
40
  d = {}
41
  if os.path.exists(p):
@@ -54,12 +55,12 @@ for p in ["/data/config/opencode/opencode.json", "/data/workspace/.opencode/open
54
  print("Registered REA in OpenCode config:", p)
55
  ' >> "$LOG" 2>&1 || true
56
 
57
- # 3. Claude Code CLI MCP registration (~/.claude/mcp.json & /data/workspace/.claude/mcp.json)
58
- mkdir -p /root/.claude /data/workspace/.claude
59
  python3 -c '
60
  import json, os
61
 
62
- for p in ["/root/.claude/mcp.json", "/data/workspace/.claude/mcp.json", "/data/code-server/User/mcp.json", "/data/workspace/.vscode/mcp.json"]:
63
  os.makedirs(os.path.dirname(p), exist_ok=True)
64
  d = {}
65
  if os.path.exists(p):
@@ -77,12 +78,12 @@ for p in ["/root/.claude/mcp.json", "/data/workspace/.claude/mcp.json", "/data/c
77
  print("Registered REA in Claude/VSCode config:", p)
78
  ' >> "$LOG" 2>&1 || true
79
 
80
- # 4. DeepSeek Harness (DSH) MCP registration (/data/config/dsh/dsh.json & /root/.dsh/config.json)
81
- mkdir -p /data/config/dsh /root/.dsh
82
  python3 -c '
83
  import json, os
84
 
85
- for p in ["/data/config/dsh/dsh.json", "/root/.dsh/config.json"]:
86
  os.makedirs(os.path.dirname(p), exist_ok=True)
87
  d = {}
88
  if os.path.exists(p):
 
31
  print("Registered REA in Hermes config:", p)
32
  ' >> "$LOG" 2>&1 || true
33
 
34
+ # 2. OpenCode CLI MCP registration (/data/apps/opencode/opencode.json & /root/.config/opencode/opencode.json)
35
+ mkdir -p /data/apps/opencode
36
  python3 -c '
37
  import json, os
38
 
39
+ for p in ["/data/apps/opencode/opencode.json", "/root/.config/opencode/opencode.json"]:
40
  os.makedirs(os.path.dirname(p), exist_ok=True)
41
  d = {}
42
  if os.path.exists(p):
 
55
  print("Registered REA in OpenCode config:", p)
56
  ' >> "$LOG" 2>&1 || true
57
 
58
+ # 3. Claude Code CLI MCP registration (~/.claude/mcp.json) & VS Code (/data/apps/vscode)
59
+ mkdir -p /root/.claude /data/apps/vscode/User
60
  python3 -c '
61
  import json, os
62
 
63
+ for p in ["/root/.claude/mcp.json", "/data/apps/vscode/User/mcp.json"]:
64
  os.makedirs(os.path.dirname(p), exist_ok=True)
65
  d = {}
66
  if os.path.exists(p):
 
78
  print("Registered REA in Claude/VSCode config:", p)
79
  ' >> "$LOG" 2>&1 || true
80
 
81
+ # 4. DeepSeek Harness (DSH) MCP registration (/data/apps/dsh/dsh.json & /root/.dsh/config.json)
82
+ mkdir -p /data/apps/dsh /root/.dsh
83
  python3 -c '
84
  import json, os
85
 
86
+ for p in ["/data/apps/dsh/dsh.json", "/root/.dsh/config.json"]:
87
  os.makedirs(os.path.dirname(p), exist_ok=True)
88
  d = {}
89
  if os.path.exists(p):
services/05-code-server.sh CHANGED
@@ -2,7 +2,7 @@
2
  # 05-code-server.sh — code-server service on 127.0.0.1:8443
3
  DIR="/data/script/code-server"
4
  WORKSPACE="${CODE_WORKSPACE:-/data/workspace}"
5
- USER_DATA="${CODE_USER_DATA:-/data/code-server}"
6
  mkdir -p "$DIR" "$WORKSPACE" "$USER_DATA/User" "$HOME/.config/Code/User" "$WORKSPACE/.vscode" /tmp/logs /tmp/code-server-cache
7
  LOG="/tmp/logs/code-server.log"
8
 
 
2
  # 05-code-server.sh — code-server service on 127.0.0.1:8443
3
  DIR="/data/script/code-server"
4
  WORKSPACE="${CODE_WORKSPACE:-/data/workspace}"
5
+ USER_DATA="${CODE_USER_DATA:-/data/apps/vscode}"
6
  mkdir -p "$DIR" "$WORKSPACE" "$USER_DATA/User" "$HOME/.config/Code/User" "$WORKSPACE/.vscode" /tmp/logs /tmp/code-server-cache
7
  LOG="/tmp/logs/code-server.log"
8
 
services/apps_sync.py CHANGED
@@ -100,7 +100,7 @@ def restore_all():
100
  for f in DURABLE_FILES:
101
  src_f = hermes_backup / f
102
  dst_f = LOCAL_HERMES / f
103
- if src_f.exists() and not dst_f.exists():
104
  shutil.copy2(src_f, dst_f)
105
  safe_sqlite_restore(hermes_backup / "state.db", LOCAL_HERMES / "state.db")
106
 
@@ -111,7 +111,7 @@ def restore_all():
111
  for f in ["device-identity.json", "startup-tasks.json"]:
112
  src_f = ekko_backup / f
113
  dst_f = LOCAL_EKKO / f
114
- if src_f.exists() and not dst_f.exists():
115
  shutil.copy2(src_f, dst_f)
116
 
117
  print("✅ Restore from /data/apps/ complete!")
 
100
  for f in DURABLE_FILES:
101
  src_f = hermes_backup / f
102
  dst_f = LOCAL_HERMES / f
103
+ if src_f.exists():
104
  shutil.copy2(src_f, dst_f)
105
  safe_sqlite_restore(hermes_backup / "state.db", LOCAL_HERMES / "state.db")
106
 
 
111
  for f in ["device-identity.json", "startup-tasks.json"]:
112
  src_f = ekko_backup / f
113
  dst_f = LOCAL_EKKO / f
114
+ if src_f.exists():
115
  shutil.copy2(src_f, dst_f)
116
 
117
  print("✅ Restore from /data/apps/ complete!")