mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-06 23:49:41 +02:00
Maintainer merge-time fixes for the three PRs that landed together on the session create / launch / persistence path. #514 findings (bot verdict merge-with-fixes): - minor, fixed: SessionState.model was published and persisted for every mode, so a codex/opencode cron session reported the app-wide Claude default it never ran on. toState() now emits it only where the new cliTakesSessionModel() holds (registry capability model.source === 'claude-settings-file', no CLI id branch). POST /api/sessions uses the same helper for its non-claude refusal, so refusal and publication cannot drift. Recovery then hands back undefined for other modes on its own. - nit, fixed: the `model` schema admitted a leading dash (and '.', '['). The first character must now be a letter or digit; still a subset of the registry's model-claude pattern, so nothing accepted is refused at launch. - nit, fixed (reject, the consistent choice): `model` with attachRemoteSession was silently dropped. Now a 400 INVALID_INPUT, as #514 does for non-claude CLIs and quick-start does for remote cases. advisorModel (#530) gets the same refusal there. effort and envOverrides keep their older silent ignore on that branch so no existing caller breaks. #515 finding (bot verdict merge, one nit): - nit, fixed: the types/session.ts @fileoverview described CodexConfig as (model, resumeSessionId); it now lists reasoningEffort, bypass, animations and renderMode too. Audit of the merged combination (not reviewed before): - The conflict resolutions in session.ts (toState), types/session.ts, reboot-restore-routes.ts, server.ts (restoreMuxSessions), CLAUDE.md and skills/codeman/reference/endpoints.md (+ plugin mirror) keep both sides correctly; nothing was lost or doubled. - A claude session with both `model` and `advisorModel` launches with `--model <id>` and ONE merged `--settings` JSON (ultracode + advisorModel, or advisorModel beside `--effort <level>`), on the tmux template (including the resume || new variant and with the statusLine exporter) and on the direct-PTY fallback. Both values (and effort) survive restoreMuxSessions onto a dead pane, a reboot restore into a fresh pane, and restartCli/dead-pane respawn via _buildRespawnPaneOptions. - quick-start and ralph-loop take no per-session `model` (matching #514's scope, POST /api/sessions only) and launch on the app-wide default, which toState now persists for claude, so recovery stays consistent. - No defect found in the combination beyond the findings above. Noted, not changed: advisorModel is still published for any mode a caller sends it with (launch-inert there; the UI and skill send it for claude only). Tests: test/session-model-recovery.test.ts pins the pair through both recovery shapes for effort ultracode/high/none, the recovery constructors' fields, the tmux-manager builder hop, and the codex/opencode/shell non-publication; test/advisor-model.test.ts pins the launch lines and a real direct-PTY Session's pty.spawn argv; the route test covers flag-shaped models, attach refusals and the published fields. Docs: SessionState.model docstring, the reboot-restore-registry header, the golden test comment and the CLAUDE.md model/advisor bullets. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
163 lines
6.7 KiB
TypeScript
163 lines
6.7 KiB
TypeScript
/**
|
|
* @fileoverview `model` on POST /api/sessions — a Claude model for one session only.
|
|
*
|
|
* Claude's model reaches disk only through `modelOverride`, which writes it into the
|
|
* case's `.claude/settings.local.json` for every later run there. `model` is the
|
|
* per-session counterpart: it goes out as `claude --model <id>`, wins over the app-wide
|
|
* default, and writes nothing. What the tests read is the model the session hands the
|
|
* mux when it starts, which is what becomes the `--model` flag.
|
|
*
|
|
* Uses app.inject(), so no real HTTP port is needed.
|
|
*/
|
|
|
|
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
import Fastify, { type FastifyInstance } from 'fastify';
|
|
import fastifyCookie from '@fastify/cookie';
|
|
import { mkdtemp, readFile, rm } from 'node:fs/promises';
|
|
import { join } from 'node:path';
|
|
import { tmpdir } from 'node:os';
|
|
import { createMockRouteContext, type MockRouteContext } from '../mocks/index.js';
|
|
import { installRouteErrorHandler } from '../../src/web/route-error-handler.js';
|
|
import { registerSessionRoutes } from '../../src/web/routes/session-routes.js';
|
|
|
|
interface Harness {
|
|
app: FastifyInstance;
|
|
ctx: MockRouteContext;
|
|
}
|
|
|
|
async function createHarness(): Promise<Harness> {
|
|
const app = Fastify({ logger: false });
|
|
await app.register(fastifyCookie);
|
|
const ctx = createMockRouteContext();
|
|
registerSessionRoutes(app, ctx);
|
|
installRouteErrorHandler(app);
|
|
await app.ready();
|
|
return { app, ctx };
|
|
}
|
|
|
|
describe('POST /api/sessions model', () => {
|
|
let workingDir: string;
|
|
let harness: Harness;
|
|
|
|
beforeEach(async () => {
|
|
workingDir = await mkdtemp(join(tmpdir(), 'codeman-session-model-'));
|
|
harness = await createHarness();
|
|
});
|
|
|
|
afterEach(async () => {
|
|
await harness.app.close();
|
|
await rm(workingDir, { recursive: true, force: true });
|
|
});
|
|
|
|
/** Creates a session and starts it, then returns the model it handed the mux. */
|
|
async function launchedModel(payload: Record<string, unknown>): Promise<unknown> {
|
|
const res = await harness.app.inject({ method: 'POST', url: '/api/sessions', payload: { workingDir, ...payload } });
|
|
expect(res.statusCode).toBe(200);
|
|
const parsed = JSON.parse(res.body);
|
|
const id = (parsed.data?.session ?? parsed.session).id as string;
|
|
await harness.app.inject({ method: 'POST', url: `/api/sessions/${id}/interactive`, payload: {} });
|
|
const calls = harness.ctx.mux.createSession.mock.calls;
|
|
expect(calls.length).toBeGreaterThan(0);
|
|
return (calls[calls.length - 1][0] as { model?: string }).model;
|
|
}
|
|
|
|
it('launches a Claude session on the model the caller names', async () => {
|
|
expect(await launchedModel({ mode: 'claude', model: 'claude-fable-5-1' })).toBe('claude-fable-5-1');
|
|
});
|
|
|
|
it('wins over the app-wide default model', async () => {
|
|
harness.ctx.getModelConfig.mockResolvedValue({ defaultModel: 'sonnet' });
|
|
expect(await launchedModel({ mode: 'claude', model: 'opus' })).toBe('opus');
|
|
});
|
|
|
|
it('leaves the app-wide default in charge when the caller names none', async () => {
|
|
harness.ctx.getModelConfig.mockResolvedValue({ defaultModel: 'sonnet' });
|
|
expect(await launchedModel({ mode: 'claude' })).toBe('sonnet');
|
|
});
|
|
|
|
it('launches on `model` while `modelOverride` alone reaches the case file', async () => {
|
|
// Sent together, each lands where it belongs: the persistent default in the case's
|
|
// settings.local.json, and this session's model on its launch line. A route that wrote
|
|
// `model` to disk would put 'opus' in the file; one that ignored it would launch 'sonnet'.
|
|
expect(await launchedModel({ mode: 'claude', model: 'opus', modelOverride: 'sonnet' })).toBe('opus');
|
|
const settings = JSON.parse(await readFile(join(workingDir, '.claude', 'settings.local.json'), 'utf8'));
|
|
expect(settings.model).toBe('sonnet');
|
|
});
|
|
|
|
it('reads an empty model as no model, as modelOverride does', async () => {
|
|
harness.ctx.getModelConfig.mockResolvedValue({ defaultModel: 'sonnet' });
|
|
expect(await launchedModel({ mode: 'claude', model: '' })).toBe('sonnet');
|
|
});
|
|
|
|
it('refuses a model for a CLI that takes its model in its own config object', async () => {
|
|
const res = await harness.app.inject({
|
|
method: 'POST',
|
|
url: '/api/sessions',
|
|
payload: { workingDir, mode: 'codex', model: 'gpt-5' },
|
|
});
|
|
const parsed = JSON.parse(res.body);
|
|
expect(parsed.success).toBe(false);
|
|
expect(parsed.errorCode).toBe('INVALID_INPUT');
|
|
expect(harness.ctx.sessions.size).toBe(1); // only the session the mock context starts with
|
|
});
|
|
|
|
it('rejects a model with characters the launch pattern refuses', async () => {
|
|
const res = await harness.app.inject({
|
|
method: 'POST',
|
|
url: '/api/sessions',
|
|
payload: { workingDir, mode: 'claude', model: 'opus; rm -rf ~' },
|
|
});
|
|
expect(res.statusCode).toBe(400);
|
|
});
|
|
|
|
it('rejects a flag-shaped model, since the value lands in argv', async () => {
|
|
for (const model of ['--dangerously-skip-permissions', '-p', '.hidden', '[1m]']) {
|
|
const res = await harness.app.inject({
|
|
method: 'POST',
|
|
url: '/api/sessions',
|
|
payload: { workingDir, mode: 'claude', model },
|
|
});
|
|
expect(res.statusCode, model).toBe(400);
|
|
}
|
|
expect(harness.ctx.sessions.size).toBe(1); // only the session the mock context starts with
|
|
});
|
|
|
|
it('still accepts real model ids, aliases and the [1m] suffix', async () => {
|
|
for (const model of ['claude-fable-5-1', 'opus', 'opus[1m]', 'claude-opus-5-5[1m]']) {
|
|
expect(await launchedModel({ mode: 'claude', model })).toBe(model);
|
|
}
|
|
});
|
|
|
|
it.each([
|
|
['model', { model: 'opus' }],
|
|
['advisorModel', { advisorModel: 'opus' }],
|
|
])('refuses %s on a remote attach, which launches nothing', async (_field, extra) => {
|
|
// Refused before the host is looked up, so no remote host needs to exist.
|
|
const res = await harness.app.inject({
|
|
method: 'POST',
|
|
url: '/api/sessions',
|
|
payload: {
|
|
mode: 'claude',
|
|
attachRemoteSession: { hostId: 'h1', remoteSessionName: 'codeman-ssh-abc123' },
|
|
...extra,
|
|
},
|
|
});
|
|
const parsed = JSON.parse(res.body);
|
|
expect(parsed.success).toBe(false);
|
|
expect(parsed.errorCode).toBe('INVALID_INPUT');
|
|
expect(harness.ctx.sessions.size).toBe(1);
|
|
});
|
|
|
|
it('publishes the launch model on the created claude session', async () => {
|
|
const res = await harness.app.inject({
|
|
method: 'POST',
|
|
url: '/api/sessions',
|
|
payload: { workingDir, mode: 'claude', model: 'claude-fable-5-1', advisorModel: 'opus' },
|
|
});
|
|
const parsed = JSON.parse(res.body);
|
|
const session = parsed.data?.session ?? parsed.session;
|
|
expect(session.model).toBe('claude-fable-5-1');
|
|
expect(session.advisorModel).toBe('opus');
|
|
});
|
|
});
|