From 15d59846f10bf574e508b7d8db68f55b6c57e484 Mon Sep 17 00:00:00 2001 From: mmckeen-nv Date: Wed, 29 Apr 2026 16:11:49 -0700 Subject: [PATCH] Fix sandbox delete and inference routing --- app/api/sandbox/delete/route.ts | 68 ++++++++++------------- app/components/InferenceEndpointPanel.tsx | 4 +- app/lib/sandboxInferenceApply.ts | 44 +++++++++++---- tests/sandbox-lifecycle-check.mjs | 9 +-- 4 files changed, 71 insertions(+), 54 deletions(-) diff --git a/app/api/sandbox/delete/route.ts b/app/api/sandbox/delete/route.ts index 95a1bd9..4c26acf 100644 --- a/app/api/sandbox/delete/route.ts +++ b/app/api/sandbox/delete/route.ts @@ -1,8 +1,10 @@ import { NextResponse } from "next/server" import { execFile } from "node:child_process" +import { mkdir, readFile, writeFile } from "node:fs/promises" +import path from "node:path" import { promisify } from "node:util" import { resolveSandboxRef } from "@/app/lib/openshellHost" -import { NEMOCLAW_BIN, NEMOCLAW_CWD, OPENSHELL_BIN, hostCommandEnv } from "@/app/lib/hostCommands" +import { OPENSHELL_BIN, hostCommandEnv } from "@/app/lib/hostCommands" const execFileAsync = promisify(execFile) @@ -82,56 +84,46 @@ function isGatewayRecoverable(output: string) { return /Unknown gateway|Deploy it first|transport error|tcp connect error|Connection refused|invalid peer certificate|BadSignature/i.test(output) } -function isValidNemoClawSandboxName(value: string) { - return /^[a-z][a-z0-9-]*[a-z0-9]$|^[a-z]$/.test(value) -} - -function isNemoClawSandboxNotRegistered(output: string, sandboxName: string) { - return new RegExp(`Unknown command:\\s*${sandboxName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "i").test(output) -} +const NEMOCLAW_REGISTRY_PATH = path.join(process.env.HOME || "/tmp", ".nemoclaw", "sandboxes.json") async function cleanupNemoClawSandbox(sandboxName: string) { - if (!isValidNemoClawSandboxName(sandboxName)) { + try { + const raw = await readFile(NEMOCLAW_REGISTRY_PATH, "utf8") + const registry = JSON.parse(raw) + const sandboxes = registry && typeof registry === "object" && registry.sandboxes && typeof registry.sandboxes === "object" + ? registry.sandboxes + : {} + const existed = Object.prototype.hasOwnProperty.call(sandboxes, sandboxName) + if (existed) delete sandboxes[sandboxName] + const remaining = Object.keys(sandboxes) + const defaultSandbox = registry.defaultSandbox === sandboxName + ? remaining[0] || null + : (registry.defaultSandbox && sandboxes[registry.defaultSandbox] ? registry.defaultSandbox : remaining[0] || null) + const next = { ...registry, sandboxes, defaultSandbox } + await mkdir(path.dirname(NEMOCLAW_REGISTRY_PATH), { recursive: true, mode: 0o700 }) + await writeFile(NEMOCLAW_REGISTRY_PATH, `${JSON.stringify(next, null, 2)}\n`, { mode: 0o600 }) return { ok: true as const, stdout: "", stderr: "", - note: "Skipped NemoClaw registry cleanup because the target is not a valid NemoClaw sandbox name.", + note: existed + ? "Pruned NemoClaw registry entry without destroying the shared OpenShell gateway." + : "NemoClaw registry already had no matching sandbox entry.", } - } - - const startedAt = Date.now() - console.log(`[sandbox/delete] nemoclaw-cleanup:start sandbox=${sandboxName}`) - try { - const { stdout, stderr } = await execFileAsync(NEMOCLAW_BIN, [sandboxName, "destroy", "--yes"], { - cwd: NEMOCLAW_CWD, - env: hostCommandEnv({ - OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY || "nemoclaw", - }), - timeout: 90000, - maxBuffer: 20 * 1024 * 1024, - }) - console.log(`[sandbox/delete] nemoclaw-cleanup:done sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)}`) - return { ok: true as const, stdout: String(stdout).trim(), stderr: String(stderr).trim() } - } catch (error: any) { - const message = error instanceof Error ? error.message : String(error ?? "NemoClaw cleanup failed") - const stdout = String(error?.stdout || "").trim() - const stderr = String(error?.stderr || "").trim() - const output = [message, stdout, stderr].filter(Boolean).join("\n") - if (isNemoClawSandboxNotRegistered(output, sandboxName)) { - console.log(`[sandbox/delete] nemoclaw-cleanup:already-gone sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)}`) + } catch (error) { + const message = error instanceof Error ? error.message : String(error ?? "NemoClaw registry cleanup failed") + if (/ENOENT/.test(message)) { return { ok: true as const, - stdout, - stderr, - note: "NemoClaw registry already had no matching sandbox.", + stdout: "", + stderr: "", + note: "NemoClaw registry file does not exist; skipped registry cleanup.", } } - console.log(`[sandbox/delete] nemoclaw-cleanup:error sandbox=${sandboxName} elapsedMs=${elapsedMs(startedAt)} message=${message}`) return { ok: false as const, - stdout, - stderr, + stdout: "", + stderr: "", error: message, } } diff --git a/app/components/InferenceEndpointPanel.tsx b/app/components/InferenceEndpointPanel.tsx index 9806c2c..15cffdf 100644 --- a/app/components/InferenceEndpointPanel.tsx +++ b/app/components/InferenceEndpointPanel.tsx @@ -57,7 +57,7 @@ export default function InferenceEndpointPanel() { const [system, setSystem] = useState(emptyRoute) const [name, setName] = useState("vllm-local") const [type, setType] = useState("openai") - const [model, setModel] = useState("nvidia/NVIDIA-Nemotron-3-Super-120B-A12B-NVFP4") + const [model, setModel] = useState("vllm-local") const [baseUrl, setBaseUrl] = useState("http://host.docker.internal:8000/v1") const [credentialKey, setCredentialKey] = useState("OPENAI_API_KEY") const [apiKey, setApiKey] = useState("") @@ -143,7 +143,7 @@ export default function InferenceEndpointPanel() { function useVllmPreset() { setName("vllm-local") setType("openai") - setModel("nvidia/NVIDIA-Nemotron-3-Super-120B-A12B-NVFP4") + setModel("vllm-local") setBaseUrl("http://host.docker.internal:8000/v1") setCredentialKey("OPENAI_API_KEY") setApiKey("") diff --git a/app/lib/sandboxInferenceApply.ts b/app/lib/sandboxInferenceApply.ts index 41fd368..ebf205f 100644 --- a/app/lib/sandboxInferenceApply.ts +++ b/app/lib/sandboxInferenceApply.ts @@ -7,11 +7,11 @@ const execFileAsync = promisify(execFile) const DOCKER_BIN = process.env.DOCKER_BIN || "docker" const OPENSHELL_CLUSTER_CONTAINER = process.env.OPENSHELL_CLUSTER_CONTAINER || "openshell-cluster-nemoclaw" -function modelEntry(route: SandboxInferenceRoute, compat: Record | null) { +function modelEntry(modelId: string, modelName: string, compat: Record | null) { return { ...(compat ? { compat } : {}), - id: route.model, - name: route.model, + id: modelId, + name: modelName, reasoning: false, input: ["text"], cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 }, @@ -20,11 +20,31 @@ function modelEntry(route: SandboxInferenceRoute, compat: Record 0[\s\S]*execNemoclaw\(\["list"\]\)[\s\S]*execNemoclaw\(\["status"\]\)/, 'telemetry must skip NemoClaw list/status when OpenShell reports zero live sandboxes') assert.match(inferenceRouteSource, /\["provider", "create", "--name", name, "--type", type\]/, 'inference route must create OpenShell providers') @@ -102,6 +101,7 @@ assert.match(inferencePanelSource, /INFERENCE ENDPOINTS/, 'settings UI must expo assert.doesNotMatch(inferencePanelSource, /NVIDIA Preset|useNvidiaInferencePreset|aws\/anthropic\/claude-opus-4-5/, 'settings UI must not expose NVIDIA-corp-specific inference presets') assert.match(inferencePanelSource, /useVllmPreset/, 'settings UI must expose a vLLM endpoint preset') assert.match(inferencePanelSource, /host\.docker\.internal:8000\/v1/, 'vLLM preset must point at the host vLLM OpenAI-compatible endpoint') +assert.doesNotMatch(inferencePanelSource, /nvidia\/NVIDIA-Nemotron-3-Super-120B-A12B-NVFP4/, 'settings UI must not default rebuilt inference routes to the NVIDIA Nemotron model') assert.match(inferencePanelSource, /method: "DELETE"/, 'settings UI must expose provider deletion') assert.match(inferencePanelSource, /\/api\/ollama\/models/, 'settings UI must poll local Ollama models') assert.match(inferencePanelSource, /window\.setInterval\(\(\) => loadOllamaModels\(\{ silent: true \}\), 10000\)/, 'settings UI must autopoll Ollama while selected') @@ -125,7 +125,8 @@ assert.match(sandboxInferencePanelSource, /Add Route/, 'selected sandbox UI must assert.match(sandboxInferenceApplyLibSource, /\/sandbox\/\.openclaw\/openclaw\.json/, 'live apply must patch OpenClaw config inside the running sandbox') assert.match(sandboxInferenceApplyLibSource, /sha256sum \/sandbox\/\.openclaw\/openclaw\.json > \/sandbox\/\.openclaw\/\.config-hash/, 'live apply must refresh the immutable OpenClaw config hash') assert.match(sandboxInferenceApplyLibSource, /\["inference", "set", "--no-verify", "--provider", primary\.provider, "--model", primary\.model\]/, 'live apply must point OpenShell inference at the primary route') -assert.match(sandboxInferenceApplyLibSource, /name: route\.model/, 'live apply must keep model display names raw while primary refs remain provider-qualified') +assert.match(sandboxInferenceApplyLibSource, /resolveInferenceModelIdentity/, 'live apply must normalize provider/model identities for OpenClaw inference routes') +assert.match(sandboxInferenceApplyLibSource, /providerKey: "nvidia"[\s\S]*modelRef: route\.model/, 'live apply must preserve nvidia/... model refs without wrapping them as inference/...') assert.doesNotMatch(sandboxRestartRouteSource, /delete", "pod"|kubectl delete/, 'restart route must not delete the backing sandbox pod') assert.match(sandboxRestartRouteSource, /restartMode: "openclaw-runtime"/, 'restart route must restart only the in-sandbox OpenClaw runtime') assert.match(sandboxRestartRouteSource, /waitForSandboxReady\(sandboxName, 15000, 1000\)/, 'restart route must verify OpenShell reports the sandbox ready before runtime restart')