fix(cli): stop in-sandbox messaging channels on nemoclaw stop

src/lib/services-command.test.ts

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
 
 import {
   resolveDefaultSandboxName,
@@ -10,6 +10,29 @@ import {
 } from "../../dist/lib/services-command";
 
 describe("services command", () => {
+  let savedEnv: Record<string, string | undefined>;
+
+  beforeEach(() => {
+    savedEnv = {
+      NEMOCLAW_SANDBOX_NAME: process.env.NEMOCLAW_SANDBOX_NAME,
+      NEMOCLAW_SANDBOX: process.env.NEMOCLAW_SANDBOX,
+      SANDBOX_NAME: process.env.SANDBOX_NAME,
+    };
+    delete process.env.NEMOCLAW_SANDBOX_NAME;
+    delete process.env.NEMOCLAW_SANDBOX;
+    delete process.env.SANDBOX_NAME;
+  });
+
+  afterEach(() => {
+    for (const [key, val] of Object.entries(savedEnv)) {
+      if (val !== undefined) {
+        process.env[key] = val;
+      } else {
+        delete process.env[key];
+      }
+    }
+  });
+
   it("returns a safe default sandbox name", () => {
     expect(resolveDefaultSandboxName(() => ({ defaultSandbox: "alpha-1" }))).toBe("alpha-1");
   });
@@ -21,6 +44,21 @@ describe("services command", () => {
     expect(resolveDefaultSandboxName(() => ({ defaultSandbox: "-leading-dash" }))).toBeUndefined();
   });
 
+  it("prefers NEMOCLAW_SANDBOX_NAME env var over registry default", () => {
+    process.env.NEMOCLAW_SANDBOX_NAME = "env-sandbox";
+    expect(resolveDefaultSandboxName(() => ({ defaultSandbox: "registry-sandbox" }))).toBe("env-sandbox");
+  });
+
+  it("prefers NEMOCLAW_SANDBOX env var over registry default", () => {
+    process.env.NEMOCLAW_SANDBOX = "env-sandbox-2";
+    expect(resolveDefaultSandboxName(() => ({ defaultSandbox: "registry-sandbox" }))).toBe("env-sandbox-2");
+  });
+
+  it("ignores unsafe env var values and falls back to registry", () => {
+    process.env.NEMOCLAW_SANDBOX_NAME = "bad name";
+    expect(resolveDefaultSandboxName(() => ({ defaultSandbox: "registry-sandbox" }))).toBe("registry-sandbox");
+  });
+
   it("starts services for the default sandbox when present", async () => {
     const startAll = vi.fn(async () => {});
     await runStartCommand({

src/lib/services-command.ts

@@ -18,6 +18,14 @@ export interface StopCommandDeps {
 const SAFE_SANDBOX_RE = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/;
 
 export function resolveDefaultSandboxName(listSandboxes: () => SandboxSummary): string | undefined {
+  // Explicit env var overrides take highest priority so that
+  // `NEMOCLAW_SANDBOX_NAME=foo nemoclaw stop` targets the right sandbox.
+  const envName =
+    process.env.NEMOCLAW_SANDBOX_NAME ??
+    process.env.NEMOCLAW_SANDBOX ??
+    process.env.SANDBOX_NAME;
+  if (envName && SAFE_SANDBOX_RE.test(envName)) return envName;
+
   const { defaultSandbox } = listSandboxes();
   return defaultSandbox && SAFE_SANDBOX_RE.test(defaultSandbox) ? defaultSandbox : undefined;
 }