mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-09-30 20:49:41 +02:00
Follow-up to #209 and #210. Both land a real fix (a pane that is a login shell picks up /etc/profile and the per-user PATH entries an ssh remote command never sees, which is what was failing agent CLIs with exit 127). Three corrections: 1. `-i -l` is no longer hardcoded onto the resolved shell. That path ultimately comes from the passwd entry, which is user data and can name anything, and a shell that rejects an unknown flag exits on the spot: nushell, elvish and xonsh take neither flag, so a user with one of those in passwd would have gotten a dead pane on arrival, which is exactly the #208 failure #209 builds on top of. loginShellArgs() applies them only to the POSIX-family shells verified to accept both, and a test really launches every allowlisted shell present on the machine rather than trusting the set. csh/tcsh are excluded deliberately: tcsh honors -l only when it is the ONLY flag. 2. `remain-on-exit on` -> `failed`, moved LAST in the tmux command chain. `on` keeps the pane after a CLEAN exit too, so typing `exit` in a remote shell stranded a dead pane, the session outlived it, and the next launch's `-A` reattached to that corpse: "Pane is dead (status 0)" instead of a shell, permanently, on the DEFAULT path. Verified against a real tmux, as was the fix: `failed` tears the session down on status 0 and keeps the pane on 127 with the "command not found" still on screen, which is the case #210 wanted. It is last because tmux aborts the remaining commands of a `\;` sequence once one errors (also verified) and `failed` needs tmux >= 3.2 on the REMOTE host; leading, a rejection there would have silently dropped status/mouse/prefix/ escape-time/window-size along with it. 3. `$SHELL` -> `"${SHELL:-/bin/sh}"`, via one shared remoteLoginShellCommand() helper instead of the string being rebuilt in tmux-manager as well. Also corrects the rationale both PRs carried: a tmux pane already hands the shell a tty, so it was interactive all along ($- contains i for a bare /bin/bash in a pane) and ~/.bashrc was always being sourced. `-l` is the flag doing the work. End-to-end verified, not just unit-tested: the emitted remote pane command was run through all three quoting layers under a minimal sshd-style PATH with the CLI installed only on a login-shell PATH entry, and it resolved and launched the CLI with its arguments intact and a space-containing remote path preserved. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
73 lines
2.5 KiB
TypeScript
73 lines
2.5 KiB
TypeScript
import { mkdtempSync, rmSync } from 'node:fs';
|
|
import { tmpdir } from 'node:os';
|
|
import { join } from 'node:path';
|
|
import { afterEach, describe, expect, it } from 'vitest';
|
|
import {
|
|
defaultRemoteCommandForMode,
|
|
readRemoteCases,
|
|
readRemoteHosts,
|
|
remoteDisplayPath,
|
|
remoteSshTarget,
|
|
writeRemoteCases,
|
|
writeRemoteHosts,
|
|
} from '../src/remote-hosts.js';
|
|
|
|
describe('remote-hosts domain', () => {
|
|
let dir: string | null = null;
|
|
|
|
afterEach(() => {
|
|
if (dir) rmSync(dir, { recursive: true, force: true });
|
|
dir = null;
|
|
});
|
|
|
|
function configDir(): string {
|
|
dir = mkdtempSync(join(tmpdir(), 'codeman-remote-hosts-'));
|
|
return dir;
|
|
}
|
|
|
|
it('round-trips remote hosts and remote cases from a config directory', async () => {
|
|
const root = configDir();
|
|
await writeRemoteHosts(root, [
|
|
{
|
|
id: 'gpu-box',
|
|
label: 'GPU Box',
|
|
host: '10.0.0.42',
|
|
username: 'ubuntu',
|
|
commands: { codex: 'exec codx personal' },
|
|
},
|
|
]);
|
|
await writeRemoteCases(root, [
|
|
{ name: 'gpu-work', type: 'remote', hostId: 'gpu-box', remotePath: '/home/ubuntu/work' },
|
|
]);
|
|
|
|
await expect(readRemoteHosts(root)).resolves.toEqual([
|
|
{
|
|
id: 'gpu-box',
|
|
label: 'GPU Box',
|
|
host: '10.0.0.42',
|
|
username: 'ubuntu',
|
|
commands: { codex: 'exec codx personal' },
|
|
},
|
|
]);
|
|
await expect(readRemoteCases(root)).resolves.toEqual([
|
|
{ name: 'gpu-work', type: 'remote', hostId: 'gpu-box', remotePath: '/home/ubuntu/work' },
|
|
]);
|
|
});
|
|
|
|
it('returns safe mode defaults and remote display values', () => {
|
|
expect(defaultRemoteCommandForMode('shell')).toBe('exec "${SHELL:-/bin/sh}" -i -l');
|
|
// Routed through an interactive login shell so per-user PATH entries (e.g.
|
|
// ~/.local/bin, ~/.opencode/bin) resolve — a bare `exec codex` sees only
|
|
// sshd's minimal default PATH and fails with "command not found".
|
|
expect(defaultRemoteCommandForMode('codex')).toBe('exec "${SHELL:-/bin/sh}" -i -l -c \'codex\'');
|
|
// Mirrors the local claude default so the remote agent runs non-interactively.
|
|
expect(defaultRemoteCommandForMode('claude')).toBe(
|
|
'exec "${SHELL:-/bin/sh}" -i -l -c \'claude --dangerously-skip-permissions\''
|
|
);
|
|
expect(remoteSshTarget({ id: 'h1', label: 'H1', host: 'box.local', username: 'aamer' })).toBe('aamer@box.local');
|
|
expect(remoteDisplayPath({ username: 'aamer', host: 'box.local', path: '/opt/work' })).toBe(
|
|
'aamer@box.local:/opt/work'
|
|
);
|
|
});
|
|
});
|