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

fix(companion): pass DATABASE_URL/OLLAMA_URL to MCP stdio child explicitly

Browse Source 
Don't rely on env inheritance/cwd-dotenv for the claude-spawned MCP server.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
root
2026-06-01 22:01:26 +10:00
parent 51bc5912ff
commit c4b014c15e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/api/routes/companion.js
View File

@@ -62,7 +62,9 @@ spacesScopedRouter.post('/turn',
const send = (event, data) => res.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`); const send = (event, data) => res.write(`event: ${event}\ndata: ${JSON.stringify(data)}\n\n`);
// Write a per-turn MCP config temp file declaring the companion stdio server. // Write a per-turn MCP config temp file declaring the companion stdio server.
// DB connection env is inherited from the void-server process — no creds needed here. // The stdio child is spawned by `claude`; pass the DB/Ollama connection env
// explicitly so the tools work regardless of how claude propagates env to
// MCP children (don't rely on inheritance or cwd-based dotenv).
const mcpConfigPath = join(tmpdir(), `void-mcp-${randomUUID()}.json`); const mcpConfigPath = join(tmpdir(), `void-mcp-${randomUUID()}.json`);
const agentActor = { const agentActor = {
kind: 'agent', kind: 'agent',
@@ -78,7 +80,9 @@ spacesScopedRouter.post('/turn',
env: { env: {
VOID_SPACE_ID: req.params.space_id, VOID_SPACE_ID: req.params.space_id,
VOID_AGENT_JSON: JSON.stringify(agentActor), VOID_AGENT_JSON: JSON.stringify(agentActor),
VOID_VIEW_JSON: view ? JSON.stringify(view) : '' VOID_VIEW_JSON: view ? JSON.stringify(view) : '',
DATABASE_URL: process.env.DATABASE_URL || '',
OLLAMA_URL: process.env.OLLAMA_URL || ''
} }
} }
} }