Integrate NemoClaw recovery and dashboard routing

This commit is contained in:
mmckeen-nv
2026-05-08 09:32:56 -07:00
parent 819e3e5f7d
commit 94bd7737d3
25 changed files with 1001 additions and 152 deletions
+46 -1
View File
@@ -1,6 +1,13 @@
const COOKIE_NAME = "openshell_control_session"
const SESSION_TTL_SECONDS = 12 * 60 * 60
type CookieSecurityRequest = {
headers: Pick<Headers, "get">
nextUrl?: {
protocol: string
}
}
type SessionPayload = {
sub: string
iat: number
@@ -24,6 +31,37 @@ function isDisabled() {
return /^(1|true|yes|on)$/i.test(process.env.OPENSHELL_CONTROL_AUTH_DISABLED || "")
}
function envFlag(value: string | undefined) {
if (!value) return null
if (/^(1|true|yes|on)$/i.test(value)) return true
if (/^(0|false|no|off)$/i.test(value)) return false
return null
}
function firstForwardedValue(value: string | null) {
return value?.split(",")[0]?.trim().toLowerCase() || ""
}
function publicBaseUsesHttps() {
if (!process.env.PUBLIC_BASE_URL) return false
try {
return new URL(process.env.PUBLIC_BASE_URL).protocol === "https:"
} catch {
return false
}
}
export function shouldUseSecureSessionCookie(request?: CookieSecurityRequest) {
const forced = envFlag(process.env.OPENSHELL_CONTROL_COOKIE_SECURE)
if (forced !== null) return forced
const forwardedProto = request ? firstForwardedValue(request.headers.get("x-forwarded-proto")) : ""
if (forwardedProto) return forwardedProto === "https"
if (request?.nextUrl?.protocol === "https:") return true
return publicBaseUsesHttps()
}
async function hmac(payload: string) {
const key = await crypto.subtle.importKey(
"raw",
@@ -99,7 +137,14 @@ export async function verifyRecoveryToken(token: string) {
export const sessionCookieOptions = {
httpOnly: true,
sameSite: "lax" as const,
secure: process.env.NODE_ENV === "production",
secure: shouldUseSecureSessionCookie(),
path: "/",
maxAge: SESSION_TTL_SECONDS,
}
export function sessionCookieOptionsForRequest(request: CookieSecurityRequest) {
return {
...sessionCookieOptions,
secure: shouldUseSecureSessionCookie(request),
}
}
+2 -1
View File
@@ -124,6 +124,7 @@ function buildEnvBlock(input: {
`CONTROLLER_NODE_ID=${input.controllerName}`,
`CONTROLLER_NODE_PARENT_URL=${input.parentControllerUrl}`,
`CONTROLLER_NODE_SHARED_SECRET=${input.token}`,
`PORT=${input.dashboardPort}`,
`NEXT_PUBLIC_DASHBOARD_PORT=${input.dashboardPort}`,
"NEXT_PUBLIC_API_BASE=",
"NEXT_PUBLIC_ENABLE_SANDBOX_OPERATIONS=true",
@@ -217,7 +218,7 @@ ENV_CONTROLLER_NODE
touch .env.local
TMP_ENV="$(mktemp)"
grep -Ev '^(CONTROLLER_NODE_ID|CONTROLLER_NODE_PARENT_URL|CONTROLLER_NODE_SHARED_SECRET|NEXT_PUBLIC_DASHBOARD_PORT|NEXT_PUBLIC_API_BASE|NEXT_PUBLIC_ENABLE_SANDBOX_OPERATIONS|OPENSHELL_GATEWAY|OPEN_SHELL_CONTAINER|TERMINAL_SERVER_AUTOSTART|TERMINAL_SERVER_PORT|OPENCLAW_DASHBOARD_URL|OPENCLAW_INSTANCE_REGISTRY_JSON)=' .env.local > "$TMP_ENV" || true
grep -Ev '^(CONTROLLER_NODE_ID|CONTROLLER_NODE_PARENT_URL|CONTROLLER_NODE_SHARED_SECRET|PORT|NEXT_PUBLIC_DASHBOARD_PORT|NEXT_PUBLIC_API_BASE|NEXT_PUBLIC_ENABLE_SANDBOX_OPERATIONS|OPENSHELL_GATEWAY|OPEN_SHELL_CONTAINER|TERMINAL_SERVER_AUTOSTART|TERMINAL_SERVER_PORT|OPENCLAW_DASHBOARD_URL|OPENCLAW_INSTANCE_REGISTRY_JSON)=' .env.local > "$TMP_ENV" || true
cat "$TMP_ENV" .env.controller-node > .env.local
rm -f "$TMP_ENV"
chmod 600 .env.local .env.controller-node
+217
View File
@@ -0,0 +1,217 @@
import { execFile } from "node:child_process"
import { promisify } from "node:util"
import { NEMOCLAW_BIN, NODE_BIN, commandExists, hostCommandEnv } from "./hostCommands"
const execFileAsync = promisify(execFile)
const NEMOCLAW_RECOVERY_MIN_VERSION = "0.0.37"
type NemoClawInvocation = {
file: string
args: string[]
display: string[]
}
type NemoClawRunResult = {
ok: boolean
stdout: string
stderr: string
exitCode: number | null
error: string | null
}
export type NemoClawDoctorCheck = {
group: string
label: string
status: "ok" | "warn" | "fail" | "info"
detail: string
hint?: string
}
export type NemoClawDoctorReport = {
schemaVersion: number
sandbox: string
status: "ok" | "warn" | "fail" | "info"
failed: number
warnings: number
checks: NemoClawDoctorCheck[]
}
function buildNemoClawInvocation(args: string[]): NemoClawInvocation | null {
if (!commandExists(NEMOCLAW_BIN)) return null
if (/\.(?:c?m?js|ts)$/i.test(NEMOCLAW_BIN)) {
return {
file: NODE_BIN,
args: [NEMOCLAW_BIN, ...args],
display: [NODE_BIN, NEMOCLAW_BIN, ...args],
}
}
return {
file: NEMOCLAW_BIN,
args,
display: [NEMOCLAW_BIN, ...args],
}
}
function parseVersion(value: string) {
return value.match(/v?(\d+\.\d+\.\d+)/)?.[1] ?? null
}
function versionGte(left: string, right: string) {
const leftParts = left.split(".").map((part) => Number.parseInt(part, 10) || 0)
const rightParts = right.split(".").map((part) => Number.parseInt(part, 10) || 0)
const length = Math.max(leftParts.length, rightParts.length)
for (let index = 0; index < length; index += 1) {
const a = leftParts[index] || 0
const b = rightParts[index] || 0
if (a > b) return true
if (a < b) return false
}
return true
}
function parseJsonObject(value: string) {
const trimmed = value.trim()
if (!trimmed) return null
try {
return JSON.parse(trimmed)
} catch {
const start = trimmed.indexOf("{")
const end = trimmed.lastIndexOf("}")
if (start === -1 || end === -1 || end <= start) return null
return JSON.parse(trimmed.slice(start, end + 1))
}
}
async function runNemoClaw(args: string[], timeout = 30000): Promise<NemoClawRunResult & { command: string[] }> {
const invocation = buildNemoClawInvocation(args)
if (!invocation) {
return {
ok: false,
stdout: "",
stderr: "",
exitCode: null,
error: "NemoClaw CLI is not available",
command: [NEMOCLAW_BIN, ...args],
}
}
try {
const { stdout, stderr } = await execFileAsync(invocation.file, invocation.args, {
env: hostCommandEnv({
OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY || "nemoclaw",
NO_COLOR: "1",
CLICOLOR: "0",
CLICOLOR_FORCE: "0",
}),
timeout,
maxBuffer: 8 * 1024 * 1024,
})
return {
ok: true,
stdout: String(stdout).trim(),
stderr: String(stderr).trim(),
exitCode: 0,
error: null,
command: invocation.display,
}
} catch (error: any) {
return {
ok: false,
stdout: String(error?.stdout || "").trim(),
stderr: String(error?.stderr || "").trim(),
exitCode: typeof error?.code === "number" ? error.code : null,
error: error instanceof Error ? error.message : String(error ?? "NemoClaw command failed"),
command: invocation.display,
}
}
}
export async function getNemoClawVersion() {
const result = await runNemoClaw(["--version"], 10000)
const version = parseVersion(`${result.stdout}\n${result.stderr}`)
return {
available: result.ok || Boolean(version),
version,
stdout: result.stdout,
stderr: result.stderr,
error: result.ok ? null : result.error,
command: result.command,
}
}
async function hasModernNemoClawSurface() {
const version = await getNemoClawVersion()
return {
...version,
supported: version.version ? versionGte(version.version, NEMOCLAW_RECOVERY_MIN_VERSION) : false,
minimumVersion: NEMOCLAW_RECOVERY_MIN_VERSION,
}
}
export async function getNemoClawDoctorReport(sandboxName: string) {
const capability = await hasModernNemoClawSurface()
if (!capability.supported) {
return {
available: capability.available,
supported: false,
attempted: false,
version: capability.version,
minimumVersion: capability.minimumVersion,
report: null as NemoClawDoctorReport | null,
error: capability.available
? `NemoClaw ${capability.version || "unknown"} does not expose doctor --json`
: capability.error || "NemoClaw CLI is not available",
}
}
const result = await runNemoClaw([sandboxName, "doctor", "--json"], 30000)
const parsed = result.ok ? parseJsonObject(result.stdout) : null
const report = parsed && typeof parsed === "object" ? parsed as NemoClawDoctorReport : null
return {
available: true,
supported: true,
attempted: true,
version: capability.version,
minimumVersion: capability.minimumVersion,
report,
error: report ? null : result.error || result.stderr || "NemoClaw doctor did not return JSON",
stdout: result.stdout,
stderr: result.stderr,
exitCode: result.exitCode,
}
}
export async function recoverSandboxWithNemoClaw(sandboxName: string) {
const capability = await hasModernNemoClawSurface()
if (!capability.supported) {
return {
available: capability.available,
supported: false,
attempted: false,
version: capability.version,
minimumVersion: capability.minimumVersion,
ok: false,
stdout: "",
stderr: "",
exitCode: null as number | null,
error: capability.available
? `NemoClaw ${capability.version || "unknown"} does not expose sandbox recover`
: capability.error || "NemoClaw CLI is not available",
}
}
const result = await runNemoClaw([sandboxName, "recover"], 90000)
return {
available: true,
supported: true,
attempted: true,
version: capability.version,
minimumVersion: capability.minimumVersion,
ok: result.ok,
stdout: result.stdout,
stderr: result.stderr,
exitCode: result.exitCode,
error: result.error,
}
}
+34
View File
@@ -0,0 +1,34 @@
import type { NextResponse } from "next/server"
import { shouldUseSecureSessionCookie } from "./controlAuth"
export const OPENCLAW_DASHBOARD_TOKEN_COOKIE = "openclaw_dashboard_token"
const DASHBOARD_TOKEN_TTL_SECONDS = 12 * 60 * 60
export function dashboardTokenCookieOptions(request: Request, path: string) {
return {
httpOnly: true,
sameSite: "lax" as const,
secure: shouldUseSecureSessionCookie({
headers: request.headers,
nextUrl: new URL(request.url),
}),
path,
maxAge: DASHBOARD_TOKEN_TTL_SECONDS,
}
}
export function extractOpenClawDashboardToken(url: string | null | undefined) {
if (!url) return null
try {
const parsed = new URL(url)
const hash = parsed.hash.startsWith("#") ? parsed.hash.slice(1) : parsed.hash
return new URLSearchParams(hash).get("token")?.trim() || null
} catch {
return null
}
}
export function setOpenClawDashboardTokenCookie(response: NextResponse, request: Request, path: string, token: string | null) {
if (!token) return
response.cookies.set(OPENCLAW_DASHBOARD_TOKEN_COOKIE, token, dashboardTokenCookieOptions(request, path))
}