From 5f8e30c33e4fa774b81637ea6501c119059f6993 Mon Sep 17 00:00:00 2001 From: mmckeen-nv <108093260+mmckeen-nv@users.noreply.github.com> Date: Wed, 2 Sep 2026 10:26:44 -0700 Subject: [PATCH] fix: show deployed sandbox agent identity (#44) Co-authored-by: mmckeen-nv --- app/api/telemetry/real/route.ts | 78 ++++++++++--------- app/components/SandboxList.tsx | 25 ++++-- app/lib/nemoclawIdentity.d.mts | 18 +++++ app/lib/nemoclawIdentity.mjs | 80 ++++++++++++++++++++ tests/nemoclaw-identity-resolution-check.mjs | 47 ++++++++++++ tests/sandbox-lifecycle-check.mjs | 4 +- 6 files changed, 207 insertions(+), 45 deletions(-) create mode 100644 app/lib/nemoclawIdentity.d.mts create mode 100644 app/lib/nemoclawIdentity.mjs create mode 100644 tests/nemoclaw-identity-resolution-check.mjs diff --git a/app/api/telemetry/real/route.ts b/app/api/telemetry/real/route.ts index 0491e1b..67507e7 100644 --- a/app/api/telemetry/real/route.ts +++ b/app/api/telemetry/real/route.ts @@ -5,6 +5,13 @@ import { hostname, networkInterfaces } from "node:os" import path from "node:path" import { promisify } from "node:util" import { NEMOCLAW_BIN, NODE_BIN, OPENSHELL_BIN, hostCommandEnv } from "@/app/lib/hostCommands" +import { + parseDefaultSandboxNames, + parseNemoclawListJson, + resolveSandboxAgent, + type NemoClawListJsonIdentity, + type NemoClawRegistryData, +} from "@/app/lib/nemoclawIdentity.mjs" import { resolveRuntimeAuthority } from "@/app/lib/runtimeAuthority" const execFileAsync = promisify(execFile) @@ -30,10 +37,6 @@ type NemoClawSummary = { source: "nemoclaw-cli" | "none" } -type NemoClawRegistryData = { - sandboxes?: Record -} - type SandboxItem = { metadata: { name: string @@ -115,17 +118,6 @@ function parseOpenShellSandboxNames(output: string) { .filter((entry): entry is string => Boolean(entry)) } -function parseDefaultSandboxNames(output: string) { - return new Set( - output - .split(/\r?\n/) - .map((entry) => stripAnsi(entry)) - .filter((entry) => /^\s{2,}[\w.-]+(?:\s+\*)?\s*$/.test(entry) && entry.includes("*")) - .map((entry) => entry.replace("*", "").trim()) - .filter(Boolean) - ) -} - function buildNemoClawSummary(output: string | null, defaultSandboxNames: Set): NemoClawSummary { if (!output) { return { @@ -163,14 +155,6 @@ function readNemoClawRegistry(): NemoClawRegistryData { } } -function resolveSandboxAgent(name: string, id: string | null, registry: NemoClawRegistryData) { - const entries = registry.sandboxes ?? {} - const directEntry = entries[name] || (id ? entries[id] : undefined) - const namedEntry = Object.values(entries).find((entry) => entry?.name === name || Boolean(id && entry?.name === id)) - const agent = directEntry?.agent || namedEntry?.agent - return typeof agent === "string" && agent.trim() ? agent.trim() : "openclaw" -} - async function execNemoclaw(args: string[]) { const env = hostCommandEnv({ OPENSHELL_GATEWAY: process.env.OPENSHELL_GATEWAY || "nemoclaw", @@ -215,7 +199,12 @@ function readHostIdentity() { return { hostname: hostname(), address: "127.0.0.1", interface: "lo0" } } -async function readSandbox(name: string, defaultSandboxNames: Set, registry: NemoClawRegistryData): Promise<{ summary: SandboxSummary; pod: SandboxItem }> { +async function readSandbox( + name: string, + defaultSandboxNames: Set, + listJsonIdentity: NemoClawListJsonIdentity | null, + registry: NemoClawRegistryData | null +): Promise<{ summary: SandboxSummary; pod: SandboxItem }> { try { const [{ stdout: detailsStdout }, { stdout: sshStdout }] = await Promise.all([ execOpenShell(["sandbox", "get", name]), @@ -229,7 +218,7 @@ async function readSandbox(name: string, defaultSandboxNames: Set, regis const sshConfig = sshStdout.trim() const sshHostAlias = parseSshHostAlias(sshConfig, sandboxName) const isDefault = defaultSandboxNames.has(sandboxName) - const agent = resolveSandboxAgent(sandboxName, sandboxId, registry) + const agent = resolveSandboxAgent(sandboxName, sandboxId, listJsonIdentity, registry) return { summary: { @@ -274,7 +263,7 @@ async function readSandbox(name: string, defaultSandboxNames: Set, regis } catch (error) { const sandboxName = name const isDefault = defaultSandboxNames.has(sandboxName) - const agent = resolveSandboxAgent(sandboxName, sandboxName, registry) + const agent = resolveSandboxAgent(sandboxName, sandboxName, listJsonIdentity, registry) return { summary: { id: sandboxName, @@ -322,15 +311,28 @@ export async function GET() { try { const { stdout: sandboxListStdout } = await execOpenShell(["sandbox", "list"]) const names = parseOpenShellSandboxNames(sandboxListStdout) - const [nemoclawListResult, nemoclawStatusResult] = names.length > 0 - ? await Promise.all([ - execNemoclaw(["list"]).catch(() => null), - execNemoclaw(["status"]).catch(() => null), - ]) - : [null, null] - const defaultSandboxNames = parseDefaultSandboxNames(nemoclawListResult?.stdout ?? "") - const registry = readNemoClawRegistry() - const results = await Promise.all(names.map((name) => readSandbox(name, defaultSandboxNames, registry))) + let listJsonIdentity: NemoClawListJsonIdentity | null = null + let legacyListResult: { stdout: string; stderr: string } | null = null + const nemoclawStatusPromise = names.length > 0 + ? execNemoclaw(["status"]).catch(() => null) + : Promise.resolve(null) + + if (names.length > 0) { + const nemoclawListJsonResult = await execNemoclaw(["list", "--json"]).catch(() => null) + listJsonIdentity = parseNemoclawListJson(nemoclawListJsonResult?.stdout ?? "") + if (!listJsonIdentity) { + legacyListResult = await execNemoclaw(["list"]).catch(() => null) + } + } + + const nemoclawStatusResult = await nemoclawStatusPromise + const defaultSandboxNames = listJsonIdentity + ? new Set(listJsonIdentity.defaultSandboxNames) + : parseDefaultSandboxNames(legacyListResult?.stdout ?? "") + const registry = listJsonIdentity ? null : readNemoClawRegistry() + const results = await Promise.all( + names.map((name) => readSandbox(name, defaultSandboxNames, listJsonIdentity, registry)) + ) const sandboxes = results.map((result) => result.summary) const items = results.map((result) => result.pod) const nemoclaw = buildNemoClawSummary(nemoclawStatusResult?.stdout ?? null, defaultSandboxNames) @@ -363,7 +365,11 @@ export async function GET() { explicitInstanceOverride: authority.explicitInstanceOverride, usedMappedSandboxInstance: authority.usedMappedSandboxInstance, })), - defaultSource: defaultSandboxNames.size > 0 ? "nemoclaw-cli" : "none", + defaultSource: listJsonIdentity + ? "nemoclaw-list-json" + : defaultSandboxNames.size > 0 + ? "nemoclaw-cli" + : "none", count: inventoryCount, message: hasMappedFallbackWithoutInventory ? "Fetched live OpenShell inventory: zero sandboxes reported, so any mapped NemoClaw dashboard should be treated as fallback-only." diff --git a/app/components/SandboxList.tsx b/app/components/SandboxList.tsx index ee2a529..9319e29 100644 --- a/app/components/SandboxList.tsx +++ b/app/components/SandboxList.tsx @@ -78,14 +78,19 @@ function openDashboardUrl(url: string, openInNewTab: boolean) { } function displaySandboxAgent(agent?: string) { - if (agent === 'hermes') return 'Hermes' - return 'OpenClaw' + const normalized = typeof agent === 'string' ? agent.trim().toLowerCase() : '' + if (normalized === 'hermes') return 'Hermes' + if (!normalized || normalized === 'openclaw') return 'OpenClaw' + if (normalized === 'unknown') return 'Unknown' + return agent || 'Unknown' } function SandboxTypeLogo({ agent }: { agent?: string }) { - const isHermes = agent === 'hermes' - const label = isHermes ? 'Hermes sandbox' : 'OpenClaw sandbox' - const logoSrc = isHermes ? HERMES_SANDBOX_LOGO : OPENCLAW_SANDBOX_LOGO + const normalized = typeof agent === 'string' ? agent.trim().toLowerCase() : '' + const isHermes = normalized === 'hermes' + const isOpenClaw = !normalized || normalized === 'openclaw' + const label = isHermes ? 'Hermes sandbox' : isOpenClaw ? 'OpenClaw sandbox' : 'Non-OpenClaw sandbox' + const logoSrc = isHermes ? HERMES_SANDBOX_LOGO : isOpenClaw ? OPENCLAW_SANDBOX_LOGO : null return ( -