Skip to content

fix(cli): write Hermes light skin over stdin on macOS #6837

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 3 commits into from
Jul 14, 2026
Merged

fix(cli): write Hermes light skin over stdin on macOS #6837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b83c3c4
fix(cli): write Hermes light skin over stdin on macOS
laitingsheng Jul 14, 2026
fd3bdc8
Merge branch 'main' into fix/hermes-light-skin-macos-exec
cv Jul 14, 2026
261e7fa
Merge remote-tracking branch 'origin/main' into fix/hermes-light-skin…
jyaunches Jul 14, 2026
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
28 changes: 12 additions & 16 deletions src/lib/actions/sandbox/connect-hermes-light-skin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,12 @@ function writeHermesLightSkinFile(sandboxName: string): boolean {
'mv -f "$tmp" "$skin_dir/nemoclaw-light.yaml"',
'chown sandbox:sandbox "$skin_dir/nemoclaw-light.yaml" 2>/dev/null || true',
].join("\n");
const result = runOpenshell(
["sandbox", "exec", "--name", sandboxName, "--", "sh", "-c", script],
{
ignoreError: true,
stdio: "ignore",
timeout: OPENSHELL_PROBE_TIMEOUT_MS,
},
);
const result = runOpenshell(["sandbox", "exec", "--name", sandboxName, "--", "sh", "-s"], {
ignoreError: true,
input: script,
stdio: ["pipe", "ignore", "ignore"],
timeout: OPENSHELL_PROBE_TIMEOUT_MS,
});
if (result.status === 0 && !result.error && !result.signal) return true;
warnHermesLightSkinFailure("write", result.error ?? `exit ${result.status ?? result.signal}`);
return false;
Expand All @@ -62,14 +60,12 @@ function removeHermesLightSkinFile(sandboxName: string): boolean {
'skin_dir="$hermes_home/skins"',
'rm -f "$skin_dir/nemoclaw-light.yaml"',
].join("\n");
const result = runOpenshell(
["sandbox", "exec", "--name", sandboxName, "--", "sh", "-c", script],
{
ignoreError: true,
stdio: "ignore",
timeout: OPENSHELL_PROBE_TIMEOUT_MS,
},
);
const result = runOpenshell(["sandbox", "exec", "--name", sandboxName, "--", "sh", "-s"], {
ignoreError: true,
input: script,
stdio: ["pipe", "ignore", "ignore"],
timeout: OPENSHELL_PROBE_TIMEOUT_MS,
});
if (result.status === 0 && !result.error && !result.signal) return true;
warnHermesLightSkinFailure("remove", result.error ?? `exit ${result.status ?? result.signal}`);
return false;
Expand Down
58 changes: 44 additions & 14 deletions src/lib/actions/sandbox/connect-hermes-light-theme.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,25 @@ function connectCalls(harness: ConnectHarness, sandboxName = "alpha") {
);
}

function execScript(call: unknown[]): string {
return String((call[1] as { input?: string } | undefined)?.input ?? "");
}

function skinWriteCalls(harness: ConnectHarness, sandboxName = "alpha") {
return harness.runOpenshellSpy.mock.calls.filter(
([args]) =>
Array.isArray(args) &&
args.slice(0, 6).join(" ") === `sandbox exec --name ${sandboxName} -- sh` &&
String(args[7] ?? "").includes('mv -f "$tmp" "$skin_dir/nemoclaw-light.yaml"'),
(call) =>
Array.isArray(call[0]) &&
call[0].join(" ") === `sandbox exec --name ${sandboxName} -- sh -s` &&
execScript(call).includes('mv -f "$tmp" "$skin_dir/nemoclaw-light.yaml"'),
);
}

function skinRemoveCalls(harness: ConnectHarness, sandboxName = "alpha") {
return harness.runOpenshellSpy.mock.calls.filter(
([args]) =>
Array.isArray(args) &&
args.slice(0, 6).join(" ") === `sandbox exec --name ${sandboxName} -- sh` &&
String(args[7] ?? "").includes('rm -f "$skin_dir/nemoclaw-light.yaml"'),
(call) =>
Array.isArray(call[0]) &&
call[0].join(" ") === `sandbox exec --name ${sandboxName} -- sh -s` &&
execScript(call).includes('rm -f "$skin_dir/nemoclaw-light.yaml"'),
);
}

