mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-03 05:59:43 +02:00
resumeHistorySession() never sent mode when recreating a session from a history/session-manager row, so the server default silently opened a plain Claude session for every non-claude row -- reproduced live: OMP rows spawned Claude sessions on click. Thread the row's mode through every call site (welcome list, session manager, mobile overview) and only send the Claude-specific resumeSessionId for claude rows. Codeman has no live PTY-reattach outside server boot, and it's moot for OMP anyway (exiting it kills the pane's only process), so route the non-claude relaunch through each CLI's own continue-most-recent flag instead of a context-free fresh start. OMP never got one: buildOmpCommand only implemented --model/--resume despite omp --help documenting -c/--continue. Added continueSession to OmpConfig end-to-end (type, schema, builder) mirroring the existing opencode/pi/grok/deepseek fields, and wired resumeHistorySession to use it. Verified live: told a real omp session a secret, exited it, closed the tab without killing tmux, relaunched with --continue in the same directory, and had it recall the secret.
135 lines
3.9 KiB
TypeScript
135 lines
3.9 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
import { CreateSessionSchema, QuickStartSchema } from '../src/web/schemas.js';
|
|
import { buildSpawnCommand } from '../src/tmux-manager.js';
|
|
import { defaultDockerCommandForMode } from '../src/docker-hosts.js';
|
|
import { defaultRemoteCommandForMode } from '../src/remote-hosts.js';
|
|
import { isExternalCliMode, isAltScreenStripMode } from '../src/session.js';
|
|
|
|
describe('OMP mode schemas', () => {
|
|
it('accepts OMP session creation config', () => {
|
|
const parsed = CreateSessionSchema.parse({
|
|
workingDir: '/tmp',
|
|
mode: 'omp',
|
|
ompConfig: {
|
|
model: 'crof/glm-5.2',
|
|
},
|
|
});
|
|
|
|
expect(parsed.mode).toBe('omp');
|
|
expect(parsed.ompConfig).toEqual({
|
|
model: 'crof/glm-5.2',
|
|
});
|
|
});
|
|
|
|
it('accepts OMP quick-start config', () => {
|
|
const parsed = QuickStartSchema.parse({
|
|
caseName: 'omp-case',
|
|
mode: 'omp',
|
|
ompConfig: {
|
|
resumeSessionId: 'session-1234abcd',
|
|
},
|
|
});
|
|
|
|
expect(parsed.mode).toBe('omp');
|
|
expect(parsed.ompConfig?.resumeSessionId).toBe('session-1234abcd');
|
|
});
|
|
|
|
it('rejects unsafe OMP model strings', () => {
|
|
expect(() =>
|
|
CreateSessionSchema.parse({
|
|
workingDir: '/tmp',
|
|
mode: 'omp',
|
|
ompConfig: { model: 'omp; rm -rf /' },
|
|
})
|
|
).toThrow();
|
|
});
|
|
|
|
it('allows OMP_* env overrides and still rejects unknown prefixes', () => {
|
|
const parsed = CreateSessionSchema.parse({
|
|
workingDir: '/tmp',
|
|
mode: 'omp',
|
|
envOverrides: { OMP_PROFILE: 'work' },
|
|
});
|
|
expect(parsed.envOverrides).toEqual({ OMP_PROFILE: 'work' });
|
|
|
|
expect(() =>
|
|
CreateSessionSchema.parse({
|
|
workingDir: '/tmp',
|
|
envOverrides: { RANDOM_PREFIX_KEY: 'x' },
|
|
})
|
|
).toThrow();
|
|
});
|
|
});
|
|
|
|
describe('OMP spawn command', () => {
|
|
it('builds a bare omp command when no config is sent', () => {
|
|
const cmd = buildSpawnCommand({ mode: 'omp', sessionId: 'abc12345' });
|
|
expect(cmd).toBe('omp');
|
|
});
|
|
|
|
it('passes --model and --resume, and drops unsafe ids', () => {
|
|
expect(
|
|
buildSpawnCommand({
|
|
mode: 'omp',
|
|
sessionId: 'abc12345',
|
|
ompConfig: { model: 'crof/glm-5.2', resumeSessionId: 'session-99' },
|
|
})
|
|
).toBe('omp --model crof/glm-5.2 --resume session-99');
|
|
|
|
expect(
|
|
buildSpawnCommand({
|
|
mode: 'omp',
|
|
sessionId: 'abc12345',
|
|
ompConfig: { resumeSessionId: 'x; rm -rf /' },
|
|
})
|
|
).toBe('omp');
|
|
});
|
|
|
|
it('continues the most recent session when no explicit resume id is given', () => {
|
|
expect(
|
|
buildSpawnCommand({
|
|
mode: 'omp',
|
|
sessionId: 'abc12345',
|
|
ompConfig: { continueSession: true },
|
|
})
|
|
).toBe('omp --continue');
|
|
});
|
|
|
|
it('prefers an explicit --resume id over --continue', () => {
|
|
expect(
|
|
buildSpawnCommand({
|
|
mode: 'omp',
|
|
sessionId: 'abc12345',
|
|
ompConfig: { resumeSessionId: 'session-99', continueSession: true },
|
|
})
|
|
).toBe('omp --resume session-99');
|
|
});
|
|
|
|
it('drops unsafe model strings from the spawn command', () => {
|
|
expect(
|
|
buildSpawnCommand({
|
|
mode: 'omp',
|
|
sessionId: 'abc12345',
|
|
ompConfig: { model: 'a`b' },
|
|
})
|
|
).toBe('omp');
|
|
});
|
|
});
|
|
|
|
describe('OMP mode gates', () => {
|
|
it('is an external CLI mode (readiness/ralph/respawn gating)', () => {
|
|
expect(isExternalCliMode('omp')).toBe(true);
|
|
});
|
|
|
|
it('is NOT an alt-screen strip mode (unverified TUI, like opencode/antigravity)', () => {
|
|
expect(isAltScreenStripMode('omp')).toBe(false);
|
|
});
|
|
|
|
it('has docker/remote default commands', () => {
|
|
expect(defaultDockerCommandForMode('omp')).toBe('exec omp');
|
|
// Routed through an interactive login shell so per-user PATH entries resolve —
|
|
// same fix as the other remote agent CLIs (see defaultRemoteCommandForMode).
|
|
expect(defaultRemoteCommandForMode('omp')).toBe('exec "${SHELL:-/bin/sh}" -i -l -c \'omp\'');
|
|
});
|
|
});
|