Skip to content

fix(tunnel): keep service pid directory stable #4980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cv merged 1 commit into from
Jun 8, 2026
Merged

fix(tunnel): keep service pid directory stable #4980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/lib/tunnel/services-sandbox.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,14 @@ describe("stopAll with sandbox channels", () => {
logSpy.mockRestore();
});

it("uses the effective env-selected sandbox for host-side pid cleanup", () => {
it("uses the effective env-selected sandbox for sandbox cleanup with explicit host pidDir", () => {
const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
const savedNemoclaw = process.env.NEMOCLAW_SANDBOX;
const savedNemoclawName = process.env.NEMOCLAW_SANDBOX_NAME;
const savedSandbox = process.env.SANDBOX_NAME;
const savedTmpDir = process.env.TMPDIR;
const pidRoot = mkdtempSync(join(tmpdir(), "nemoclaw-services-pid-root-"));
const effectivePidDir = join(pidRoot, "nemoclaw-services-name-sandbox");
const lowerPriorityPidDir = join(pidRoot, "nemoclaw-services-other-sandbox");
process.env.TMPDIR = pidRoot;
rmSync(effectivePidDir, { recursive: true, force: true });
rmSync(lowerPriorityPidDir, { recursive: true, force: true });
mkdirSync(effectivePidDir, { recursive: true, mode: 0o700 });
Expand All @@ -382,7 +380,7 @@ describe("stopAll with sandbox channels", () => {
delete process.env.SANDBOX_NAME;

try {
stopAll();
stopAll({ pidDir: effectivePidDir });

expect(spawnSyncSpy).toHaveBeenCalledWith(
"/usr/local/bin/openshell",
Expand All @@ -398,8 +396,6 @@ describe("stopAll with sandbox channels", () => {
else delete process.env.NEMOCLAW_SANDBOX_NAME;
if (savedSandbox !== undefined) process.env.SANDBOX_NAME = savedSandbox;
else delete process.env.SANDBOX_NAME;
if (savedTmpDir !== undefined) process.env.TMPDIR = savedTmpDir;
else delete process.env.TMPDIR;
rmSync(pidRoot, { recursive: true, force: true });
logSpy.mockRestore();
}
Expand Down
5 changes: 2 additions & 3 deletions src/lib/tunnel/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
unlinkSync,
writeFileSync,
} from "node:fs";
import { tmpdir } from "node:os";
import { basename, join } from "node:path";
import { dockerSpawnSync } from "../adapters/docker";
import { resolveOpenshell } from "../adapters/openshell/resolve";
Expand All @@ -35,7 +34,7 @@ export interface ServiceOptions {
dashboardPort?: number;
/** Repo root directory — used to locate scripts/. */
repoDir?: string;
/** Override PID directory (default: {os.tmpdir()}/nemoclaw-services-{sandbox}). */
/** Override PID directory (default: /tmp/nemoclaw-services-{sandbox}). */
pidDir?: string;
/** Cloudflare named tunnel token. Falls back to CLOUDFLARE_TUNNEL_TOKEN. */
cloudflareTunnelToken?: string;
Expand Down Expand Up @@ -386,7 +385,7 @@ function resolvePidDir(opts: ServiceOptions): string {
const sandbox = validateSandboxName(
opts.sandboxName ?? process.env.NEMOCLAW_SANDBOX ?? process.env.SANDBOX_NAME ?? "default",
);
return opts.pidDir ?? join(tmpdir(), `nemoclaw-services-${sandbox}`);
return opts.pidDir ?? `/tmp/nemoclaw-services-${sandbox}`;
}

export function showStatus(opts: ServiceOptions = {}): void {
Expand Down