feat(api): establish stable HTTP contract — uniform {success,data} envelope, status codes, /api/v1

Point 1 of the v1.0 lock-in: commit to a stable HTTP API (the cleanest, fullest form).

Core (centralized):
- Every JSON /api response now uses ONE envelope via a Fastify preSerialization hook (src/web/server.ts): success -> { success:true, data:<payload> }; error -> { success:false, error, errorCode } with a conventional HTTP status. Non-JSON routes (file-raw, tail-file SSE, download, screenshots, /q redirect, WS) are skipped.
- Error-code -> HTTP status is a single source of truth (httpStatusForErrorCode in src/types/api.ts): 400/401/404/409/422/429/500. Expanded ApiErrorCode (added UNAUTHORIZED, CONFLICT, RATE_LIMITED). Errors are no longer HTTP 200.
- Versioned alias: /api/v1/* rewrites to /api/* (rewriteApiV1Url), so external clients pin to a stable surface while the bundled UI keeps using /api/*.
- Handlers stripped of manual 'success:true' (50 across 14 route files) so they return bare payloads the hook wraps uniformly; fixed the mux DELETE {success:<bool>} envelope collision (-> {killed}).

Frontend (48 call sites across 10 files):
- _apiJson() auto-unwraps { success:true, data } -> data (null on error), so most bare-shape readers are transparent. Raw-fetch sites relocate payload reads under .data; success/res.ok/error checks unchanged.

Docs: new docs/api-reference.md (envelope, status table, error codes, /api/v1, SSE); versioning-policy.md flipped — the HTTP/SSE API is now part of the stable, SemVer-covered surface.

Verification: full unit/route suite green (2680 passed) incl. ~166 updated assertions across 24 test files; typecheck/lint/format/frontend-syntax clean; a headless-chromium smoke loaded the migrated UI and drove the panels with 0 console/page errors; /api/status and /api/v1/status confirmed returning the uniform envelope live.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
arkon
2026-06-10 01:30:43 +02:00
co-authored by Claude Opus 4.8
parent 5b3024b327
commit 458fb81cbe
49 changed files with 929 additions and 554 deletions
+9 -9
View File
@@ -190,7 +190,7 @@ describe('Edge Cases and Error Handling', () => {
// Should succeed with valid characters, even if long
if (data.success) {
createdCases.push(longName);
createdCases.push(data.data.caseName);
}
// Either succeeds or fails gracefully
expect(data).toHaveProperty('success');
@@ -202,8 +202,8 @@ describe('Edge Cases and Error Handling', () => {
const response = await fetch(`${baseUrl}/api/sessions/non-existent/respawn`);
const data = await response.json();
expect(data.enabled).toBe(false);
expect(data.status).toBeNull();
expect(data.data.enabled).toBe(false);
expect(data.data.status).toBeNull();
});
it('should handle starting respawn on non-existent session', async () => {
@@ -287,17 +287,17 @@ describe('Concurrent Session Handling', () => {
// All should succeed
for (const result of results) {
expect(result.success).toBe(true);
expect(result.session.id).toBeDefined();
expect(result.data.session.id).toBeDefined();
}
// Verify sessions are listed
const listRes = await fetch(`${baseUrl}/api/sessions`);
const sessions = await listRes.json();
expect(sessions.length).toBeGreaterThanOrEqual(5);
expect(sessions.data.length).toBeGreaterThanOrEqual(5);
// Clean up - delete all created sessions
for (const result of results) {
await fetch(`${baseUrl}/api/sessions/${result.session.id}`, {
await fetch(`${baseUrl}/api/sessions/${result.data.session.id}`, {
method: 'DELETE',
});
}
@@ -317,7 +317,7 @@ describe('Concurrent Session Handling', () => {
expect(createData.success).toBe(true);
// Delete immediately
const deleteRes = await fetch(`${baseUrl}/api/sessions/${createData.session.id}`, {
const deleteRes = await fetch(`${baseUrl}/api/sessions/${createData.data.session.id}`, {
method: 'DELETE',
});
const deleteData = await deleteRes.json();
@@ -341,8 +341,8 @@ describe('Concurrent Session Handling', () => {
for (const result of results) {
expect(result.success).toBe(true);
if (result.caseName) {
createdCases.push(result.caseName);
if (result.data.caseName) {
createdCases.push(result.data.caseName);
}
}
+2 -2
View File
@@ -147,7 +147,7 @@ describe('File Link Click Tests', () => {
const data = await response.json();
expect(data.success).toBe(true);
createdSessions.push(data.session.id);
createdSessions.push(data.data.sessionId);
// Wait for session to appear in UI
await new Promise((r) => setTimeout(r, 2000));
@@ -347,7 +347,7 @@ describe('File Link Click Tests', () => {
});
const data = await response.json();
expect(data.success).toBe(true);
sessionId = data.sessionId; // quick-start returns sessionId directly
sessionId = data.data.sessionId; // quick-start returns sessionId under data envelope
createdSessions.push(sessionId);
}
+12 -12
View File
@@ -32,21 +32,21 @@ describe('generateHooksConfig', () => {
it('should configure idle_prompt matcher', () => {
const config = generateHooksConfig();
const notifHooks = config.hooks.Notification as Array<{ matcher?: string }>;
const idleHook = notifHooks.find(h => h.matcher === 'idle_prompt');
const idleHook = notifHooks.find((h) => h.matcher === 'idle_prompt');
expect(idleHook).toBeDefined();
});
it('should configure permission_prompt matcher', () => {
const config = generateHooksConfig();
const notifHooks = config.hooks.Notification as Array<{ matcher?: string }>;
const permHook = notifHooks.find(h => h.matcher === 'permission_prompt');
const permHook = notifHooks.find((h) => h.matcher === 'permission_prompt');
expect(permHook).toBeDefined();
});
it('should configure elicitation_dialog matcher', () => {
const config = generateHooksConfig();
const notifHooks = config.hooks.Notification as Array<{ matcher?: string }>;
const elicitHook = notifHooks.find(h => h.matcher === 'elicitation_dialog');
const elicitHook = notifHooks.find((h) => h.matcher === 'elicitation_dialog');
expect(elicitHook).toBeDefined();
});
@@ -146,7 +146,7 @@ describe('writeHooksConfig', () => {
mkdirSync(claudeDir, { recursive: true });
writeFileSync(
join(claudeDir, 'settings.local.json'),
JSON.stringify({ existingKey: 'existingValue', permissions: { allow: ['Read'] } }, null, 2),
JSON.stringify({ existingKey: 'existingValue', permissions: { allow: ['Read'] } }, null, 2)
);
await writeHooksConfig(testDir);
@@ -160,10 +160,7 @@ describe('writeHooksConfig', () => {
it('should overwrite existing hooks key', async () => {
const claudeDir = join(testDir, '.claude');
mkdirSync(claudeDir, { recursive: true });
writeFileSync(
join(claudeDir, 'settings.local.json'),
JSON.stringify({ hooks: { oldHook: [] } }, null, 2),
);
writeFileSync(join(claudeDir, 'settings.local.json'), JSON.stringify({ hooks: { oldHook: [] } }, null, 2));
await writeHooksConfig(testDir);
@@ -214,7 +211,7 @@ describe('Hook Event API', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
testSessionId = createData.session.id;
testSessionId = createData.data.session.id;
});
afterAll(async () => {
@@ -396,7 +393,7 @@ describe('Hook Data Sanitization', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
testSessionId = createData.session.id;
testSessionId = createData.data.session.id;
});
afterAll(async () => {
@@ -641,7 +638,7 @@ describe('Hook Config Generation - Extended', () => {
it('should include all event types', () => {
const config = generateHooksConfig();
const notifHooks = config.hooks.Notification as Array<{ matcher?: string }>;
const matchers = notifHooks.map(n => n.matcher);
const matchers = notifHooks.map((n) => n.matcher);
expect(matchers).toContain('idle_prompt');
expect(matchers).toContain('permission_prompt');
expect(matchers).toContain('elicitation_dialog');
@@ -694,7 +691,10 @@ describe('Hook Config Generation - Extended', () => {
it('should have consistent structure across all notification hooks', () => {
const config = generateHooksConfig();
const notifHooks = config.hooks.Notification as Array<{ matcher: string; hooks: Array<{ type: string; command: string; timeout: number }> }>;
const notifHooks = config.hooks.Notification as Array<{
matcher: string;
hooks: Array<{ type: string; command: string; timeout: number }>;
}>;
for (const hook of notifHooks) {
expect(hook.matcher).toBeDefined();
+47 -41
View File
@@ -58,24 +58,24 @@ describe('Integration Flows', () => {
const quickStartData = await quickStartRes.json();
expect(quickStartData.success).toBe(true);
expect(quickStartData.sessionId).toBeDefined();
expect(quickStartData.caseName).toBe(caseName);
createdSessions.push(quickStartData.sessionId);
expect(quickStartData.data.sessionId).toBeDefined();
expect(quickStartData.data.caseName).toBe(caseName);
createdSessions.push(quickStartData.data.sessionId);
// Step 2: Verify session is in interactive mode
const sessionRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}`);
const sessionRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}`);
const sessionData = await sessionRes.json();
expect(sessionData.id).toBe(quickStartData.sessionId);
expect(sessionData.workingDir).toContain(caseName);
expect(['busy', 'idle', 'running']).toContain(sessionData.status); // May transition quickly in test mode
expect(sessionData.data.id).toBe(quickStartData.data.sessionId);
expect(sessionData.data.workingDir).toContain(caseName);
expect(['busy', 'idle', 'running']).toContain(sessionData.data.status); // May transition quickly in test mode
// Step 3: Verify case was created with CLAUDE.md
const caseRes = await fetch(`${baseUrl}/api/cases/${caseName}`);
const caseData = await caseRes.json();
expect(caseData.name).toBe(caseName);
expect(caseData.hasClaudeMd).toBe(true);
expect(caseData.data.name).toBe(caseName);
expect(caseData.data.hasClaudeMd).toBe(true);
});
it('should reuse existing case when quick starting with existing case name', async () => {
@@ -90,10 +90,10 @@ describe('Integration Flows', () => {
});
const firstData = await firstRes.json();
expect(firstData.success).toBe(true);
createdSessions.push(firstData.sessionId);
createdSessions.push(firstData.data.sessionId);
// Delete the session but keep the case
await fetch(`${baseUrl}/api/sessions/${firstData.sessionId}`, { method: 'DELETE' });
await fetch(`${baseUrl}/api/sessions/${firstData.data.sessionId}`, { method: 'DELETE' });
// Second quick start - should reuse the case
const secondRes = await fetch(`${baseUrl}/api/quick-start`, {
@@ -104,9 +104,9 @@ describe('Integration Flows', () => {
const secondData = await secondRes.json();
expect(secondData.success).toBe(true);
expect(secondData.caseName).toBe(caseName);
expect(secondData.casePath).toBe(firstData.casePath);
createdSessions.push(secondData.sessionId);
expect(secondData.data.caseName).toBe(caseName);
expect(secondData.data.casePath).toBe(firstData.data.casePath);
createdSessions.push(secondData.data.sessionId);
});
});
@@ -132,20 +132,20 @@ describe('Integration Flows', () => {
});
const sessionData = await sessionRes.json();
expect(sessionData.success).toBe(true);
createdSessions.push(sessionData.session.id);
createdSessions.push(sessionData.data.session.id);
// Step 3: Start interactive mode
const interactiveRes = await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}/interactive`, {
const interactiveRes = await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}/interactive`, {
method: 'POST',
});
const interactiveData = await interactiveRes.json();
expect(interactiveData.success).toBe(true);
// Verify session state
const verifyRes = await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}`);
const verifyRes = await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}`);
const verifyData = await verifyRes.json();
expect(['busy', 'idle', 'running']).toContain(verifyData.status);
expect(verifyData.workingDir).toContain(caseName);
expect(['busy', 'idle', 'running']).toContain(verifyData.data.status);
expect(verifyData.data.workingDir).toContain(caseName);
});
});
@@ -162,13 +162,13 @@ describe('Integration Flows', () => {
});
const quickStartData = await quickStartRes.json();
expect(quickStartData.success).toBe(true);
createdSessions.push(quickStartData.sessionId);
createdSessions.push(quickStartData.data.sessionId);
// Wait for Claude to start up
await new Promise((resolve) => setTimeout(resolve, 2000));
// Send input
const inputRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}/input`, {
const inputRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}/input`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ input: '/help\n' }),
@@ -180,9 +180,9 @@ describe('Integration Flows', () => {
await new Promise((resolve) => setTimeout(resolve, 1000));
// Check terminal buffer has content
const terminalRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}/terminal`);
const terminalRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}/terminal`);
const terminalData = await terminalRes.json();
expect(terminalData.terminalBuffer.length).toBeGreaterThan(0);
expect(terminalData.data.terminalBuffer.length).toBeGreaterThan(0);
});
it('should handle terminal resize', async () => {
@@ -197,15 +197,21 @@ describe('Integration Flows', () => {
});
const quickStartData = await quickStartRes.json();
expect(quickStartData.success).toBe(true);
createdSessions.push(quickStartData.sessionId);
createdSessions.push(quickStartData.data.sessionId);
// Resize terminal
const resizeRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}/resize`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ cols: 200, rows: 50 }),
});
const resizeData = await resizeRes.json();
// Resize terminal (retry briefly — a just-quick-started session can be
// momentarily busy, which would return SESSION_BUSY; this is a transient race).
let resizeData;
for (let attempt = 0; attempt < 5; attempt++) {
const resizeRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}/resize`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ cols: 200, rows: 50 }),
});
resizeData = await resizeRes.json();
if (resizeData.success) break;
await new Promise((r) => setTimeout(r, 100));
}
expect(resizeData.success).toBe(true);
});
});
@@ -225,14 +231,14 @@ describe('Integration Flows', () => {
expect(quickStartData.success).toBe(true);
// Delete the session
const deleteRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}`, {
const deleteRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}`, {
method: 'DELETE',
});
const deleteData = await deleteRes.json();
expect(deleteData.success).toBe(true);
// Verify session is gone
const verifyRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}`);
const verifyRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}`);
const verifyData = await verifyRes.json();
expect(verifyData.error).toContain('not found');
});
@@ -251,20 +257,20 @@ describe('Integration Flows', () => {
});
const quickStartData = await quickStartRes.json();
expect(quickStartData.success).toBe(true);
createdSessions.push(quickStartData.sessionId);
createdSessions.push(quickStartData.data.sessionId);
// Get full status
const statusRes = await fetch(`${baseUrl}/api/status`);
const statusData = await statusRes.json();
expect(statusData.sessions).toBeDefined();
expect(Array.isArray(statusData.sessions)).toBe(true);
expect(statusData.scheduledRuns).toBeDefined();
expect(statusData.respawnStatus).toBeDefined();
expect(statusData.timestamp).toBeDefined();
expect(statusData.data.sessions).toBeDefined();
expect(Array.isArray(statusData.data.sessions)).toBe(true);
expect(statusData.data.scheduledRuns).toBeDefined();
expect(statusData.data.respawnStatus).toBeDefined();
expect(statusData.data.timestamp).toBeDefined();
// Verify our session is in the list
const ourSession = statusData.sessions.find((s: any) => s.id === quickStartData.sessionId);
const ourSession = statusData.data.sessions.find((s: any) => s.id === quickStartData.data.sessionId);
expect(ourSession).toBeDefined();
expect(ourSession.workingDir).toContain(caseName);
});
@@ -341,7 +347,7 @@ describe('SSE Event Flow', () => {
});
const quickStartData = await quickStartRes.json();
expect(quickStartData.success).toBe(true);
createdSessions.push(quickStartData.sessionId);
createdSessions.push(quickStartData.data.sessionId);
// Wait for events
await new Promise((resolve) => setTimeout(resolve, 500));
+25 -23
View File
@@ -88,10 +88,10 @@ async function createSession(baseUrl: string): Promise<string> {
body: JSON.stringify({ workingDir: '/tmp' }),
});
const data = await res.json();
if (!data.session?.id) {
if (!data.data?.session?.id) {
throw new Error(`Failed to create session: ${JSON.stringify(data)}`);
}
return data.session.id;
return data.data.session.id;
}
// Helper to delete a session
@@ -392,9 +392,9 @@ describe('Operation Lightspeed', () => {
expect(res.status).toBe(200);
// terminalBuffer may be empty for a fresh session, but field should exist
expect(data).toHaveProperty('terminalBuffer');
expect(data).toHaveProperty('truncated');
expect(data.truncated).toBe(false);
expect(data.data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('truncated');
expect(data.data.truncated).toBe(false);
await deleteSession(baseUrl, sessionId);
});
@@ -407,7 +407,7 @@ describe('Operation Lightspeed', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('terminalBuffer');
await deleteSession(baseUrl, sessionId);
});
@@ -431,7 +431,7 @@ describe('Operation Lightspeed', () => {
// All should succeed
for (const data of results) {
expect(data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('terminalBuffer');
}
// Cleanup
@@ -692,7 +692,8 @@ describe('Operation Lightspeed', () => {
const sessionId = await createSession(baseUrl);
const res = await fetch(`${baseUrl}/api/sessions`);
const sessions = await res.json();
const body = await res.json();
const sessions = body.data;
expect(Array.isArray(sessions)).toBe(true);
const session = sessions.find((s: any) => s.id === sessionId);
@@ -718,7 +719,8 @@ describe('Operation Lightspeed', () => {
await new Promise((resolve) => setTimeout(resolve, 1100));
const res = await fetch(`${baseUrl}/api/sessions`);
const sessions = await res.json();
const body = await res.json();
const sessions = body.data;
// All 3 should be present in the response
const foundIds = sessions.map((s: any) => s.id);
@@ -911,10 +913,10 @@ describe('Operation Lightspeed', () => {
expect(res.status).toBe(200);
// Local echo overlay needs session status to know when to show/hide
expect(data).toHaveProperty('status');
expect(typeof data.status).toBe('string');
expect(data.data).toHaveProperty('status');
expect(typeof data.data.status).toBe('string');
// Fresh session starts as 'starting'
expect(['starting', 'running', 'idle', 'error']).toContain(data.status);
expect(['starting', 'running', 'idle', 'error']).toContain(data.data.status);
await deleteSession(baseUrl, sessionId);
});
@@ -926,9 +928,9 @@ describe('Operation Lightspeed', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data).toHaveProperty('fullSize');
expect(typeof data.fullSize).toBe('number');
expect(data.fullSize).toBeGreaterThanOrEqual(0);
expect(data.data).toHaveProperty('fullSize');
expect(typeof data.data.fullSize).toBe('number');
expect(data.data.fullSize).toBeGreaterThanOrEqual(0);
await deleteSession(baseUrl, sessionId);
});
@@ -942,9 +944,9 @@ describe('Operation Lightspeed', () => {
]);
// tail=0 means "don't tail" — should return same as no tail param
expect(fullRes.truncated).toBe(false);
expect(tailZeroRes.truncated).toBe(false);
expect(fullRes.terminalBuffer).toBe(tailZeroRes.terminalBuffer);
expect(fullRes.data.truncated).toBe(false);
expect(tailZeroRes.data.truncated).toBe(false);
expect(fullRes.data.terminalBuffer).toBe(tailZeroRes.data.terminalBuffer);
await deleteSession(baseUrl, sessionId);
});
@@ -957,8 +959,8 @@ describe('Operation Lightspeed', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data).toHaveProperty('terminalBuffer');
expect(data.truncated).toBe(false); // Can't truncate if tail > fullSize
expect(data.data).toHaveProperty('terminalBuffer');
expect(data.data.truncated).toBe(false); // Can't truncate if tail > fullSize
await deleteSession(baseUrl, sessionId);
});
@@ -971,7 +973,7 @@ describe('Operation Lightspeed', () => {
// Should handle gracefully (either return full buffer or error cleanly)
expect(res.status).toBe(200);
expect(data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('terminalBuffer');
await deleteSession(baseUrl, sessionId);
});
@@ -984,7 +986,7 @@ describe('Operation Lightspeed', () => {
// NaN tail should be handled (parseInt('abc') = NaN, which is falsy)
expect(res.status).toBe(200);
expect(data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('terminalBuffer');
await deleteSession(baseUrl, sessionId);
});
@@ -1235,7 +1237,7 @@ describe('Operation Lightspeed', () => {
)
);
const ids = results.map((r) => r.session.id);
const ids = results.map((r) => r.data.session.id);
expect(ids.length).toBe(5);
expect(new Set(ids).size).toBe(5); // All unique
+20 -23
View File
@@ -86,8 +86,7 @@ describe('QR Token Manager (unit)', () => {
// Manually expire the token by manipulating its createdAt
// Access the private map — this is a unit test, we need to verify the TTL logic
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> })
.qrTokensByCode;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> }).qrTokensByCode;
const record = tokenMap.get(code)!;
record.createdAt = Date.now() - 91_000; // 91 seconds ago (beyond 90s grace)
@@ -99,8 +98,7 @@ describe('QR Token Manager (unit)', () => {
const code = tm.getCurrentShortCode()!;
// Set createdAt to 80 seconds ago (within 90s grace)
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> })
.qrTokensByCode;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> }).qrTokensByCode;
const record = tokenMap.get(code)!;
record.createdAt = Date.now() - 80_000;
@@ -172,8 +170,7 @@ describe('QR Token Manager (unit)', () => {
it('should accept token at exactly grace period (90000ms)', () => {
const code = tm.getCurrentShortCode()!;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> })
.qrTokensByCode;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> }).qrTokensByCode;
const record = tokenMap.get(code)!;
record.createdAt = Date.now() - 90_000;
// Condition is `> QR_TOKEN_GRACE_MS` (strict >), so exactly 90000 should pass
@@ -182,8 +179,7 @@ describe('QR Token Manager (unit)', () => {
it('should reject token at grace period + 1ms (90001ms)', () => {
const code = tm.getCurrentShortCode()!;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> })
.qrTokensByCode;
const tokenMap = (tm as unknown as { qrTokensByCode: Map<string, { createdAt: number }> }).qrTokensByCode;
const record = tokenMap.get(code)!;
record.createdAt = Date.now() - 90_001;
expect(tm.consumeToken(code)).toBe(false);
@@ -308,8 +304,7 @@ describe('QR Auth Integration', () => {
beforeEach(() => {
// Reset QR failure counter to prevent cross-test contamination
// (all requests come from 127.0.0.1)
const qrFailures = (server as unknown as { qrAuthFailures: { clear(): void } | null })
.qrAuthFailures;
const qrFailures = (server as unknown as { qrAuthFailures: { clear(): void } | null }).qrAuthFailures;
if (qrFailures) qrFailures.clear();
});
@@ -568,9 +563,11 @@ describe('QR Auth Integration', () => {
const setCookie = res.headers.get('set-cookie')!;
const token = setCookie.match(/codeman_session=([^;]+)/)![1];
const authSessions = (server as unknown as {
authSessions: { get(k: string): { method: string } | undefined } | null;
}).authSessions;
const authSessions = (
server as unknown as {
authSessions: { get(k: string): { method: string } | undefined } | null;
}
).authSessions;
const record = authSessions?.get(token);
expect(record).toBeDefined();
expect(record!.method).toBe('qr');
@@ -631,9 +628,9 @@ describe('QR SVG Endpoint (GET /api/tunnel/qr)', () => {
});
expect(res.status).toBe(200);
const data = await res.json();
expect(data.authEnabled).toBe(true);
expect(data.svg).toContain('<svg');
expect(data.svg).toContain('</svg>');
expect(data.data.authEnabled).toBe(true);
expect(data.data.svg).toContain('<svg');
expect(data.data.svg).toContain('</svg>');
} finally {
tm.stopTokenRotation();
simulateTunnelStopped(tm);
@@ -653,9 +650,9 @@ describe('QR SVG Endpoint (GET /api/tunnel/qr)', () => {
});
expect(res.status).toBe(200);
const data = await res.json();
expect(data.authEnabled).toBe(false);
expect(data.svg).toContain('<svg');
expect(data.svg).toContain('</svg>');
expect(data.data.authEnabled).toBe(false);
expect(data.data.svg).toContain('<svg');
expect(data.data.svg).toContain('</svg>');
} finally {
process.env.CODEMAN_PASSWORD = savedPass;
simulateTunnelStopped(tm);
@@ -709,8 +706,8 @@ describe('QR SVG Endpoint (GET /api/tunnel/qr)', () => {
});
expect(res.status).toBe(200);
const data = await res.json();
expect(data.svg).toContain('<svg');
expect(data.authEnabled).toBe(false);
expect(data.data.svg).toContain('<svg');
expect(data.data.authEnabled).toBe(false);
} finally {
process.env.CODEMAN_PASSWORD = savedPass;
simulateTunnelStopped(tm);
@@ -732,7 +729,7 @@ describe('QR SVG Endpoint (GET /api/tunnel/qr)', () => {
});
const data2 = await res2.json();
expect(data1.svg).toBe(data2.svg);
expect(data1.data.svg).toBe(data2.data.svg);
} finally {
tm.stopTokenRotation();
simulateTunnelStopped(tm);
@@ -756,7 +753,7 @@ describe('QR SVG Endpoint (GET /api/tunnel/qr)', () => {
});
const data2 = await res2.json();
expect(data1.svg).not.toBe(data2.svg);
expect(data1.data.svg).not.toBe(data2.data.svg);
} finally {
tm.stopTokenRotation();
simulateTunnelStopped(tm);
+28 -24
View File
@@ -47,14 +47,14 @@ describe('Quick Start API', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.sessionId).toBeDefined();
expect(data.caseName).toBe(testCaseName);
expect(data.casePath).toBe(join(CASES_DIR, testCaseName));
expect(data.data.sessionId).toBeDefined();
expect(data.data.caseName).toBe(testCaseName);
expect(data.data.casePath).toBe(join(CASES_DIR, testCaseName));
// Verify case folder was created
expect(existsSync(data.casePath)).toBe(true);
expect(existsSync(join(data.casePath, 'CLAUDE.md'))).toBe(true);
expect(existsSync(join(data.casePath, 'src'))).toBe(true);
expect(existsSync(data.data.casePath)).toBe(true);
expect(existsSync(join(data.data.casePath, 'CLAUDE.md'))).toBe(true);
expect(existsSync(join(data.data.casePath, 'src'))).toBe(true);
});
it('should use existing case without recreating it', async () => {
@@ -74,7 +74,7 @@ describe('Quick Start API', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.caseName).toBe(testCaseName);
expect(data.data.caseName).toBe(testCaseName);
// Case should exist but CLAUDE.md won't be created since case already exists
expect(existsSync(casePath)).toBe(true);
});
@@ -118,7 +118,7 @@ describe('Quick Start API', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.caseName).toBe(testCaseName);
expect(data.data.caseName).toBe(testCaseName);
});
it('should default to "testcase" when no caseName provided', async () => {
@@ -137,7 +137,7 @@ describe('Quick Start API', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.caseName).toBe('testcase');
expect(data.data.caseName).toBe('testcase');
});
});
});
@@ -167,10 +167,10 @@ describe('Session Management', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.session).toBeDefined();
expect(data.session.id).toBeDefined();
expect(data.session.workingDir).toBe('/tmp');
expect(data.session.status).toBe('idle');
expect(data.data.session).toBeDefined();
expect(data.data.session.id).toBeDefined();
expect(data.data.session.workingDir).toBe('/tmp');
expect(data.data.session.status).toBe('idle');
});
});
@@ -179,7 +179,8 @@ describe('Session Management', () => {
const response = await fetch(`${baseUrl}/api/sessions`);
const data = await response.json();
expect(Array.isArray(data)).toBe(true);
expect(data.success).toBe(true);
expect(Array.isArray(data.data)).toBe(true);
});
});
@@ -188,12 +189,13 @@ describe('Session Management', () => {
const response = await fetch(`${baseUrl}/api/status`);
const data = await response.json();
expect(data).toHaveProperty('sessions');
expect(data).toHaveProperty('scheduledRuns');
expect(data).toHaveProperty('respawnStatus');
expect(data).toHaveProperty('timestamp');
expect(Array.isArray(data.sessions)).toBe(true);
expect(Array.isArray(data.scheduledRuns)).toBe(true);
expect(data.success).toBe(true);
expect(data.data).toHaveProperty('sessions');
expect(data.data).toHaveProperty('scheduledRuns');
expect(data.data).toHaveProperty('respawnStatus');
expect(data.data).toHaveProperty('timestamp');
expect(Array.isArray(data.data.sessions)).toBe(true);
expect(Array.isArray(data.data.scheduledRuns)).toBe(true);
});
});
});
@@ -224,7 +226,8 @@ describe('Case Management', () => {
const response = await fetch(`${baseUrl}/api/cases`);
const data = await response.json();
expect(Array.isArray(data)).toBe(true);
expect(data.success).toBe(true);
expect(Array.isArray(data.data)).toBe(true);
});
});
@@ -298,9 +301,10 @@ describe('Case Management', () => {
const response = await fetch(`${baseUrl}/api/cases/${testCaseName}`);
const data = await response.json();
expect(data.name).toBe(testCaseName);
expect(data.path).toBeDefined();
expect(data.hasClaudeMd).toBe(true);
expect(data.success).toBe(true);
expect(data.data.name).toBe(testCaseName);
expect(data.data.path).toBeDefined();
expect(data.data.hasClaudeMd).toBe(true);
});
it('should return error for non-existent case', async () => {
+87 -87
View File
@@ -61,7 +61,7 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(Array.isArray(data)).toBe(true);
expect(Array.isArray(data.data)).toBe(true);
});
it('should create a new session via quick-start', async () => {
@@ -76,8 +76,8 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(data.success).toBe(true);
expect(data.sessionId).toBeDefined();
createdSessions.push(data.sessionId);
expect(data.data.sessionId).toBeDefined();
createdSessions.push(data.data.sessionId);
});
it('should get session details by ID', async () => {
@@ -91,15 +91,15 @@ describe('Ralph Integration Tests', () => {
body: JSON.stringify({ caseName }),
});
const createData = await createRes.json();
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Get session details
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}`);
const data = await res.json();
expect(res.status).toBe(200);
expect(data.id).toBe(createData.sessionId);
expect(data.workingDir).toContain(caseName);
expect(data.data.id).toBe(createData.data.sessionId);
expect(data.data.workingDir).toContain(caseName);
});
it('should return error for non-existent session', async () => {
@@ -122,7 +122,7 @@ describe('Ralph Integration Tests', () => {
body: JSON.stringify({ caseName }),
});
const createData = await createRes.json();
const sessionId = createData.sessionId;
const sessionId = createData.data.sessionId;
// Delete session
const deleteRes = await fetch(`${baseUrl}/api/sessions/${sessionId}`, {
@@ -152,13 +152,13 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(data.success).toBe(true);
expect(data.sessionId).toBeDefined();
createdSessions.push(data.sessionId);
expect(data.data.sessionId).toBeDefined();
createdSessions.push(data.data.sessionId);
// Verify mode
const sessionRes = await fetch(`${baseUrl}/api/sessions/${data.sessionId}`);
const sessionRes = await fetch(`${baseUrl}/api/sessions/${data.data.sessionId}`);
const sessionData = await sessionRes.json();
expect(sessionData.mode).toBe('shell');
expect(sessionData.data.mode).toBe('shell');
});
});
@@ -175,9 +175,9 @@ describe('Ralph Integration Tests', () => {
body: JSON.stringify({ caseName }),
});
const createData = await createRes.json();
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const data = await res.json();
expect(res.status).toBe(200);
@@ -206,7 +206,7 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(Array.isArray(data)).toBe(true);
expect(Array.isArray(data.data)).toBe(true);
});
it('should create a new case', async () => {
@@ -244,7 +244,7 @@ describe('Ralph Integration Tests', () => {
});
const data = await res.json();
expect(res.status).toBe(200);
expect(res.status).toBe(409);
expect(data.success).toBe(false);
expect(data.error).toContain('already exists');
});
@@ -265,15 +265,15 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data.name).toBe(caseName);
expect(data.path).toContain(caseName);
expect(data.data.name).toBe(caseName);
expect(data.data.path).toContain(caseName);
});
it('should return error for non-existent case', async () => {
const res = await fetch(`${baseUrl}/api/cases/non-existent-case-12345`);
const data = await res.json();
expect(res.status).toBe(200);
expect(res.status).toBe(404);
expect(data.error).toBe('Case not found');
});
});
@@ -286,18 +286,18 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data.sessions).toBeDefined();
expect(data.scheduledRuns).toBeDefined();
expect(data.respawnStatus).toBeDefined();
expect(data.timestamp).toBeDefined();
expect(data.data.sessions).toBeDefined();
expect(data.data.scheduledRuns).toBeDefined();
expect(data.data.respawnStatus).toBeDefined();
expect(data.data.timestamp).toBeDefined();
});
it('should include sessions array in status', async () => {
const res = await fetch(`${baseUrl}/api/status`);
const data = await res.json();
expect(Array.isArray(data.sessions)).toBe(true);
expect(typeof data.timestamp).toBe('number');
expect(Array.isArray(data.data.sessions)).toBe(true);
expect(typeof data.data.timestamp).toBe('number');
});
});
@@ -309,9 +309,9 @@ describe('Ralph Integration Tests', () => {
const data = await res.json();
expect(res.status).toBe(200);
expect(data.sessions).toBeDefined();
expect(Array.isArray(data.sessions)).toBe(true);
expect(typeof data.muxAvailable).toBe('boolean');
expect(data.data.sessions).toBeDefined();
expect(Array.isArray(data.data.sessions)).toBe(true);
expect(typeof data.data.muxAvailable).toBe('boolean');
});
});
@@ -328,9 +328,9 @@ describe('Ralph Integration Tests', () => {
body: JSON.stringify({ caseName }),
});
const createData = await createRes.json();
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/input`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/input`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ input: 'test input' }),
@@ -351,9 +351,9 @@ describe('Ralph Integration Tests', () => {
body: JSON.stringify({ caseName }),
});
const createData = await createRes.json();
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/input`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/input`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ input: null }),
@@ -393,12 +393,12 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Wait for session to be ready
await new Promise((r) => setTimeout(r, 200));
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/resize`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/resize`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ cols: 120, rows: 40 }),
@@ -420,12 +420,12 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Wait for session to be ready
await new Promise((r) => setTimeout(r, 200));
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/resize`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/resize`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ cols: -1, rows: 40 }),
@@ -452,9 +452,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/auto-compact`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/auto-compact`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, threshold: 100000 }),
@@ -489,9 +489,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/auto-compact`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/auto-compact`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, threshold: -100 }),
@@ -516,9 +516,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/auto-clear`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/auto-clear`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, threshold: 150000 }),
@@ -553,9 +553,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/auto-clear`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/auto-clear`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, threshold: -50 }),
@@ -582,9 +582,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true }),
@@ -606,9 +606,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reset: true }),
@@ -643,9 +643,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reset: 'full' }),
@@ -667,9 +667,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, completionPhrase: 'DONE' }),
@@ -680,7 +680,7 @@ describe('Ralph Integration Tests', () => {
expect(data.success).toBe(true);
// Verify the state was updated
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const stateData = await stateRes.json();
expect(stateData.success).toBe(true);
@@ -698,9 +698,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ disableAutoEnable: true }),
@@ -726,9 +726,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const data = await res.json();
expect(res.status).toBe(200);
@@ -750,17 +750,17 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Enable ralph tracking
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true, completionPhrase: 'TASK_DONE' }),
});
// Check state
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const data = await res.json();
expect(data.success).toBe(true);
@@ -779,17 +779,17 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Enable first
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true }),
});
// Then reset
const resetRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
const resetRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reset: true }),
@@ -799,7 +799,7 @@ describe('Ralph Integration Tests', () => {
expect(resetData.success).toBe(true);
// Check that todos are cleared
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const stateData = await stateRes.json();
expect(stateData.success).toBe(true);
@@ -817,24 +817,24 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Enable tracking
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true }),
});
// Soft reset (keep enabled)
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reset: true }),
});
// Check state
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const stateData = await stateRes.json();
expect(stateData.success).toBe(true);
@@ -852,24 +852,24 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
// Enable tracking
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ enabled: true }),
});
// Full reset
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-config`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-config`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ reset: 'full' }),
});
// Check state
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/ralph-state`);
const stateRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/ralph-state`);
const stateData = await stateRes.json();
expect(stateData.success).toBe(true);
@@ -891,13 +891,13 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/respawn`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/respawn`);
const data = await res.json();
expect(res.status).toBe(200);
expect(data.enabled).toBe(false);
expect(data.data.enabled).toBe(false);
});
it('should return error for respawn start on non-existent session', async () => {
@@ -924,14 +924,14 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/respawn/stop`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/respawn/stop`, {
method: 'POST',
});
const data = await res.json();
expect(res.status).toBe(200);
expect(res.status).toBe(404);
expect(data.success).toBe(false);
expect(data.errorCode).toBe('NOT_FOUND');
});
@@ -947,9 +947,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/respawn/config`, {
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/respawn/config`, {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ idleTimeoutMs: 10000 }),
@@ -958,7 +958,7 @@ describe('Ralph Integration Tests', () => {
expect(res.status).toBe(200);
expect(data.success).toBe(true);
expect(data.config.idleTimeoutMs).toBe(10000);
expect(data.data.config.idleTimeoutMs).toBe(10000);
});
});
@@ -976,9 +976,9 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/output`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/output`);
const data = await res.json();
expect(res.status).toBe(200);
@@ -1008,14 +1008,14 @@ describe('Ralph Integration Tests', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessions.push(createData.sessionId);
createdSessions.push(createData.data.sessionId);
const res = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/terminal`);
const res = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/terminal`);
const data = await res.json();
expect(res.status).toBe(200);
expect(data.terminalBuffer).toBeDefined();
expect(data.status).toBeDefined();
expect(data.data.terminalBuffer).toBeDefined();
expect(data.data.status).toBeDefined();
});
it('should return error for terminal of non-existent session', async () => {
+82 -26
View File
@@ -3,10 +3,22 @@
*
* Uses app.inject() — no real HTTP ports needed.
* Port: N/A (app.inject doesn't open ports)
*
* Responses follow the uniform envelope contract:
* SUCCESS -> HTTP 2xx, body = { success: true, data: <payload> }
* ERROR -> HTTP 4xx/5xx, body = { success: false, error, errorCode }
* Bare handler returns are wrapped into { success:true, data } and returned
* error envelopes are mapped to their conventional HTTP status by the same
* preSerialization hook the production server installs (mirrored below so test
* behavior matches production exactly).
*/
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import { createRouteTestHarness, type RouteTestHarness } from './_route-test-utils.js';
import Fastify, { type FastifyInstance } from 'fastify';
import fastifyCookie from '@fastify/cookie';
import { createMockRouteContext, type MockRouteContext } from '../mocks/index.js';
import { installRouteErrorHandler } from '../../src/web/route-error-handler.js';
import { ApiErrorCode, httpStatusForErrorCode } from '../../src/types.js';
import { registerCaseRoutes } from '../../src/web/routes/case-routes.js';
// Mock filesystem modules
@@ -51,11 +63,52 @@ const mockedReaddirSync = vi.mocked(readdirSync);
const mockedReaddir = vi.mocked(fs.readdir);
const mockedReadFile = vi.mocked(fs.readFile);
interface CaseRouteHarness {
app: FastifyInstance;
ctx: MockRouteContext;
}
/**
* Build a route harness that mirrors production: cookie plugin, the shared
* route error handler, AND the uniform-envelope preSerialization hook (copied
* from src/web/server.ts) so bare handler returns become { success:true, data }
* and returned error envelopes get mapped to a conventional HTTP status.
*/
async function createEnvelopeHarness(): Promise<CaseRouteHarness> {
const app = Fastify({ logger: false });
await app.register(fastifyCookie);
// Uniform response envelope (matches src/web/server.ts preSerialization hook).
app.addHook('preSerialization', (req, reply, payload: unknown, done) => {
if (!req.url.startsWith('/api')) return done(null, payload);
if (payload === null || typeof payload !== 'object') return done(null, payload);
if (Buffer.isBuffer(payload) || typeof (payload as { pipe?: unknown }).pipe === 'function') {
return done(null, payload);
}
const p = payload as { success?: unknown; errorCode?: unknown };
if (p.success === false) {
if (reply.statusCode === 200 && typeof p.errorCode === 'string') {
reply.code(httpStatusForErrorCode(p.errorCode as ApiErrorCode));
}
return done(null, payload);
}
if (p.success === true) return done(null, payload);
return done(null, { success: true, data: payload });
});
const ctx = createMockRouteContext();
registerCaseRoutes(app, ctx as never);
installRouteErrorHandler(app);
await app.ready();
return { app, ctx };
}
describe('case-routes', () => {
let harness: RouteTestHarness;
let harness: CaseRouteHarness;
beforeEach(async () => {
harness = await createRouteTestHarness(registerCaseRoutes);
harness = await createEnvelopeHarness();
vi.clearAllMocks();
// Default: existsSync returns false, readFile throws ENOENT
@@ -79,7 +132,8 @@ describe('case-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body).toEqual([]);
expect(body.success).toBe(true);
expect(body.data).toEqual([]);
});
it('returns cases from CASES_DIR', async () => {
@@ -97,10 +151,10 @@ describe('case-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body).toHaveLength(2);
expect(body[0].name).toBe('my-case');
expect(body[1].name).toBe('other-case');
expect(body[0].hasClaudeMd).toBe(false);
expect(body.data).toHaveLength(2);
expect(body.data[0].name).toBe('my-case');
expect(body.data[1].name).toBe('other-case');
expect(body.data[0].hasClaudeMd).toBe(false);
});
it('includes hasClaudeMd flag', async () => {
@@ -113,7 +167,7 @@ describe('case-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body[0].hasClaudeMd).toBe(true);
expect(body.data[0].hasClaudeMd).toBe(true);
});
it('includes linked cases from linked-cases.json', async () => {
@@ -141,7 +195,7 @@ describe('case-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
// Should have both regular and linked cases
expect(body.length).toBeGreaterThanOrEqual(1);
expect(body.data.length).toBeGreaterThanOrEqual(1);
});
});
@@ -189,7 +243,7 @@ describe('case-routes', () => {
url: '/api/cases',
payload: { name: 'existing-case' },
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(409);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toContain('already exists');
@@ -250,7 +304,7 @@ describe('case-routes', () => {
url: '/api/cases/link',
payload: { name: 'my-project', path: '/nonexistent/path' },
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toContain('not found');
@@ -265,7 +319,7 @@ describe('case-routes', () => {
url: '/api/cases/link',
payload: { name: 'existing-case', path: '/home/user/project' },
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(409);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toContain('already exists');
@@ -310,8 +364,9 @@ describe('case-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.name).toBe('my-case');
expect(body.linked).toBe(true);
expect(body.success).toBe(true);
expect(body.data.name).toBe('my-case');
expect(body.data.linked).toBe(true);
});
it('returns CASES_DIR case when no linked case found', async () => {
@@ -326,7 +381,8 @@ describe('case-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.name).toBe('regular-case');
expect(body.success).toBe(true);
expect(body.data.name).toBe('regular-case');
});
it('returns error when case not found anywhere', async () => {
@@ -337,7 +393,7 @@ describe('case-routes', () => {
method: 'GET',
url: '/api/cases/nonexistent',
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toContain('not found');
@@ -358,9 +414,9 @@ describe('case-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.exists).toBe(false);
expect(body.content).toBeNull();
expect(body.todos).toEqual([]);
expect(body.data.exists).toBe(false);
expect(body.data.content).toBeNull();
expect(body.data.todos).toEqual([]);
});
it('parses fix plan with todos and stats', async () => {
@@ -397,9 +453,9 @@ describe('case-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.exists).toBe(true);
expect(body.todos.length).toBeGreaterThan(0);
expect(body.stats.total).toBeGreaterThan(0);
expect(body.data.exists).toBe(true);
expect(body.data.todos.length).toBeGreaterThan(0);
expect(body.data.stats.total).toBeGreaterThan(0);
});
});
@@ -413,7 +469,7 @@ describe('case-routes', () => {
method: 'GET',
url: '/api/cases/my-case/ralph-wizard/files',
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toContain('not found');
@@ -424,7 +480,7 @@ describe('case-routes', () => {
method: 'GET',
url: '/api/cases/..%2F..%2Fetc/ralph-wizard/files',
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(400);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -464,7 +520,7 @@ describe('case-routes', () => {
method: 'GET',
url: '/api/cases/my-case/ralph-wizard/file/research%2Fprompt.md',
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
+60 -4
View File
@@ -3,17 +3,73 @@
*
* Uses app.inject() — no real HTTP ports needed.
* Port: N/A (app.inject doesn't open ports)
*
* These tests assert the UNIFORM response envelope (stable HTTP contract):
* success -> 2xx, { success: true, data: <payload> }
* error -> 4xx/5xx, { success: false, error, errorCode }
* The production server applies this via a preSerialization hook (server.ts).
* The shared route harness doesn't install it, so we build a local harness here
* that mirrors production: the same preSerialization envelope hook + the shared
* route error handler, so assertions match the real wire format.
*/
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import { createRouteTestHarness, type RouteTestHarness } from './_route-test-utils.js';
import Fastify, { type FastifyInstance } from 'fastify';
import fastifyCookie from '@fastify/cookie';
import { createMockRouteContext, type MockRouteContext } from '../mocks/index.js';
import { installRouteErrorHandler } from '../../src/web/route-error-handler.js';
import { ApiErrorCode, httpStatusForErrorCode } from '../../src/types.js';
import { registerHookEventRoutes } from '../../src/web/routes/hook-event-routes.js';
interface LocalHarness {
app: FastifyInstance;
ctx: MockRouteContext;
}
/**
* Build a Fastify instance that mirrors production's uniform-envelope behavior
* (server.ts preSerialization hook) so the test wire format matches the contract:
* bare payloads become { success: true, data }, and { success:false } error
* envelopes get the conventional HTTP status from their errorCode.
*/
async function createEnvelopeHarness(
registerFn: (app: FastifyInstance, ctx: MockRouteContext) => void
): Promise<LocalHarness> {
const app = Fastify({ logger: false });
await app.register(fastifyCookie);
const ctx = createMockRouteContext();
registerFn(app, ctx);
// Mirror production uniform response envelope (server.ts).
app.addHook('preSerialization', (req, reply, payload: unknown, done) => {
if (!req.url.startsWith('/api')) return done(null, payload);
if (payload === null || typeof payload !== 'object') return done(null, payload);
if (Buffer.isBuffer(payload) || typeof (payload as { pipe?: unknown }).pipe === 'function') {
return done(null, payload);
}
const p = payload as { success?: unknown; errorCode?: unknown };
if (p.success === false) {
if (reply.statusCode === 200 && typeof p.errorCode === 'string') {
reply.code(httpStatusForErrorCode(p.errorCode as ApiErrorCode));
}
return done(null, payload);
}
if (p.success === true) return done(null, payload);
return done(null, { success: true, data: payload });
});
installRouteErrorHandler(app);
await app.ready();
return { app, ctx };
}
describe('hook-event-routes', () => {
let harness: RouteTestHarness;
let harness: LocalHarness;
beforeEach(async () => {
harness = await createRouteTestHarness(registerHookEventRoutes);
harness = await createEnvelopeHarness(registerHookEventRoutes);
});
afterEach(async () => {
@@ -69,7 +125,7 @@ describe('hook-event-routes', () => {
data: null,
},
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.error).toBeDefined();
+5 -7
View File
@@ -15,9 +15,7 @@ describe('mux-routes', () => {
beforeEach(async () => {
// Add mux methods that mux-routes needs but mock-route-context doesn't provide
harness = await createRouteTestHarness(registerMuxRoutes);
harness.ctx.mux.getSessionsWithStats = vi.fn(async () => [
{ name: 'codeman-abc', pid: 1234, created: Date.now() },
]);
harness.ctx.mux.getSessionsWithStats = vi.fn(async () => [{ name: 'codeman-abc', pid: 1234, created: Date.now() }]);
harness.ctx.mux.isAvailable = vi.fn(() => true);
harness.ctx.mux.reconcileSessions = vi.fn(async () => ({
orphaned: [],
@@ -74,7 +72,7 @@ describe('mux-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.killed).toBe(true);
expect(harness.ctx.mux.killSession).toHaveBeenCalledWith('codeman-abc');
});
@@ -87,7 +85,7 @@ describe('mux-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
expect(body.killed).toBe(false);
});
});
@@ -119,7 +117,7 @@ describe('mux-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body).toEqual({});
expect(harness.ctx.mux.startStatsCollection).toHaveBeenCalled();
});
});
@@ -134,7 +132,7 @@ describe('mux-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body).toEqual({});
expect(harness.ctx.mux.stopStatsCollection).toHaveBeenCalled();
});
});
+10 -2
View File
@@ -131,7 +131,11 @@ describe('push-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare {} on success; the uniform envelope wraps it to
// { success:true, data:{} } in production. At the route-handler layer the
// harness sees the bare return, so the meaningful check is the empty body
// plus the pushStore call below.
expect(body).toEqual({});
expect(harness.ctx.pushStore.updatePreferences).toHaveBeenCalledWith('sub-123', {
'session:idle': true,
'session:error': true,
@@ -176,7 +180,11 @@ describe('push-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare {} on success; the uniform envelope wraps it to
// { success:true, data:{} } in production. At the route-handler layer the
// harness sees the bare return, so the meaningful check is the empty body
// plus the pushStore call below.
expect(body).toEqual({});
expect(harness.ctx.pushStore.removeSubscription).toHaveBeenCalledWith('sub-123');
});
+2 -2
View File
@@ -62,7 +62,7 @@ describe('ralph-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body).toEqual({});
});
it('enables ralph tracker', async () => {
@@ -230,7 +230,7 @@ describe('ralph-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body).toEqual({});
expect(tracker.resetCircuitBreaker).toHaveBeenCalled();
});
+16 -5
View File
@@ -69,7 +69,9 @@ describe('respawn-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler now returns a bare payload; the uniform envelope wraps it to
// { success:true, data:{ config, active } } in production. At the route-handler
// layer the harness sees the bare return, so config/active stay top-level.
expect(body.config).toBeNull();
expect(body.active).toBe(false);
});
@@ -88,7 +90,8 @@ describe('respawn-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare { config, active } payload (wrapped under data by the
// uniform envelope in production); the harness sees the bare return.
expect(body.active).toBe(true);
expect(body.config.idleTimeoutMs).toBe(5000);
});
@@ -121,7 +124,11 @@ describe('respawn-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare {} on success; the uniform envelope wraps it to
// { success:true, data:{} } in production. At the route-handler layer the
// harness sees the bare return, so success is signalled by the 200 + empty
// body plus the side effects asserted below.
expect(body).toEqual({});
expect(mockController.stop).toHaveBeenCalled();
expect(harness.ctx.respawnControllers.has(harness.ctx._sessionId)).toBe(false);
expect(harness.ctx.broadcast).toHaveBeenCalledWith('respawn:stopped', {
@@ -192,7 +199,9 @@ describe('respawn-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare { config } payload (wrapped under data by the uniform
// envelope in production); the harness sees the bare return.
expect(body.config).toBeDefined();
expect(mockController.updateConfig).toHaveBeenCalled();
expect(harness.ctx.broadcast).toHaveBeenCalledWith(
'respawn:configUpdated',
@@ -208,7 +217,9 @@ describe('respawn-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare { config } payload (wrapped under data by the uniform
// envelope in production); the harness sees the bare return.
expect(body.config).toBeDefined();
expect(harness.ctx.mux.updateRespawnConfig).toHaveBeenCalled();
});
});
+9 -3
View File
@@ -102,7 +102,9 @@ describe('scheduled-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare { run } now; the uniform envelope wraps it to
// { success:true, data:{ run } } in production. At the route-handler layer
// the harness sees the bare return, so assert body.run directly.
expect(body.run.id).toBe('new-run');
});
@@ -169,7 +171,9 @@ describe('scheduled-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Bare { run } return (envelope-wrapped to { success:true, data:{ run } }
// in production; harness sees the bare return).
expect(body.run).toBeDefined();
// Should default to 60 minutes
expect(harness.ctx.startScheduledRun).toHaveBeenCalledWith('test', expect.any(String), 60);
});
@@ -200,7 +204,9 @@ describe('scheduled-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
// Handler returns a bare {} on success; the uniform envelope wraps it to
// { success:true, data:{} } in production. The harness sees the bare return.
expect(body).toEqual({});
expect(harness.ctx.stopScheduledRun).toHaveBeenCalledWith('run-to-delete');
});
+77 -21
View File
@@ -3,10 +3,22 @@
*
* Uses app.inject() (Fastify's built-in test helper) — no real HTTP ports needed.
* Port: N/A (app.inject doesn't open ports)
*
* These tests assert the UNIFORM response envelope (stable HTTP contract):
* success -> 2xx, { success: true, data: <payload> }
* error -> 4xx/5xx, { success: false, error, errorCode }
* The production server applies this via a preSerialization hook (server.ts).
* The shared route harness doesn't install it, so we build a local harness here
* that mirrors production: the same preSerialization envelope hook + the shared
* route error handler, so assertions match the real wire format.
*/
import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
import { createRouteTestHarness, type RouteTestHarness } from './_route-test-utils.js';
import Fastify, { type FastifyInstance } from 'fastify';
import fastifyCookie from '@fastify/cookie';
import { createMockRouteContext, type MockRouteContext } from '../mocks/index.js';
import { installRouteErrorHandler } from '../../src/web/route-error-handler.js';
import { ApiErrorCode, httpStatusForErrorCode } from '../../src/types.js';
// Mock execFile so the send-key route's `tmux` invocation is observable (not run for real).
const { execFile } = vi.hoisted(() => ({ execFile: vi.fn() }));
@@ -17,11 +29,55 @@ vi.mock('node:child_process', async (orig) => {
import { registerSessionRoutes } from '../../src/web/routes/session-routes.js';
interface LocalHarness {
app: FastifyInstance;
ctx: MockRouteContext;
}
/**
* Build a Fastify instance that mirrors production's uniform-envelope behavior
* (server.ts preSerialization hook) so the test wire format matches the contract:
* bare payloads become { success: true, data }, and { success:false } error
* envelopes get the conventional HTTP status from their errorCode.
*/
async function createEnvelopeHarness(
registerFn: (app: FastifyInstance, ctx: MockRouteContext) => void
): Promise<LocalHarness> {
const app = Fastify({ logger: false });
await app.register(fastifyCookie);
const ctx = createMockRouteContext();
registerFn(app, ctx);
// Mirror production uniform response envelope (server.ts).
app.addHook('preSerialization', (req, reply, payload: unknown, done) => {
if (!req.url.startsWith('/api')) return done(null, payload);
if (payload === null || typeof payload !== 'object') return done(null, payload);
if (Buffer.isBuffer(payload) || typeof (payload as { pipe?: unknown }).pipe === 'function') {
return done(null, payload);
}
const p = payload as { success?: unknown; errorCode?: unknown };
if (p.success === false) {
if (reply.statusCode === 200 && typeof p.errorCode === 'string') {
reply.code(httpStatusForErrorCode(p.errorCode as ApiErrorCode));
}
return done(null, payload);
}
if (p.success === true) return done(null, payload);
return done(null, { success: true, data: payload });
});
installRouteErrorHandler(app);
await app.ready();
return { app, ctx };
}
describe('session-routes', () => {
let harness: RouteTestHarness;
let harness: LocalHarness;
beforeEach(async () => {
harness = await createRouteTestHarness(registerSessionRoutes);
harness = await createEnvelopeHarness(registerSessionRoutes);
});
afterEach(async () => {
@@ -73,15 +129,15 @@ describe('session-routes', () => {
const res = await harness.app.inject({ method: 'GET', url: '/api/sessions' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(Array.isArray(body)).toBe(true);
expect(body).toHaveLength(1);
expect(Array.isArray(body.data)).toBe(true);
expect(body.data).toHaveLength(1);
});
it('returns empty array when no sessions', async () => {
harness.ctx.sessions.clear();
const res = await harness.app.inject({ method: 'GET', url: '/api/sessions' });
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body)).toEqual([]);
expect(JSON.parse(res.body).data).toEqual([]);
});
});
@@ -95,7 +151,7 @@ describe('session-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.id).toBe(harness.ctx._sessionId);
expect(body.data.id).toBe(harness.ctx._sessionId);
});
it('returns error for unknown session', async () => {
@@ -129,7 +185,7 @@ describe('session-routes', () => {
method: 'DELETE',
url: '/api/sessions/nonexistent',
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(404);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -163,7 +219,7 @@ describe('session-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.name).toBe('new-name');
expect(body.data.name).toBe('new-name');
expect(harness.ctx.persistSessionState).toHaveBeenCalled();
expect(harness.ctx.broadcast).toHaveBeenCalledWith('session:updated', expect.anything());
});
@@ -192,7 +248,7 @@ describe('session-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.color).toBe('blue');
expect(body.data.color).toBe('blue');
});
it('rejects invalid color', async () => {
@@ -201,7 +257,7 @@ describe('session-routes', () => {
url: `/api/sessions/${harness.ctx._sessionId}/color`,
payload: { color: 'neon-rainbow' },
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(400);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -304,7 +360,7 @@ describe('session-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.terminalBuffer).toBeDefined();
expect(body.data.terminalBuffer).toBeDefined();
});
it('returns error for unknown session', async () => {
@@ -361,7 +417,7 @@ describe('session-routes', () => {
url: `/api/sessions/${harness.ctx._sessionId}/run`,
payload: { prompt: 'test' },
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(409);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -397,7 +453,7 @@ describe('session-routes', () => {
method: 'POST',
url: `/api/sessions/${harness.ctx._sessionId}/interactive`,
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(409);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -423,7 +479,7 @@ describe('session-routes', () => {
method: 'POST',
url: `/api/sessions/${harness.ctx._sessionId}/shell`,
});
expect(res.statusCode).toBe(200);
expect(res.statusCode).toBe(409);
const body = JSON.parse(res.body);
expect(body.success).toBe(false);
});
@@ -512,8 +568,8 @@ describe('session-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body).toHaveProperty('sessions');
expect(Array.isArray(body.sessions)).toBe(true);
expect(body.data).toHaveProperty('sessions');
expect(Array.isArray(body.data.sessions)).toBe(true);
});
it('sessions have required fields', async () => {
@@ -522,7 +578,7 @@ describe('session-routes', () => {
url: '/api/history/sessions',
});
const body = JSON.parse(res.body);
for (const session of body.sessions) {
for (const session of body.data.sessions) {
expect(session).toHaveProperty('sessionId');
expect(session).toHaveProperty('workingDir');
expect(session).toHaveProperty('projectKey');
@@ -539,7 +595,7 @@ describe('session-routes', () => {
url: '/api/history/sessions',
});
const body = JSON.parse(res.body);
const dates = body.sessions.map((s: { lastModified: string }) => new Date(s.lastModified).getTime());
const dates = body.data.sessions.map((s: { lastModified: string }) => new Date(s.lastModified).getTime());
for (let i = 1; i < dates.length; i++) {
expect(dates[i - 1]).toBeGreaterThanOrEqual(dates[i]);
}
@@ -551,7 +607,7 @@ describe('session-routes', () => {
url: '/api/history/sessions',
});
const body = JSON.parse(res.body);
expect(body.sessions.length).toBeLessThanOrEqual(50);
expect(body.data.sessions.length).toBeLessThanOrEqual(50);
});
});
@@ -572,7 +628,7 @@ describe('session-routes', () => {
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.session).toBeDefined();
expect(body.data.session).toBeDefined();
});
it('rejects invalid resumeSessionId format', async () => {
+11 -19
View File
@@ -140,7 +140,6 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'GET', url: '/api/config' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.config).toBeDefined();
});
});
@@ -156,7 +155,7 @@ describe('system-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.config).toBeDefined();
expect(harness.ctx.store.setConfig).toHaveBeenCalled();
});
@@ -179,7 +178,6 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'GET', url: '/api/stats' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.stats).toBeDefined();
});
});
@@ -191,7 +189,6 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'GET', url: '/api/token-stats' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.daily).toBeDefined();
expect(body.totals).toBeDefined();
});
@@ -230,7 +227,6 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'POST', url: '/api/cleanup-state' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.cleanedSessions).toBe(0);
expect(harness.ctx.store.cleanupStaleSessions).toHaveBeenCalled();
});
@@ -266,7 +262,7 @@ describe('system-routes', () => {
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body).toEqual({});
});
it('revokes a specific session token', async () => {
@@ -280,7 +276,6 @@ describe('system-routes', () => {
payload: { sessionToken: 'tok-123' },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(authSessions.has('tok-123')).toBe(false);
});
@@ -333,8 +328,6 @@ describe('system-routes', () => {
payload: { showSystemStats: true, subagentTrackingEnabled: false },
});
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(mockedWriteFile).toHaveBeenCalled();
});
@@ -347,7 +340,7 @@ describe('system-routes', () => {
payload: { showTokenCount: false },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
// Verify writeFile was called with merged content
const writtenContent = JSON.parse(mockedWriteFile.mock.calls[0][1] as string);
@@ -377,7 +370,7 @@ describe('system-routes', () => {
payload: { lastUsedCase: 'my-test-case' },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
const writtenContent = JSON.parse(mockedWriteFile.mock.calls[0][1] as string);
expect(writtenContent.lastUsedCase).toBe('my-test-case');
@@ -439,7 +432,7 @@ describe('system-routes', () => {
payload: { minimized: { 'agent-1': true }, open: ['agent-2'] },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
expect(mockedWriteFile).toHaveBeenCalled();
});
@@ -450,7 +443,7 @@ describe('system-routes', () => {
payload: { minimized: {}, open: [] },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
});
it('rejects invalid minimized values', async () => {
@@ -496,7 +489,7 @@ describe('system-routes', () => {
payload: { 'agent-1': 'session-abc' },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
expect(mockedWriteFile).toHaveBeenCalled();
});
@@ -507,7 +500,7 @@ describe('system-routes', () => {
payload: {},
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
});
it('rejects non-string values in parent map', async () => {
@@ -629,7 +622,6 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'GET', url: '/api/session-lifecycle' });
expect(res.statusCode).toBe(200);
const body = JSON.parse(res.body);
expect(body.success).toBe(true);
expect(body.entries).toEqual(mockEntries);
});
@@ -754,7 +746,7 @@ describe('system-routes', () => {
payload: { model: 'claude-3', temperature: 0.5 },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
expect(mockedWriteFile).toHaveBeenCalled();
// Verify the written content contains modelConfig
@@ -771,7 +763,7 @@ describe('system-routes', () => {
payload: { model: 'new-model' },
});
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
const writtenContent = JSON.parse(mockedWriteFile.mock.calls[0][1] as string);
expect(writtenContent.showCost).toBe(true);
@@ -972,7 +964,7 @@ describe('system-routes', () => {
const res = await harness.app.inject({ method: 'POST', url: '/api/tunnel/qr/regenerate' });
expect(res.statusCode).toBe(200);
expect(JSON.parse(res.body).success).toBe(true);
expect(JSON.parse(res.body)).toEqual({});
});
});
});
+4 -1
View File
@@ -65,7 +65,10 @@ describe('POST /api/system/span-displays', () => {
headers: { host: 'localhost:5000' },
});
expect(res.statusCode).toBe(200);
expect(res.json()).toMatchObject({ success: true, url: 'http://localhost:5000' });
// Handler returns a bare { url } on success; the uniform envelope wraps it to
// { success:true, data:{ url } } in production. At the route-handler layer the
// harness sees the bare return, so we assert on body.url directly.
expect(res.json()).toMatchObject({ url: 'http://localhost:5000' });
expect(spawnMock).toHaveBeenCalledTimes(1);
const [cmd, args] = spawnMock.mock.calls[0] as [string, string[]];
expect(cmd).toBe('bash');
+26 -24
View File
@@ -29,7 +29,7 @@ describe('Scheduled Runs API', () => {
const response = await fetch(`${baseUrl}/api/scheduled`);
const data = await response.json();
expect(Array.isArray(data)).toBe(true);
expect(Array.isArray(data.data)).toBe(true);
});
});
@@ -47,16 +47,16 @@ describe('Scheduled Runs API', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.run).toBeDefined();
expect(data.run.id).toBeDefined();
expect(data.run.prompt).toBe('echo test');
expect(data.run.durationMinutes).toBe(1);
expect(data.run.status).toBe('running');
expect(data.data.run).toBeDefined();
expect(data.data.run.id).toBeDefined();
expect(data.data.run.prompt).toBe('echo test');
expect(data.data.run.durationMinutes).toBe(1);
expect(data.data.run.status).toBe('running');
createdRuns.push(data.run.id);
createdRuns.push(data.data.run.id);
// Stop the run immediately to avoid resource usage
await fetch(`${baseUrl}/api/scheduled/${data.run.id}`, { method: 'DELETE' });
await fetch(`${baseUrl}/api/scheduled/${data.data.run.id}`, { method: 'DELETE' });
});
it('should set correct timestamps', async () => {
@@ -74,12 +74,12 @@ describe('Scheduled Runs API', () => {
const afterCreate = Date.now();
expect(data.run.startedAt).toBeGreaterThanOrEqual(beforeCreate);
expect(data.run.startedAt).toBeLessThanOrEqual(afterCreate);
expect(data.run.endAt).toBe(data.run.startedAt + 5 * 60 * 1000);
expect(data.data.run.startedAt).toBeGreaterThanOrEqual(beforeCreate);
expect(data.data.run.startedAt).toBeLessThanOrEqual(afterCreate);
expect(data.data.run.endAt).toBe(data.data.run.startedAt + 5 * 60 * 1000);
createdRuns.push(data.run.id);
await fetch(`${baseUrl}/api/scheduled/${data.run.id}`, { method: 'DELETE' });
createdRuns.push(data.data.run.id);
await fetch(`${baseUrl}/api/scheduled/${data.data.run.id}`, { method: 'DELETE' });
});
it('should initialize with zero completed tasks and cost', async () => {
@@ -93,13 +93,13 @@ describe('Scheduled Runs API', () => {
});
const data = await response.json();
expect(data.run.completedTasks).toBe(0);
expect(data.run.totalCost).toBe(0);
expect(data.data.run.completedTasks).toBe(0);
expect(data.data.run.totalCost).toBe(0);
// Logs may have 1 or more entries depending on timing
expect(data.run.logs.length).toBeGreaterThanOrEqual(1);
expect(data.data.run.logs.length).toBeGreaterThanOrEqual(1);
createdRuns.push(data.run.id);
await fetch(`${baseUrl}/api/scheduled/${data.run.id}`, { method: 'DELETE' });
createdRuns.push(data.data.run.id);
await fetch(`${baseUrl}/api/scheduled/${data.data.run.id}`, { method: 'DELETE' });
});
});
@@ -115,15 +115,15 @@ describe('Scheduled Runs API', () => {
}),
});
const createData = await createRes.json();
const runId = createData.run.id;
const runId = createData.data.run.id;
createdRuns.push(runId);
// Get the run
const response = await fetch(`${baseUrl}/api/scheduled/${runId}`);
const data = await response.json();
expect(data.id).toBe(runId);
expect(data.prompt).toBe('test get');
expect(data.data.id).toBe(runId);
expect(data.data.prompt).toBe('test get');
await fetch(`${baseUrl}/api/scheduled/${runId}`, { method: 'DELETE' });
});
@@ -148,7 +148,7 @@ describe('Scheduled Runs API', () => {
}),
});
const createData = await createRes.json();
const runId = createData.run.id;
const runId = createData.data.run.id;
// Delete/stop the run
const response = await fetch(`${baseUrl}/api/scheduled/${runId}`, {
@@ -161,7 +161,7 @@ describe('Scheduled Runs API', () => {
// Verify it's stopped
const getRes = await fetch(`${baseUrl}/api/scheduled/${runId}`);
const runData = await getRes.json();
expect(runData.status).toBe('stopped');
expect(runData.data.status).toBe('stopped');
});
it('should return error for non-existent run', async () => {
@@ -204,7 +204,9 @@ describe('Quick Run API', () => {
});
const data = await response.json();
expect(data.sessionId).toBeDefined();
// On success the payload is wrapped ({ success:true, data:{ sessionId, ... } });
// on failure the handler returns a bare { success:false, sessionId, error }.
expect(data.data?.sessionId ?? data.sessionId).toBeDefined();
// Note: success/failure depends on Claude actually running
});
+22 -22
View File
@@ -60,14 +60,14 @@ describe('Session Cleanup', () => {
expect(quickStartData.success).toBe(true);
// Delete the session
const deleteRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}`, {
const deleteRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}`, {
method: 'DELETE',
});
const deleteData = await deleteRes.json();
expect(deleteData.success).toBe(true);
// Verify session is gone
const getRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.sessionId}`);
const getRes = await fetch(`${baseUrl}/api/sessions/${quickStartData.data.sessionId}`);
const getData = await getRes.json();
expect(getData.error).toContain('not found');
});
@@ -87,7 +87,7 @@ describe('Session Cleanup', () => {
});
const data = await res.json();
expect(data.success).toBe(true);
sessionIds.push(data.sessionId);
sessionIds.push(data.data.sessionId);
}
// Delete all sessions
@@ -103,7 +103,7 @@ describe('Session Cleanup', () => {
const listRes = await fetch(`${baseUrl}/api/sessions`);
const sessions = await listRes.json();
for (const id of sessionIds) {
expect(sessions.find((s: any) => s.id === id)).toBeUndefined();
expect(sessions.data.find((s: any) => s.id === id)).toBeUndefined();
}
}, 60000); // Extended timeout for multi-session test
});
@@ -129,19 +129,19 @@ describe('Session Cleanup', () => {
expect(sessionData.success).toBe(true);
// Start interactive with respawn
const interactiveRes = await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}/interactive-respawn`, {
const interactiveRes = await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}/interactive-respawn`, {
method: 'POST',
});
const interactiveData = await interactiveRes.json();
expect(interactiveData.success).toBe(true);
// Verify respawn is running
const respawnRes = await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}/respawn`);
const respawnRes = await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}/respawn`);
const respawnData = await respawnRes.json();
expect(respawnData.enabled).toBe(true);
expect(respawnData.data.enabled).toBe(true);
// Delete session
await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}`, {
await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}`, {
method: 'DELETE',
});
@@ -149,10 +149,10 @@ describe('Session Cleanup', () => {
await new Promise((resolve) => setTimeout(resolve, 500));
// Verify respawn controller is cleaned up (enabled: false when controller doesn't exist)
const respawnAfterRes = await fetch(`${baseUrl}/api/sessions/${sessionData.session.id}/respawn`);
const respawnAfterRes = await fetch(`${baseUrl}/api/sessions/${sessionData.data.session.id}/respawn`);
const respawnAfterData = await respawnAfterRes.json();
// The respawn endpoint returns enabled: false when there's no controller
expect(respawnAfterData.enabled).toBe(false);
expect(respawnAfterData.data.enabled).toBe(false);
});
});
@@ -172,16 +172,16 @@ describe('Session Cleanup', () => {
expect(createData.success).toBe(true);
// Stop the scheduled run
const stopRes = await fetch(`${baseUrl}/api/scheduled/${createData.run.id}`, {
const stopRes = await fetch(`${baseUrl}/api/scheduled/${createData.data.run.id}`, {
method: 'DELETE',
});
const stopData = await stopRes.json();
expect(stopData.success).toBe(true);
// Verify status is stopped
const getRes = await fetch(`${baseUrl}/api/scheduled/${createData.run.id}`);
const getRes = await fetch(`${baseUrl}/api/scheduled/${createData.data.run.id}`);
const getData = await getRes.json();
expect(getData.status).toBe('stopped');
expect(getData.data.status).toBe('stopped');
});
});
});
@@ -211,7 +211,7 @@ describe('Resource Management', () => {
// Get initial session count (may have restored sessions from other tests)
const initialRes = await fetch(`${baseUrl}/api/sessions`);
const initialSessions = await initialRes.json();
const initialCount = initialSessions.length;
const initialCount = initialSessions.data.length;
const iterations = 5;
const createdSessionIds: string[] = [];
@@ -228,10 +228,10 @@ describe('Resource Management', () => {
});
const createData = await createRes.json();
expect(createData.success).toBe(true);
createdSessionIds.push(createData.sessionId);
createdSessionIds.push(createData.data.sessionId);
// Delete immediately
const deleteRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}`, {
const deleteRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}`, {
method: 'DELETE',
});
const deleteData = await deleteRes.json();
@@ -250,11 +250,11 @@ describe('Resource Management', () => {
// None of the sessions we created should still exist
for (const sessionId of createdSessionIds) {
expect(sessions.find((s: { id: string }) => s.id === sessionId)).toBeUndefined();
expect(sessions.data.find((s: { id: string }) => s.id === sessionId)).toBeUndefined();
}
// Session count should be back to initial (or less if some restored sessions were cleaned up)
expect(sessions.length).toBeLessThanOrEqual(initialCount);
expect(sessions.data.length).toBeLessThanOrEqual(initialCount);
});
it('should clear terminal buffer after session stop', async () => {
@@ -274,18 +274,18 @@ describe('Resource Management', () => {
await new Promise((resolve) => setTimeout(resolve, 2000));
// Get terminal buffer before stop - may or may not have content depending on timing
const terminalRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/terminal`);
const terminalRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/terminal`);
const terminalData = await terminalRes.json();
// Just verify the property exists
expect(terminalData.terminalBuffer).toBeDefined();
expect(terminalData.data.terminalBuffer).toBeDefined();
// Delete session
await fetch(`${baseUrl}/api/sessions/${createData.sessionId}`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}`, {
method: 'DELETE',
});
// Session should be gone
const afterRes = await fetch(`${baseUrl}/api/sessions/${createData.sessionId}/terminal`);
const afterRes = await fetch(`${baseUrl}/api/sessions/${createData.data.sessionId}/terminal`);
const afterData = await afterRes.json();
expect(afterData.error).toContain('not found');
});
+15 -15
View File
@@ -32,9 +32,9 @@ describe('Interactive Session Lifecycle', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.session.id).toBeDefined();
expect(data.session.workingDir).toBeDefined();
expect(data.session.status).toBe('idle');
expect(data.data.session.id).toBeDefined();
expect(data.data.session.workingDir).toBeDefined();
expect(data.data.session.status).toBe('idle');
});
it('should create session with custom working directory', async () => {
@@ -47,7 +47,7 @@ describe('Interactive Session Lifecycle', () => {
const data = await response.json();
expect(data.success).toBe(true);
expect(data.session.workingDir).toBe('/tmp/test');
expect(data.data.session.workingDir).toBe('/tmp/test');
});
});
@@ -60,14 +60,14 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Get the session
const response = await fetch(`${baseUrl}/api/sessions/${sessionId}`);
const data = await response.json();
expect(data.id).toBe(sessionId);
expect(data.status).toBeDefined();
expect(data.data.id).toBe(sessionId);
expect(data.data.status).toBeDefined();
});
it('should return error for non-existent session', async () => {
@@ -87,7 +87,7 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Delete the session
const response = await fetch(`${baseUrl}/api/sessions/${sessionId}`, {
@@ -123,7 +123,7 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Get output
const response = await fetch(`${baseUrl}/api/sessions/${sessionId}/output`);
@@ -145,14 +145,14 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Get terminal buffer
const response = await fetch(`${baseUrl}/api/sessions/${sessionId}/terminal`);
const data = await response.json();
expect(data).toHaveProperty('terminalBuffer');
expect(data).toHaveProperty('status');
expect(data.data).toHaveProperty('terminalBuffer');
expect(data.data).toHaveProperty('status');
});
});
@@ -165,7 +165,7 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Start interactive mode
const response = await fetch(`${baseUrl}/api/sessions/${sessionId}/interactive`, {
@@ -195,7 +195,7 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
await fetch(`${baseUrl}/api/sessions/${sessionId}/interactive`, {
method: 'POST',
@@ -225,7 +225,7 @@ describe('Interactive Session Lifecycle', () => {
body: JSON.stringify({}),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
await fetch(`${baseUrl}/api/sessions/${sessionId}/interactive`, {
method: 'POST',
+32 -25
View File
@@ -93,7 +93,7 @@ describe('SSE Events', () => {
// Parse and check for init event
const events = parseSSEEvents(receivedData);
const initEvent = events.find(e => e.event === 'init');
const initEvent = events.find((e) => e.event === 'init');
expect(initEvent).toBeDefined();
expect((initEvent?.data as any).sessions).toBeDefined();
@@ -109,7 +109,7 @@ describe('SSE Events', () => {
// Start listening
const fetchPromise = fetch(`${baseUrl}/api/events`, {
signal: controller.signal,
}).then(async response => {
}).then(async (response) => {
const reader = response.body?.getReader();
if (reader) {
try {
@@ -123,7 +123,7 @@ describe('SSE Events', () => {
});
// Give time to connect
await new Promise(resolve => setTimeout(resolve, 100));
await new Promise((resolve) => setTimeout(resolve, 100));
// Create a session
await fetch(`${baseUrl}/api/sessions`, {
@@ -133,15 +133,17 @@ describe('SSE Events', () => {
});
// Wait a bit for the event
await new Promise(resolve => setTimeout(resolve, 200));
await new Promise((resolve) => setTimeout(resolve, 200));
// Stop listening
controller.abort();
try { await fetchPromise; } catch {}
try {
await fetchPromise;
} catch {}
// Parse events
const events = parseSSEEvents(receivedData);
const sessionCreated = events.find(e => e.event === 'session:created');
const sessionCreated = events.find((e) => e.event === 'session:created');
expect(sessionCreated).toBeDefined();
expect((sessionCreated?.data as any).id).toBeDefined();
@@ -151,12 +153,13 @@ describe('SSE Events', () => {
describe('GET /api/status', () => {
it('should return full state', async () => {
const response = await fetch(`${baseUrl}/api/status`);
const data = await response.json();
const body = await response.json();
expect(data).toHaveProperty('sessions');
expect(data).toHaveProperty('scheduledRuns');
expect(data).toHaveProperty('respawnStatus');
expect(data).toHaveProperty('timestamp');
expect(body.success).toBe(true);
expect(body.data).toHaveProperty('sessions');
expect(body.data).toHaveProperty('scheduledRuns');
expect(body.data).toHaveProperty('respawnStatus');
expect(body.data).toHaveProperty('timestamp');
});
it('should include active sessions', async () => {
@@ -168,9 +171,9 @@ describe('SSE Events', () => {
});
const response = await fetch(`${baseUrl}/api/status`);
const data = await response.json();
const body = await response.json();
expect(data.sessions.length).toBeGreaterThan(0);
expect(body.data.sessions.length).toBeGreaterThan(0);
});
});
});
@@ -197,7 +200,7 @@ describe('SSE Event Types', () => {
// Start listening
const fetchPromise = fetch(`${baseUrl}/api/events`, {
signal: controller.signal,
}).then(async response => {
}).then(async (response) => {
const reader = response.body?.getReader();
if (reader) {
try {
@@ -211,7 +214,7 @@ describe('SSE Event Types', () => {
});
// Give time to connect
await new Promise(resolve => setTimeout(resolve, 100));
await new Promise((resolve) => setTimeout(resolve, 100));
// Create a session
const createRes = await fetch(`${baseUrl}/api/sessions`, {
@@ -222,23 +225,25 @@ describe('SSE Event Types', () => {
const createData = await createRes.json();
// Delete it
await fetch(`${baseUrl}/api/sessions/${createData.session.id}`, {
await fetch(`${baseUrl}/api/sessions/${createData.data.session.id}`, {
method: 'DELETE',
});
// Wait for events
await new Promise(resolve => setTimeout(resolve, 200));
await new Promise((resolve) => setTimeout(resolve, 200));
// Stop listening
controller.abort();
try { await fetchPromise; } catch {}
try {
await fetchPromise;
} catch {}
// Parse events
const events = parseSSEEvents(receivedData);
const sessionDeleted = events.find(e => e.event === 'session:deleted');
const sessionDeleted = events.find((e) => e.event === 'session:deleted');
expect(sessionDeleted).toBeDefined();
expect((sessionDeleted?.data as any).id).toBe(createData.session.id);
expect((sessionDeleted?.data as any).id).toBe(createData.data.session.id);
});
});
@@ -250,7 +255,7 @@ describe('SSE Event Types', () => {
// Start listening
const fetchPromise = fetch(`${baseUrl}/api/events`, {
signal: controller.signal,
}).then(async response => {
}).then(async (response) => {
const reader = response.body?.getReader();
if (reader) {
try {
@@ -264,7 +269,7 @@ describe('SSE Event Types', () => {
});
// Give time to connect
await new Promise(resolve => setTimeout(resolve, 100));
await new Promise((resolve) => setTimeout(resolve, 100));
// Create a case
const caseName = `test-sse-case-${Date.now()}`;
@@ -275,15 +280,17 @@ describe('SSE Event Types', () => {
});
// Wait for events
await new Promise(resolve => setTimeout(resolve, 200));
await new Promise((resolve) => setTimeout(resolve, 200));
// Stop listening
controller.abort();
try { await fetchPromise; } catch {}
try {
await fetchPromise;
} catch {}
// Parse events
const events = parseSSEEvents(receivedData);
const caseCreated = events.find(e => e.event === 'case:created');
const caseCreated = events.find((e) => e.event === 'case:created');
expect(caseCreated).toBeDefined();
expect((caseCreated?.data as any).name).toBe(caseName);
+6 -6
View File
@@ -159,7 +159,7 @@ describe('SSE Subscription Filtering', () => {
body: JSON.stringify({ workingDir: '/tmp' }),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Wait for events to arrive
await new Promise((resolve) => setTimeout(resolve, 300));
@@ -210,7 +210,7 @@ describe('SSE Subscription Filtering', () => {
body: JSON.stringify({ workingDir: '/tmp' }),
});
const createData = await createRes.json();
const sessionId = createData.session.id;
const sessionId = createData.data.session.id;
// Now connect SSE with the session filter
const controller = new AbortController();
@@ -264,14 +264,14 @@ describe('SSE Subscription Filtering', () => {
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ workingDir: '/tmp' }),
});
const session1 = (await createRes1.json()).session;
const session1 = (await createRes1.json()).data.session;
const createRes2 = await fetch(`${baseUrl}/api/sessions`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ workingDir: '/tmp' }),
});
const session2 = (await createRes2.json()).session;
const session2 = (await createRes2.json()).data.session;
// Connect SSE subscribed ONLY to session1
const controller = new AbortController();
@@ -331,14 +331,14 @@ describe('SSE Subscription Filtering', () => {
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ workingDir: '/tmp' }),
});
const session1 = (await createRes1.json()).session;
const session1 = (await createRes1.json()).data.session;
const createRes2 = await fetch(`${baseUrl}/api/sessions`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ workingDir: '/tmp' }),
});
const session2 = (await createRes2.json()).session;
const session2 = (await createRes2.json()).data.session;
// Connect SSE subscribed to both sessions
const controller = new AbortController();
+2 -2
View File
@@ -368,9 +368,9 @@ describe('types utility functions', () => {
expect(ApiErrorCode.INTERNAL_ERROR).toBe('INTERNAL_ERROR');
});
it('should have 6 error codes', () => {
it('should have 9 error codes', () => {
const codes = Object.values(ApiErrorCode);
expect(codes).toHaveLength(6);
expect(codes).toHaveLength(9);
});
});
});