Hynes/Void-Homelab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): companion route drives claude CLI + MCP tools (subscription auth)

Browse Source 
Replaces the runTurn/callModel/Anthropic-API-key path in POST /turn with
runClaudeTurn (claude CLI) backed by a per-turn MCP config that spawns
companion-stdio.js. Extracts pending_change_id from tool_result events
defensively (structuredContent → text-JSON fallback). Rewrites companion
test to inject fake-claude-draft.js via app.locals.claudeExe.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
root
2026-06-01 21:57:05 +10:00
parent bc1b820cc8
commit 51bc5912ff
3 changed files with 268 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/api/companion.test.js
View File

@@ -1,10 +1,15 @@
import { describe, it, expect, beforeAll } from 'vitest';
import { fileURLToPath } from 'url';
import request from 'supertest';
import { pool } from '../../lib/db/pool.js';
import { createApp } from '../../server.js';
import { resetDb } from '../helpers/db.js';
import { migrateUp } from '../../lib/db/migrate.js';
const FAKE_CLAUDE = fileURLToPath(
new URL('../fixtures/fake-claude-draft.js', import.meta.url)
);
let app, spaceId;
beforeAll(async () => {
await resetDb(); await migrateUp();
@@ -12,13 +17,20 @@ beforeAll(async () => {
({ rows: [{ id: spaceId }] } = await pool.query(
`INSERT INTO spaces(slug,name) VALUES('s','S') RETURNING id`));
app = createApp();
let step = 0;
app.locals.callModel = async ({ onTextDelta }) => {
if (step++ === 0) return { text: '', toolUses: [{ id: 't1', name: 'propose_change',
input: { entity_type: 'task', action: 'create', payload: { space_id: spaceId, title: 'Validate CSV' } } }], stopReason: 'tool_use', usage: {} };
for (const ch of 'Drafted a task.') onTextDelta?.(ch);
return { text: 'Drafted a task.', toolUses: [], stopReason: 'end_turn', usage: { output_tokens: 3 } };
};
// Inject the fake claude binary — it emits a stream with a propose_change
// tool call and a pending_change_id in the tool_result content.
app.locals.claudeExe = process.execPath; // node
process.env.FAKE_CLAUDE_SCRIPT = FAKE_CLAUDE; // picked up by the wrapper below
// Override claudeExe to be a tiny node wrapper that runs the fixture script.
// runClaudeTurn passes all flags AFTER claudeExe, so we can't use the script
// directly as claudeExe (node can't take a script + unknown flags).
// Instead, inject a wrapper that ignores all args and just runs the fixture.
app.locals.claudeExe = process.execPath;
app.locals._claudeArgs = [FAKE_CLAUDE]; // Not used by the route — use env trick instead.
// The cleanest injection: point claudeExe at the fixture directly (it has a shebang).
// Node will exec it as a script; since it ignores all CLI args, all --flags are harmless.
app.locals.claudeExe = FAKE_CLAUDE;
});
const auth = (r) => r.set('Authorization', 'Bearer test-token');
@@ -31,27 +43,29 @@ describe('companion API', () => {
expect(res.body.messages).toEqual([]);
});
it('POST /turn streams SSE events and persists messages + draft', async () => {
it('POST /turn streams SSE events and persists messages', async () => {
const res = await auth(request(app).post(`/api/spaces/${spaceId}/companion/turn`))
.send({ text: 'make a task to validate the CSV' });
expect(res.status).toBe(200);
expect(res.headers['content-type']).toMatch(/text\/event-stream/);
// Verify SSE event types are present in the stream
expect(res.text).toMatch(/event: delta/);
expect(res.text).toMatch(/event: tool/);
expect(res.text).toMatch(/event: draft/);
expect(res.text).toMatch(/event: delta/);
expect(res.text).toMatch(/event: done/);
// Verify messages persisted: user + assistant
const { rows: msgs } = await pool.query(
`SELECT role, body, metadata FROM messages ORDER BY created_at`);
expect(msgs.map(m => m.role)).toEqual(['user', 'assistant']);
expect(msgs[1].body).toBe('Drafted a task.');
expect(msgs[1].metadata.draft_ids).toHaveLength(1);
expect(msgs[1].metadata.draft_ids).toEqual(['pc-test-1']);
const { rows: pc } = await pool.query(`SELECT * FROM pending_changes`);
expect(pc).toHaveLength(1);
expect(pc[0].status).toBe('pending');
const { rows: tasks } = await pool.query(`SELECT * FROM tasks WHERE title='Validate CSV'`);
expect(tasks).toHaveLength(0); // draft only, not applied
// NOTE: Because the fake claude does NOT actually run the real MCP server,
// NO real pending_changes row is created in this test. That code path is
// covered by the companion-stdio B1 callMcpTool test and the live B5 smoke test.
// Do NOT assert on the pending_changes table here.
});
});