Expand Down Expand Up @@ -97,8 +101,8 @@ describe("Hermes sandbox connect light terminal skin", () => {
expect.objectContaining({ agentName: "hermes" }),
);
const skinWriteCall = skinWriteCalls(harness)[0];
expect(skinWriteCall?.[0][7]).toContain("nemoclaw-light.yaml");
expect(skinWriteCall?.[0][7]).not.toContain("config.yaml");
expect(skinWriteCall).toBeDefined();
expect(execScript(skinWriteCall ?? [])).not.toContain("config.yaml");
expect(harness.writeSandboxConfigSpy).toHaveBeenCalledOnce();
expect(harness.writeSandboxConfigSpy.mock.calls[0][2]).toMatchObject({
display: { skin: NEMOCLAW_HERMES_LIGHT_SKIN_NAME },
Expand Down Expand Up @@ -178,8 +182,8 @@ describe("Hermes sandbox connect light terminal skin", () => {
runtime: { kind: "terminal", interactive_command: "hermes" },
},
});
harness.runOpenshellSpy.mockImplementation((args: unknown) => {
const script = Array.isArray(args) ? String(args[7] ?? "") : "";
harness.runOpenshellSpy.mockImplementation((_args: unknown, opts: unknown) => {
const script = String((opts as { input?: string } | undefined)?.input ?? "");
return script.includes('rm -f "$skin_dir/nemoclaw-light.yaml"')
? { status: 2, error: new Error(`remove failed ${REDACTED_URL_CANARY}`) }
: { status: 0 };
Expand Down Expand Up @@ -341,8 +345,8 @@ describe("Hermes sandbox connect light terminal skin", () => {
harness.writeSandboxConfigSpy.mockImplementationOnce(() => {
throw new Error(`update failed ${REDACTED_URL_CANARY}`);
});
harness.runOpenshellSpy.mockImplementation((args: unknown) => {
const script = Array.isArray(args) ? String(args[7] ?? "") : "";
harness.runOpenshellSpy.mockImplementation((_args: unknown, opts: unknown) => {
const script = String((opts as { input?: string } | undefined)?.input ?? "");
return script.includes('rm -f "$skin_dir/nemoclaw-light.yaml"')
? { status: 2, error: new Error(`remove failed ${REDACTED_URL_CANARY}`) }
: { status: 0 };
Expand All @@ -357,4 +361,30 @@ describe("Hermes sandbox connect light terminal skin", () => {
expect(warningText(harness)).not.toContain("user:secret");
expectConnectSucceeded(harness, exitSpy);
});

it("writes the Hermes light skin over stdin so the multi-line script never rides argv (#6834)", async () => {
vi.stubEnv("TERM_PROGRAM", "Apple_Terminal");
vi.stubEnv("COLORFGBG", "0;15");
const harness = createConnectHarness({
agentName: "hermes",
hermesConfig: { model: "test" },
sessionAgent: {
name: "hermes",
runtime: { kind: "terminal", interactive_command: "hermes" },
},
});

await expect(harness.connectSandbox("alpha")).rejects.toThrow("process.exit(0)");

const skinWriteCall = skinWriteCalls(harness)[0];
expect(skinWriteCall?.[0]).toEqual(["sandbox", "exec", "--name", "alpha", "--", "sh", "-s"]);
for (const part of (skinWriteCall?.[0] ?? []) as string[]) {
expect(part).not.toMatch(/[\n\r]/);
}
const opts = skinWriteCall?.[1] as { input?: string; stdio?: unknown } | undefined;
expect(opts?.input ?? "").toContain('mv -f "$tmp" "$skin_dir/nemoclaw-light.yaml"');
expect(opts?.input ?? "").toContain("\n");
expect(opts?.stdio).toEqual(["pipe", "ignore", "ignore"]);
expectConnectSucceeded(harness, exitSpy);
});
});
Loading