Stabilize OpenClaw gateway during sandbox create

This commit is contained in:
mmckeen-nv
2026-04-30 09:55:24 -07:00
parent acf4c05aeb
commit ae7a7c3a26
4 changed files with 97 additions and 4 deletions
+17 -1
View File
@@ -2,7 +2,7 @@ import { NextResponse } from "next/server"
import { execFile, spawn } from "node:child_process"
import { promisify } from "node:util"
import { inspectSandbox } from "@/app/lib/openshellHost"
import { repairOpenClawWorkspacePermissions } from "@/app/lib/sandboxPrivilegedFiles"
import { repairOpenClawWorkspacePermissions, stabilizeOpenClawGatewayConfig } from "@/app/lib/sandboxPrivilegedFiles"
import {
commandExists,
HOST_PATH,
@@ -438,6 +438,11 @@ export async function POST(request: Request) {
error: "Sandbox readiness polling produced no verification result.",
}
const created = readiness.verified
const gatewayConfigRepair = created ? await stabilizeOpenClawGatewayConfig(sandboxName).catch((error) => ({
sandboxName,
path: "/sandbox/.openclaw/openclaw.json",
error: error instanceof Error ? error.message : "Failed to stabilize OpenClaw gateway config",
})) : null
const workspaceRepair = created ? await repairOpenClawWorkspacePermissions(sandboxName).catch((error) => ({
sandboxName,
path: "/sandbox/.openclaw/workspace",
@@ -465,6 +470,7 @@ export async function POST(request: Request) {
elapsedMs: readiness.elapsedMs,
},
workspaceRepair,
gatewayConfigRepair,
deviceApproval,
stdout: result.stdout,
stderr: result.stderr,
@@ -475,6 +481,8 @@ export async function POST(request: Request) {
: "NemoClaw blueprint workflow completed in local/default mode. Existing healthy OpenShell gateways are reused before any new gateway start is attempted.",
workspaceRepair && "note" in workspaceRepair ? workspaceRepair.note : false,
workspaceRepair && "error" in workspaceRepair ? `OpenClaw workspace permission repair failed: ${workspaceRepair.error}` : false,
gatewayConfigRepair && "note" in gatewayConfigRepair ? gatewayConfigRepair.note : false,
gatewayConfigRepair && "error" in gatewayConfigRepair ? `OpenClaw gateway config repair failed: ${gatewayConfigRepair.error}` : false,
deviceApproval?.note,
)
: "Blueprint command reported success, but the sandbox never reached a ready verification state afterward.",
@@ -509,6 +517,11 @@ export async function POST(request: Request) {
error: "Sandbox readiness polling produced no verification result.",
}
const created = readiness.verified
const gatewayConfigRepair = created ? await stabilizeOpenClawGatewayConfig(sandboxName).catch((error) => ({
sandboxName,
path: "/sandbox/.openclaw/openclaw.json",
error: error instanceof Error ? error.message : "Failed to stabilize OpenClaw gateway config",
})) : null
const workspaceRepair = created ? await repairOpenClawWorkspacePermissions(sandboxName).catch((error) => ({
sandboxName,
path: "/sandbox/.openclaw/workspace",
@@ -541,6 +554,7 @@ export async function POST(request: Request) {
elapsedMs: readiness.elapsedMs,
},
workspaceRepair,
gatewayConfigRepair,
deviceApproval,
policyPrepared,
note: created
@@ -552,6 +566,8 @@ export async function POST(request: Request) {
: "Custom sandbox created."),
workspaceRepair && "note" in workspaceRepair ? workspaceRepair.note : false,
workspaceRepair && "error" in workspaceRepair ? `OpenClaw workspace permission repair failed: ${workspaceRepair.error}` : false,
gatewayConfigRepair && "note" in gatewayConfigRepair ? gatewayConfigRepair.note : false,
gatewayConfigRepair && "error" in gatewayConfigRepair ? `OpenClaw gateway config repair failed: ${gatewayConfigRepair.error}` : false,
deviceApproval?.note,
)
: "Create command started, but the sandbox never reached a ready verification state afterward.",
+45 -2
View File
@@ -50,6 +50,39 @@ export async function writeSandboxFilePrivileged(
}
}
export async function stabilizeOpenClawGatewayConfig(sandboxName: string) {
const patchConfig = [
`const fs = require("fs")`,
`const path = "/sandbox/.openclaw/openclaw.json"`,
`const cfg = JSON.parse(fs.readFileSync(path, "utf8"))`,
`cfg.plugins = cfg.plugins && typeof cfg.plugins === "object" && !Array.isArray(cfg.plugins) ? cfg.plugins : {}`,
`cfg.plugins.entries = cfg.plugins.entries && typeof cfg.plugins.entries === "object" && !Array.isArray(cfg.plugins.entries) ? cfg.plugins.entries : {}`,
`cfg.plugins.entries.bonjour = { ...(cfg.plugins.entries.bonjour || {}), enabled: false }`,
`fs.writeFileSync(path, JSON.stringify(cfg, null, 2) + "\\n")`,
].join("; ")
const script = [
`node -e ${shellQuote(patchConfig)}`,
`chmod 444 /sandbox/.openclaw/openclaw.json`,
`chown root:root /sandbox/.openclaw/openclaw.json`,
`(cd /sandbox/.openclaw && sha256sum openclaw.json > .config-hash)`,
`chmod 444 /sandbox/.openclaw/.config-hash`,
`chown root:root /sandbox/.openclaw/.config-hash`,
`mkdir -p /sandbox/.openclaw-data/logs`,
`chown -R sandbox:sandbox /sandbox/.openclaw-data/logs 2>/dev/null || chown -R 998:998 /sandbox/.openclaw-data/logs`,
`openclaw gateway stop >/dev/null 2>&1 || true`,
`if command -v gosu >/dev/null 2>&1; then nohup gosu sandbox openclaw gateway run >/sandbox/.openclaw-data/logs/gateway.log 2>&1 & else nohup openclaw gateway run >/sandbox/.openclaw-data/logs/gateway.log 2>&1 & fi`,
].join(" && ")
const result = await runDockerKubectl(
["exec", "-n", OPENSHELL_NAMESPACE, sandboxName, "--", "sh", "-lc", script],
)
if (result.code !== 0) throw new Error(result.stderr || "failed to stabilize OpenClaw gateway config")
return {
sandboxName,
path: "/sandbox/.openclaw/openclaw.json",
note: "Disabled the Bonjour gateway discovery plugin inside the sandbox because it crashes under the OpenShell network namespace.",
}
}
export async function repairOpenClawWorkspacePermissions(sandboxName: string) {
const mutableDirs = [
"agents",
@@ -64,13 +97,22 @@ export async function repairOpenClawWorkspacePermissions(sandboxName: string) {
"memory",
"logs",
"credentials",
"flows",
"sandbox",
"telegram",
"plugin-runtime-deps",
]
const mutableFiles = [
"update-check.json",
]
const script = [
`mkdir -p /sandbox/.openclaw /sandbox/.openclaw-data/agents/main/agent`,
`for dir in ${mutableDirs.map(shellQuote).join(" ")}; do target="/sandbox/.openclaw-data/$dir"; link="/sandbox/.openclaw/$dir"; mkdir -p "$target"; if [ -d "$link" ] && [ ! -L "$link" ]; then cp -a "$link/." "$target/" 2>/dev/null || true; rm -rf "$link"; fi; ln -sfn "$target" "$link"; done`,
`for file in ${mutableFiles.map(shellQuote).join(" ")}; do target="/sandbox/.openclaw-data/$file"; link="/sandbox/.openclaw/$file"; if [ ! -e "$target" ]; then if [ -f "$link" ] && [ ! -L "$link" ]; then cp "$link" "$target" 2>/dev/null || : > "$target"; else : > "$target"; fi; fi; if [ -e "$link" ] && [ ! -L "$link" ]; then rm -f "$link"; fi; ln -sfn "$target" "$link"; done`,
`approval="/sandbox/.openclaw/exec-approvals.json"; approval_data="/sandbox/.openclaw-data/exec-approvals.json"; tmp="/sandbox/.openclaw/.exec-approvals.reconcile.$$"; if [ -L "$approval" ]; then if [ -s "$approval_data" ]; then cp "$approval_data" "$tmp" 2>/dev/null || : > "$tmp"; else : > "$tmp"; fi; rm -f "$approval"; mv "$tmp" "$approval"; elif [ ! -e "$approval" ]; then : > "$approval"; fi`,
`chown -R sandbox:sandbox /sandbox/.openclaw-data 2>/dev/null || chown -R 998:998 /sandbox/.openclaw-data`,
`for dir in ${mutableDirs.map(shellQuote).join(" ")}; do chmod 0775 "/sandbox/.openclaw-data/$dir"; done`,
`chown sandbox:sandbox /sandbox/.openclaw /sandbox/.openclaw/exec-approvals.json 2>/dev/null || chown 998:998 /sandbox/.openclaw /sandbox/.openclaw/exec-approvals.json`,
`chmod 0755 /sandbox/.openclaw && chmod 0600 /sandbox/.openclaw/exec-approvals.json`,
].join(" && ")
const result = await runDockerKubectl(
["exec", "-n", OPENSHELL_NAMESPACE, sandboxName, "--", "sh", "-lc", script],
@@ -81,6 +123,7 @@ export async function repairOpenClawWorkspacePermissions(sandboxName: string) {
path: "/sandbox/.openclaw",
target: "/sandbox/.openclaw-data",
mutableDirs,
note: "Repaired OpenClaw mutable paths so AGENTS.md, session lock, and agent state writes resolve into writable .openclaw-data storage.",
mutableFiles,
note: "Reconciled the OpenClaw directory layout for NemoClaw: mutable state paths, AGENTS.md, session locks, update-check state, plugin runtime deps, and exec approvals are writable where the bundled OpenClaw expects them.",
}
}