fix: follow native OpenClaw config ownership (#53)
Route controller-managed OpenClaw MCP and inference updates through the native config patch boundary and retire stale config-hash writes.
This commit is contained in:
@@ -1,67 +1,13 @@
|
||||
import { spawn } from "node:child_process"
|
||||
import { OPENSHELL_BIN, hostCommandEnv } from "./hostCommands"
|
||||
import { restartSandboxGatewayWithNemoClaw } from "./nemoclawCli"
|
||||
import { writeNativeOpenClawConfigPatch } from "./openClawNativeConfig"
|
||||
|
||||
export const OPENSHELL_CONTROL_MCP_SERVER_NAME = "openshell-control"
|
||||
export const OPENCLAW_CONFIG_PATH = "/sandbox/.openclaw/openclaw.json"
|
||||
const OPENCLAW_CONFIG_HASH_PATH = "/sandbox/.openclaw/.config-hash"
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return Boolean(value) && typeof value === "object" && !Array.isArray(value)
|
||||
}
|
||||
|
||||
function normalizeBrokerBaseUrl(value: string) {
|
||||
return value.replace(/\/+$/, "")
|
||||
}
|
||||
|
||||
function runSandboxShell(sandboxName: string, script: string, input?: string, timeoutMs = 60000) {
|
||||
return new Promise<{ stdout: string; stderr: string; code: number | null }>((resolve, reject) => {
|
||||
const child = spawn(OPENSHELL_BIN, ["sandbox", "exec", "-n", sandboxName, "--", "sh", "-lc", script], {
|
||||
env: hostCommandEnv({
|
||||
OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY?.trim() || undefined,
|
||||
}),
|
||||
stdio: ["pipe", "pipe", "pipe"],
|
||||
})
|
||||
let stdout = ""
|
||||
let stderr = ""
|
||||
const timer = setTimeout(() => child.kill("SIGTERM"), timeoutMs)
|
||||
child.stdout.on("data", (chunk) => { stdout += String(chunk) })
|
||||
child.stderr.on("data", (chunk) => { stderr += String(chunk) })
|
||||
child.on("error", (error) => {
|
||||
clearTimeout(timer)
|
||||
reject(error)
|
||||
})
|
||||
child.on("close", (code) => {
|
||||
clearTimeout(timer)
|
||||
resolve({ stdout: stdout.trim(), stderr: stderr.trim(), code })
|
||||
})
|
||||
if (input) child.stdin.end(input)
|
||||
else child.stdin.end()
|
||||
})
|
||||
}
|
||||
|
||||
async function readOpenClawConfig(sandboxName: string) {
|
||||
const result = await runSandboxShell(sandboxName, `cat ${OPENCLAW_CONFIG_PATH}`)
|
||||
if (result.code !== 0) throw new Error(result.stderr || "Failed to read OpenClaw config")
|
||||
const parsed = JSON.parse(result.stdout)
|
||||
if (!isRecord(parsed)) throw new Error("OpenClaw config must be a JSON object")
|
||||
return parsed
|
||||
}
|
||||
|
||||
async function writeOpenClawConfig(sandboxName: string, config: Record<string, unknown>) {
|
||||
const payload = `${JSON.stringify(config, null, 2)}\n`
|
||||
const script = [
|
||||
`cat > ${OPENCLAW_CONFIG_PATH}`,
|
||||
`chmod 0660 ${OPENCLAW_CONFIG_PATH}`,
|
||||
`chown sandbox:sandbox ${OPENCLAW_CONFIG_PATH} 2>/dev/null || chown 998:998 ${OPENCLAW_CONFIG_PATH}`,
|
||||
`sha256sum ${OPENCLAW_CONFIG_PATH} > ${OPENCLAW_CONFIG_HASH_PATH}`,
|
||||
`chmod 0660 ${OPENCLAW_CONFIG_HASH_PATH}`,
|
||||
`chown sandbox:sandbox ${OPENCLAW_CONFIG_HASH_PATH} 2>/dev/null || chown 998:998 ${OPENCLAW_CONFIG_HASH_PATH}`,
|
||||
].join(" && ")
|
||||
const result = await runSandboxShell(sandboxName, script, payload)
|
||||
if (result.code !== 0) throw new Error(result.stderr || "Failed to write OpenClaw MCP config")
|
||||
}
|
||||
|
||||
async function restartNativeGateway(sandboxName: string) {
|
||||
const result = await restartSandboxGatewayWithNemoClaw(sandboxName)
|
||||
if (!result.ok) {
|
||||
@@ -88,18 +34,13 @@ export async function syncSandboxOpenClawMcpConfig(
|
||||
brokerBaseUrl: string,
|
||||
token: string,
|
||||
) {
|
||||
const current = await readOpenClawConfig(sandboxName)
|
||||
const mcp = isRecord(current.mcp) ? { ...current.mcp } : {}
|
||||
const servers = isRecord(mcp.servers) ? { ...mcp.servers } : {}
|
||||
const serverConfig = buildOpenClawMcpServerConfig(brokerBaseUrl, token)
|
||||
|
||||
servers[OPENSHELL_CONTROL_MCP_SERVER_NAME] = serverConfig
|
||||
mcp.servers = servers
|
||||
|
||||
await writeOpenClawConfig(sandboxName, {
|
||||
...current,
|
||||
mcp,
|
||||
})
|
||||
await writeNativeOpenClawConfigPatch(
|
||||
sandboxName,
|
||||
{ mcp: { servers: { [OPENSHELL_CONTROL_MCP_SERVER_NAME]: serverConfig } } },
|
||||
"Failed to apply native OpenClaw MCP config",
|
||||
)
|
||||
await restartNativeGateway(sandboxName)
|
||||
|
||||
return {
|
||||
@@ -111,22 +52,11 @@ export async function syncSandboxOpenClawMcpConfig(
|
||||
}
|
||||
|
||||
export async function revokeSandboxOpenClawMcpConfig(sandboxName: string) {
|
||||
const current = await readOpenClawConfig(sandboxName)
|
||||
const mcp = isRecord(current.mcp) ? { ...current.mcp } : {}
|
||||
const servers = isRecord(mcp.servers) ? { ...mcp.servers } : {}
|
||||
delete servers[OPENSHELL_CONTROL_MCP_SERVER_NAME]
|
||||
|
||||
const nextConfig: Record<string, unknown> = { ...current }
|
||||
if (Object.keys(servers).length > 0) {
|
||||
mcp.servers = servers
|
||||
nextConfig.mcp = mcp
|
||||
} else {
|
||||
delete mcp.servers
|
||||
if (Object.keys(mcp).length > 0) nextConfig.mcp = mcp
|
||||
else delete nextConfig.mcp
|
||||
}
|
||||
|
||||
await writeOpenClawConfig(sandboxName, nextConfig)
|
||||
await writeNativeOpenClawConfigPatch(
|
||||
sandboxName,
|
||||
{ mcp: { servers: { [OPENSHELL_CONTROL_MCP_SERVER_NAME]: null } } },
|
||||
"Failed to remove native OpenClaw MCP config",
|
||||
)
|
||||
await restartNativeGateway(sandboxName)
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user